Changeset 16140 in josm


Ignore:
Timestamp:
2020-03-15T20:09:58+01:00 (3 months ago)
Author:
simon04
Message:

see #18140 - build.xml: use ${resources.dir}

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r16126 r16140  
    4141        <property name="build.dir" location="${base.dir}/build"/>
    4242        <property name="dist.dir" location="${base.dir}/dist"/>
     43        <property name="resources.dir" location="${base.dir}/resources"/>
    4344        <property name="modules.dir" location="${dist.dir}/modules"/>
    4445        <property name="tools.dir" location="${base.dir}/tools"/>
     
    5152        <property name="script-build.dir" location="${base.dir}/build2"/>
    5253        <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
    53         <property name="epsg.output" location="${base.dir}/resources/data/projection/custom-epsg"/>
     54        <property name="epsg.output" location="${resources.dir}/data/projection/custom-epsg"/>
    5455        <property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
    5556        <property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
     
    9798            </fileset>
    9899            <pathelement path="${build.dir}"/>
    99             <pathelement path="${base.dir}/resources"/>
     100            <pathelement path="${resources.dir}"/>
    100101            <pathelement path="${failureaccess.jar}"/>
    101102            <pathelement path="${guava.jar}"/>
     
    188189    -->
    189190    <target name="check-schemas" unless="check-schemas.notRequired" depends="init-properties">
    190         <schemavalidate file="resources/data/defaultpresets.xml" >
    191             <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="resources/data/tagging-preset.xsd" />
     191        <schemavalidate file="${resources.dir}/data/defaultpresets.xml" >
     192            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="${resources.dir}/data/tagging-preset.xsd" />
    192193        </schemavalidate>
    193194    </target>
     
    380381    <target name="copy-resources" description="Copy resource files to build directory">
    381382        <copy todir="build" failonerror="no" includeemptydirs="no">
    382             <fileset dir="resources"/>
     383            <fileset dir="${resources.dir}"/>
    383384        </copy>
    384385    </target>
     
    10201021            <sysproperty key="java.awt.headless" value="true"/>
    10211022            <classpath>
    1022                 <pathelement path="${base.dir}/resources"/>
     1023                <pathelement path="${resources.dir}"/>
    10231024                <pathelement path="${proj-classpath}"/>
    10241025                <pathelement path="${proj-build.dir}"/>
Note: See TracChangeset for help on using the changeset viewer.