Changeset 14065 in josm


Ignore:
Timestamp:
2018-07-28T23:28:43+02:00 (8 weeks ago)
Author:
Don-vip
Message:

see #16498 - drop Groovy compiler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r14052 r14065  
    457457        <delete file="${test.dir}/config/performance-josm.home" failonerror="false"/>
    458458    </target>
    459     <macrodef name="call-groovyc">
     459    <macrodef name="call-javac">
    460460        <attribute name="testfamily"/>
    461461        <element name="cp-elements"/>
    462462        <sequential>
    463             <groovyc srcdir="${test.dir}/@{testfamily}" destdir="${test.dir}/build/@{testfamily}" encoding="UTF-8">
     463            <javac srcdir="${test.dir}/@{testfamily}" destdir="${test.dir}/build/@{testfamily}"
     464                target="${java.lang.version}" source="${java.lang.version}" debug="on"
     465                includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     466                <compilerarg value="-Xlint:all"/>
     467                <compilerarg value="-Xlint:-serial"/>
    464468                <classpath>
    465469                    <cp-elements/>
    466470                </classpath>
    467                 <javac target="${java.lang.version}" source="${java.lang.version}" debug="on" encoding="UTF-8">
    468                     <compilerarg value="-Xlint:all"/>
    469                     <compilerarg value="-Xlint:-serial"/>
    470                 </javac>
    471             </groovyc>
     471            </javac>
    472472        </sequential>
    473473    </macrodef>
    474474    <target name="test-compile" depends="test-init,dist">
    475         <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${toString:groovy.classpath}"/>
    476         <call-groovyc testfamily="unit">
     475        <call-javac testfamily="unit">
    477476            <cp-elements>
    478477                <path refid="test.classpath"/>
    479478            </cp-elements>
    480         </call-groovyc>
    481         <call-groovyc testfamily="functional">
     479        </call-javac>
     480        <call-javac testfamily="functional">
    482481            <cp-elements>
    483482                <path refid="test.classpath"/>
    484483                <pathelement path="${test.dir}/build/unit"/>
    485484            </cp-elements>
    486         </call-groovyc>
    487         <call-groovyc testfamily="performance">
     485        </call-javac>
     486        <call-javac testfamily="performance">
    488487            <cp-elements>
    489488                <path refid="test.classpath"/>
    490489                <pathelement path="${test.dir}/build/unit"/>
    491490            </cp-elements>
    492         </call-groovyc>
     491        </call-javac>
    493492    </target>
    494493    <macrodef name="call-junit">
Note: See TracChangeset for help on using the changeset viewer.