Skip to content
Permalink
Browse files

Fix tooltip text and build.xml

  • Loading branch information
Lorenzo Bertacchi authored and guymahieu committed Jan 23, 2020
1 parent 1c5ae20 commit 50cba1accfb3a98c251c7d3f563ca2e008b8fcf1
123 build.xml
@@ -0,0 +1,123 @@
<!--
~ Copyright 2010 Guy Mahieu
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project name="IvyIDEA" default="bundle" basedir=".">

<property name="ivyidea.version" value="1.0.15-jberta93"/>

<property name="ivyidea.sourcedir" value="src/main/java"/>
<property name="ivyidea.resourcedir" value="src/main/resources"/>
<property name="ivyidea.builddir" value="build/classes"/>

<property name="ivyidea.libdir" value="lib"/>

<property environment="env" />
<property name="env.IDEA_HOME" value="/Applications/IntelliJ IDEA.app/Contents"/>
<property name="idea.home" value="${env.IDEA_HOME}" />

<fail message="Environment variable IDEA_HOME was not set!">
<condition>
<equals arg1="${idea.home}" arg2="$${env.IDEA_HOME}" />
</condition>
</fail>

<taskdef name="javac2" classname="com.intellij.ant.Javac2">
<classpath>
<pathelement location="${idea.home}/redist/javac2.jar" />
<pathelement location="${idea.home}/lib/asm.jar" />
<pathelement location="${idea.home}/lib/asm-all.jar" />
<pathelement location="${idea.home}/lib/asm-commons.jar" />
<pathelement location="${idea.home}/lib/asm4-all.jar" />
<pathelement location="${idea.home}/lib/jdom.jar" />
<pathelement location="${idea.home}/lib/jgoodies-forms.jar" />
</classpath>
</taskdef>

<target name="clean">
<delete dir="build" />
</target>


<path id="clspath">

<fileset dir="${idea.home}/lib">
<include name="*.jar"/>

</fileset>

<fileset dir="${idea.home}/plugins/java/lib">
<include name="*.jar"/>
</fileset>
<fileset dir="${ivyidea.libdir}">
<include name="ivy-2.4.0.jar"/>
</fileset>
</path>


<target name="jar">
<mkdir dir="build" />
<mkdir dir="${ivyidea.builddir}" />


<javac2 srcdir="${ivyidea.sourcedir}"
destdir="${ivyidea.builddir}"
source="1.8"
target="1.8"
includeantruntime="false"
debug="true">
<classpath refid="clspath"></classpath>
</javac2>

<jar file="build/ivyidea-${ivyidea.version}.jar">
<fileset dir="${ivyidea.builddir}">
<include name="**/*"/>
</fileset>
<fileset dir="${ivyidea.sourcedir}">
<include name="META-INF/**/*"/>
</fileset>
<fileset dir="${ivyidea.resourcedir}"/>
</jar>
</target>

<target name="bundle" depends="jar">
<delete dir="build/dist/tmp"/>
<mkdir dir="build/dist/tmp/IvyIDEA/lib"/>
<copy todir="build/dist/tmp/IvyIDEA/lib">
<!-- Ivy -->
<fileset file="${ivyidea.libdir}/ivy-2.4.0.jar"/>

<!--Third party Ivy runtime dependencies-->
<fileset file="${ivyidea.libdir}/jsch-0.1.31.jar"/>
<fileset file="${ivyidea.libdir}/oro-2.0.8.jar"/>
<fileset file="${ivyidea.libdir}/commons-vfs-1.0.jar"/>

<!-- IvyIDEA -->
<fileset dir="build" includes="ivyidea-${ivyidea.version}.jar"/>
</copy>
<mkdir dir="build/dist/tmp/IvyIDEA/license"/>
<copy todir="build/dist/tmp/IvyIDEA/license">
<fileset dir="src/main/license" includes="**/*"/>
</copy>
<zip file="build/dist/IvyIDEA-${ivyidea.version}.zip">
<fileset dir="build/dist/tmp">
<include name="IvyIDEA/**"/>
</fileset>
</zip>
<delete dir="build/dist/tmp"/>
</target>


</project>
@@ -16,6 +16,10 @@
</description>
<change-notes><![CDATA[
<p>
<strong>1.0.15-jberta93</strong>
<ul>
<li>Added checkbox "Avoid internal modules dependecies resolving" to force IvyIDEA to resolve dependecies only through the ivy.xml ignoring internal modules</li>
</ul>
<strong>1.0.14</strong>
<ul>
<li>When trying to resolve dependencies without an Ivy settings file, an IllegalArgumentException
@@ -118,7 +122,7 @@
</ul>
</p>]]>
</change-notes>
<version>1.0.14</version>
<version>1.0.15-jberta93</version>
<vendor email="guy.mahieu@gmail.com" url="http://www.clarent.org" logo="/ivyidea16.png">Guy Mahieu</vendor>
<idea-version since-build="3000"/>
<application-components>
@@ -20,21 +20,25 @@
import com.intellij.openapi.components.ProjectComponent;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.project.Project;
import com.intellij.util.xmlb.XmlSerializerUtil;
import org.clarent.ivyidea.config.model.IvyIdeaProjectSettings;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import javax.swing.*;

/**
* @author Guy Mahieu
*/

@State(
name = IvyIdeaProjectComponent.COMPONENT_NAME,
storages = {
@Storage("$PROJECT_FILE$")
}
storages = {@Storage(file = "$PROJECT_FILE$")}
)
public class IvyIdeaProjectComponent implements ProjectComponent, PersistentStateComponent<IvyIdeaProjectSettings> {

@@ -3,7 +3,7 @@
<grid id="27dc6" binding="projectSettingsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="829" height="600"/>
<xy x="20" y="20" width="829" height="627"/>
</constraints>
<properties/>
<border type="none"/>
@@ -290,6 +290,7 @@
</constraints>
<properties>
<text value="Avoid internal modules dependecies resolving"/>
<toolTipText value="Force IvyIDEA to resolve dependecies only through the ivy.xml ignoring internal modules"/>
</properties>
</component>
</children>

0 comments on commit 50cba1a

Please sign in to comment.
You can’t perform that action at this time.