Changeset 15033 in josm for trunk/build.xml


Ignore:
Timestamp:
2019-05-02T03:19:26+02:00 (4 years ago)
Author:
Don-vip
Message:

Hasta la vista Groovy

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r15032 r15033  
    3838        <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
    3939        <property name="proj-build.dir" location="${base.dir}/build2"/>
    40         <property name="taginfo-build.dir" location="${base.dir}/build2"/>
     40        <property name="script-build.dir" location="${base.dir}/build2"/>
    4141        <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
    4242        <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
    … …  
    4747        <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
    4848        <property name="guava.jar" location="${tools.dir}/guava.jar"/>
     49        <property name="commons-lang3.jar" location="${pmd.dir}/commons-lang3-3.8.1.jar"/>
    4950        <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
    5051        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
    … …  
    7980            <isset property="isJava9"/>
    8081        </condition>
    81         <path id="groovy.classpath">
    82             <fileset dir="${tools.dir}/groovy">
    83                 <include name="*.jar"/>
    84             </fileset>
    85         </path>
    8682        <path id="test.classpath">
    8783            <fileset dir="${test.dir}/lib">
    … …  
    9187            <pathelement path="${failureaccess.jar}"/>
    9288            <pathelement path="${guava.jar}"/>
    93             <pathelement path="${pmd.dir}/commons-lang3-3.8.1.jar"/>
     89            <pathelement path="${commons-lang3.jar}"/>
    9490            <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
    9591        </path>
    … …  
    430426        <delete dir="${build.dir}"/>
    431427        <delete dir="${proj-build.dir}"/>
     428        <delete dir="${script-build.dir}"/>
    432429        <delete dir="${checkstyle-build.dir}"/>
    433430        <delete dir="${dist.dir}"/>
    … …  
    842839    </target>
    843840
    844     <target name="taginfo-compile" depends="dist">
    845         <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="TagInfoExtract.java"
    846                destdir="${taginfo-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
    847                includeantruntime="false" createMissingPackageInfoClass="false"
    848                encoding="UTF-8" classpath="${build.dir}">
     841    <target name="script-compile" depends="dist, test-compile">
     842        <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="*.java"
     843               destdir="${script-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
     844               includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     845            <classpath>
     846                <pathelement path="${build.dir}"/>
     847                <pathelement path="${test.dir}/build/unit"/>
     848                <pathelement path="${guava.jar}"/>
     849                <pathelement path="${commons-lang3.jar}"/>
     850            </classpath>
    849851        </javac>
    850852    </target>
    … …  
    859861                <classpath>
    860862                    <pathelement path="${dist.jar}"/>
    861                     <pathelement path="${taginfo-build.dir}"/>
     863                    <pathelement path="${script-build.dir}"/>
     864                    <pathelement path="${guava.jar}"/>
     865                    <pathelement path="${commons-lang3.jar}"/>
    862866                </classpath>
    863867                <arg value="--type"/>
    … …  
    872876    </macrodef>
    873877
    874     <target name="taginfo" depends="taginfo-compile">
     878    <target name="taginfo" depends="script-compile">
    875879        <_taginfo type="mappaint" output="taginfo_style.json"/>
    876880        <_taginfo type="presets" output="taginfo_presets.json"/>
    … …  
    878882    </target>
    879883
    880     <target name="imageryindex" depends="init-properties">
    881         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.classpath"/>
     884    <target name="imageryindex" depends="init-properties,script-compile">
    882885        <echo message="Checking editor imagery difference"/>
    883         <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.jar}">
    884                 <arg value="-noeli"/>
    885                 <arg value="-p"/>
    886                 <arg value="imagery_eliout.imagery.xml"/>
    887                 <arg value="-q"/>
    888                 <arg value="imagery_josmout.imagery.xml"/>
    889         </groovy>
     886        <java classname="SyncEditorLayerIndex" failonerror="true" fork="false">
     887            <classpath>
     888                <pathelement path="${dist.jar}"/>
     889                <pathelement path="${script-build.dir}"/>
     890                <pathelement path="${guava.jar}"/>
     891                <pathelement path="${commons-lang3.jar}"/>
     892            </classpath>
     893            <arg value="--noeli"/>
     894            <arg value="-p"/>
     895            <arg value="imagery_eliout.imagery.xml"/>
     896            <arg value="-q"/>
     897            <arg value="imagery_josmout.imagery.xml"/>
     898        </java>
    890899    </target>
    891900
Note: See TracChangeset for help on using the changeset viewer.