Changeset 16036 in josm


Ignore:
Timestamp:
2020-03-04T21:01:55+01:00 (3 months ago)
Author:
Don-vip
Message:

see #18845, fix #18858 - fix ant build

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r16033 r16036  
    195195      ** Main target that builds JOSM and checks XML against schemas
    196196    -->
    197     <target name="dist" depends="compile,extract-libraries,create-revision,check-schemas,epsg">
     197    <target name="dist" depends="compile,extract-libraries,epsg,copy-resources,create-revision,check-schemas">
    198198        <echo>Revision ${version.entry.commit.revision}</echo>
    199199        <copy file="CONTRIBUTION" todir="${build.dir}"/>
     
    292292        </java>
    293293    </target>
    294     <target name="compile-cots" depends="init">
     294    <target name="compile-cots" depends="init" description="Compiles third-party dependencies not retrieved with Ivy">
    295295        <!-- COTS -->
    296296        <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**,org/apache/commons/**" nowarn="on" encoding="iso-8859-1"
     
    322322        </javac>
    323323    </target>
    324     <target name="compile-jmapviewer" depends="init">
     324    <target name="compile-jmapviewer" depends="init" description="Compiles JMapViewer">
    325325        <!-- JMapViewer -->
    326326        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
     
    348348        </javac>
    349349    </target>
    350     <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer" unless="compile.notRequired">
     350    <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer" unless="compile.notRequired" description="Compiles JOSM">
    351351        <!-- JOSM -->
    352352        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
     
    377377            </classpath>
    378378        </javac>
    379 
     379    </target>
     380    <target name="copy-resources" description="Copy resource files to build directory">
    380381        <copy todir="build" failonerror="no" includeemptydirs="no">
    381382            <fileset dir="resources"/>
     
    468469        </sequential>
    469470    </macrodef>
    470     <target name="test-compile" depends="test-init,compile,extract-libraries,epsg">
     471    <target name="test-compile" depends="test-init,compile,extract-libraries,epsg,copy-resources" description="Compiles all tests">
    471472        <call-javac testfamily="unit">
    472473            <cp-elements>
     
    841842    </target>
    842843
    843     <target name="script-compile" depends="dist, test-compile">
     844    <target name="script-compile" depends="test-compile" description="Compiles all scripts">
    844845        <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="*.java"
    845846               destdir="${script-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
Note: See TracChangeset for help on using the changeset viewer.