Changeset 12648 in josm


Ignore:
Timestamp:
2017-08-25T20:10:59+02:00 (3 months ago)
Author:
Don-vip
Message:

see #15182 - refactor build.xml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r12628 r12648  
    133133    <target name="dist" depends="compile,create-revision,check-schemas,epsg">
    134134        <echo>Revision ${version.entry.commit.revision}</echo>
    135         <copy file="CONTRIBUTION" todir="build"/>
    136         <copy file="README" todir="build"/>
    137         <copy file="LICENSE" todir="build"/>
     135        <copy file="CONTRIBUTION" todir="${build.dir}"/>
     136        <copy file="README" todir="${build.dir}"/>
     137        <copy file="LICENSE" todir="${build.dir}"/>
    138138        <!-- create josm-custom.jar -->
    139139        <delete file="${dist.jar}"/>
     
    230230        </java>
    231231    </target>
    232     <target name="compile" depends="init,javacc">
     232    <target name="compile-cots" depends="init">
    233233        <!-- COTS -->
    234234        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
    235             destdir="build" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
     235            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
    236236            <!-- get rid of "internal proprietary API" warning -->
    237237            <compilerarg value="-XDignore.symbol.file"/>
     
    282282            <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/>
    283283        </javac>
     284    </target>
     285    <target name="compile-jmapviewer" depends="init">
    284286        <!-- JMapViewer -->
    285287        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
    286288            excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
    287             destdir="build" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     289            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    288290            <compilerclasspath>
    289291                <pathelement location="${error_prone_ant.jar}"/>
     
    305307            <compilerarg line="-Xmaxwarns 1000"/>
    306308        </javac>
     309    </target>
     310    <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
    307311        <!-- JOSM -->
    308312        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
    309313            excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
    310             destdir="build" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     314            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    311315            <compilerclasspath>
    312316                <pathelement location="${error_prone_ant.jar}"/>
Note: See TracChangeset for help on using the changeset viewer.