Changeset 34581 in osm

Timestamp:

2018-08-19T14:21:28+02:00 (6 years ago)

Author:

donvip

Message:

fix Ivy build of StreetSide (conflicts with build of wikipedia plugin hosted on GitHub)

Location:

applications/editors/josm/plugins

Files:

• MicrosoftStreetside/ant (deleted)
• MicrosoftStreetside/build.xml (modified) (2 diffs)
• build-common.xml (modified) (2 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/build.xml

@@ -32 +32 @@
         <import file="../build-common.xml"/>
 
-        <path id="ivy.lib.path" path="ant/ivy-2.5.0-rc1.jar" />
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" />
-
         <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
                 <include name="apache-commons.jar"/>
@@ -54 +51 @@
         </target>
 
-        <target name="fetch_dependencies" depends="clean_ivy">
+        <target name="fetch_dependencies" depends="clean_ivy, init-ivy">
                 <echo>fetching dependencies with ivy</echo>
                 <ivy:settings file="ivy_settings.xml" />

applications/editors/josm/plugins/build-common.xml

@@ -32 +32 @@
     <property name="plugin.sources.jar"     location="${plugin.dist.dir}/${ant.project.name}-sources.jar"/>
     <property name="plugin.javadoc.jar"     location="${plugin.dist.dir}/${ant.project.name}-javadoc.jar"/>
+    <property name="ivy.home"               location="${user.home}/.ant"/>
+    <property name="ivy.jar.dir"            location="${ivy.home}/lib"/>
+    <property name="ivy.jar.file"           location="${ivy.jar.dir}/ivy.jar"/>
+    <property name="ivy.version"            value="2.5.0-rc1"/>
 
     <!-- For Windows-specific stuff -->
@@ -661 +665 @@
         </echo>
     </target>
+    <!--
+    ** Ivy tasks
+    -->
+    <target name="download-ivy">
+        <mkdir dir="${ivy.jar.dir}"/>
+        <get src="https://jcenter.bintray.com/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+    <target name="init-ivy" depends="download-ivy">
+        <path id="ivy.lib.path">
+            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>
 </project>