Changeset 16140 in josm for trunk

Timestamp:

2020-03-15T20:09:58+01:00 (5 years ago)

Author:

simon04

Message:

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

File:

• trunk/build.xml (modified) (6 diffs)

trunk/build.xml

@@ -41 +41 @@
         <property name="build.dir" location="${base.dir}/build"/>
         <property name="dist.dir" location="${base.dir}/dist"/>
+        <property name="resources.dir" location="${base.dir}/resources"/>
         <property name="modules.dir" location="${dist.dir}/modules"/>
         <property name="tools.dir" location="${base.dir}/tools"/>
@@ -51 +52 @@
         <property name="script-build.dir" location="${base.dir}/build2"/>
         <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
-        <property name="epsg.output" location="${base.dir}/resources/data/projection/custom-epsg"/>
+        <property name="epsg.output" location="${resources.dir}/data/projection/custom-epsg"/>
         <property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
         <property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
@@ -97 +98 @@
             </fileset>
             <pathelement path="${build.dir}"/>
-            <pathelement path="${base.dir}/resources"/>
+            <pathelement path="${resources.dir}"/>
             <pathelement path="${failureaccess.jar}"/>
             <pathelement path="${guava.jar}"/>
@@ -188 +189 @@
     -->
     <target name="check-schemas" unless="check-schemas.notRequired" depends="init-properties">
-        <schemavalidate file="resources/data/defaultpresets.xml" >
-            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="resources/data/tagging-preset.xsd" />
+        <schemavalidate file="${resources.dir}/data/defaultpresets.xml" >
+            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="${resources.dir}/data/tagging-preset.xsd" />
         </schemavalidate>
     </target>
@@ -380 +381 @@
     <target name="copy-resources" description="Copy resource files to build directory">
         <copy todir="build" failonerror="no" includeemptydirs="no">
-            <fileset dir="resources"/>
+            <fileset dir="${resources.dir}"/>
         </copy>
     </target>
@@ -1020 +1021 @@
             <sysproperty key="java.awt.headless" value="true"/>
             <classpath>
-                <pathelement path="${base.dir}/resources"/>
+                <pathelement path="${resources.dir}"/>
                 <pathelement path="${proj-classpath}"/>
                 <pathelement path="${proj-build.dir}"/>