Changeset 35389 in osm for applications/editors/josm

Timestamp:

2020-03-21T09:42:41+01:00 (5 years ago)

Author:

simon04

Message:

see #josm16860 - Add ant resolve-tools target

File:

• applications/editors/josm/plugins/build-common.xml (modified) (3 diffs)

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

@@ -627 +627 @@
     </target>
 
-    <target name="checkstyle-compile">
-        <ivy:cachepath file="${core.tools.ivy}" pathid="checkstyle.classpath" conf="checkstyle"/>
+    <target name="checkstyle-compile" depends="resolve-tools">
         <mkdir dir="${checkstyle-build.dir}"/>
         <javac sourcepath="" srcdir="../00_core_tools/checkstyle/src" failonerror="true"
@@ -663 +662 @@
     </target>
 
-    <target name="spotbugs" depends="compile">
-        <ivy:cachepath file="${core.tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
+    <target name="spotbugs" depends="compile,resolve-tools">
         <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${toString:spotbugs.classpath}"/>
         <spotbugs output="xml"
@@ -724 +722 @@
         <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
     </target>
+    <target name="resolve-tools" depends="init-ivy" description="Resolves tools using Apache Ivy">
+        <ivy:resolve file="${core.tools.ivy}"/>
+        <ivy:cachepath file="${core.tools.ivy}" pathid="checkstyle.classpath" conf="checkstyle"/>
+        <ivy:cachepath file="${core.tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
+    </target>
     <target name="clean_ivy">
         <delete failonerror="false">