Changeset 14019 in josm for trunk/build.xml


Ignore:
Timestamp:
2018-07-08T17:12:38+02:00 (6 years ago)
Author:
Don-vip
Message:

update to Groovy 2.5.0 and Eclipse Photon (4.8.0)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
         1*-josm.xml
        12bin
        23bin2
         4bintest
         5build
         6build2
        37dist
        4 build
         8foobar
         9hs_err_pid*
         10imagery_*
         11javadoc
         12junit*.properties
        513plugin-check
        6 *-josm.xml
        7 javadoc
         14taginfo-img
        815taginfo_*.json
        9 taginfo-img
        10 build2
        11 junit*.properties
        12 foobar
        13 imagery_*
         16test_BLOCK_v2.*
        1417validator-*
        15 test_BLOCK_v2.*
        16 hs_err_pid*

  • trunk/build.xml

    r13962 r14019  
    3939        <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
    4040        <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
    41         <property name="groovy.jar" location="${tools.dir}/groovy-all.jar"/>
    4241        <property name="error_prone_ant.jar" location="${tools.dir}/error_prone_ant.jar"/>
    4342        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
    … …  
    7574            </not>
    7675        </condition>
     76        <path id="groovy.classpath">
     77            <fileset dir="${tools.dir}/groovy">
     78                <include name="*.jar"/>
     79            </fileset>
     80        </path>
    7781        <path id="test.classpath">
    7882            <fileset dir="${test.dir}/lib">
    … …  
    8084            </fileset>
    8185            <pathelement path="${dist.jar}"/>
    82             <pathelement path="${groovy.jar}"/>
     86            <pathelement path="${toString:groovy.classpath}"/>
    8387            <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
    8488        </path>
    … …  
    468472    </macrodef>
    469473    <target name="test-compile" depends="test-init,dist">
    470         <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${groovy.jar}"/>
     474        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${toString:groovy.classpath}"/>
    471475        <call-groovyc testfamily="unit">
    472476            <cp-elements>
    … …  
    801805
    802806    <target name="taginfo" depends="dist">
    803         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
     807        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
    804808        <property name="taginfoextract" value="scripts/TagInfoExtract.groovy"/>
    805809        <property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>
    … …  
    810814
    811815    <target name="imageryindex" depends="init-properties">
    812         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
     816        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
    813817        <echo message="Checking editor imagery difference"/>
    814818        <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.jar}">
Note: See TracChangeset for help on using the changeset viewer.