Changeset 16036 in josm

Timestamp:

2020-03-04T21:01:55+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18845, fix #18858 - fix ant build

File:

• trunk/build.xml (modified) (7 diffs)

trunk/build.xml

@@ -195 +195 @@
       ** Main target that builds JOSM and checks XML against schemas
     -->
-    <target name="dist" depends="compile,extract-libraries,create-revision,check-schemas,epsg">
+    <target name="dist" depends="compile,extract-libraries,epsg,copy-resources,create-revision,check-schemas">
         <echo>Revision ${version.entry.commit.revision}</echo>
         <copy file="CONTRIBUTION" todir="${build.dir}"/>
@@ -292 +292 @@
         </java>
     </target>
-    <target name="compile-cots" depends="init">
+    <target name="compile-cots" depends="init" description="Compiles third-party dependencies not retrieved with Ivy">
         <!-- COTS -->
         <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**,org/apache/commons/**" nowarn="on" encoding="iso-8859-1"
@@ -322 +322 @@
         </javac>
     </target>
-    <target name="compile-jmapviewer" depends="init">
+    <target name="compile-jmapviewer" depends="init" description="Compiles JMapViewer">
         <!-- JMapViewer -->
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
@@ -348 +348 @@
         </javac>
     </target>
-    <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer" unless="compile.notRequired">
+    <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer" unless="compile.notRequired" description="Compiles JOSM">
         <!-- JOSM -->
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
@@ -377 +377 @@
             </classpath>
         </javac>
-
+    </target>
+    <target name="copy-resources" description="Copy resource files to build directory">
         <copy todir="build" failonerror="no" includeemptydirs="no">
             <fileset dir="resources"/>
@@ -468 +469 @@
         </sequential>
     </macrodef>
-    <target name="test-compile" depends="test-init,compile,extract-libraries,epsg">
+    <target name="test-compile" depends="test-init,compile,extract-libraries,epsg,copy-resources" description="Compiles all tests">
         <call-javac testfamily="unit">
             <cp-elements>
@@ -841 +842 @@
     </target>
 
-    <target name="script-compile" depends="dist, test-compile">
+    <target name="script-compile" depends="test-compile" description="Compiles all scripts">
         <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="*.java"
                destdir="${script-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"