Changeset 16349 in josm for trunk

Timestamp:

2020-04-18T21:06:10+02:00 (4 years ago)

Author:

simon04

Message:

fix #19065, see #19117 - ant create-revision: write to resources/

File:

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

trunk/build.xml

@@ -120 +120 @@
     -->
     <target name="create-revision-eclipse">
-        <property name="revision.dir" value="bin"/>
         <antcall target="create-revision"/>
         <mkdir dir="bin/META-INF/services"/>
@@ -160 +159 @@
     -->
     <target name="create-revision" depends="init-properties,init-svn-revision-xml,init-git-revision-xml">
-        <property name="revision.dir" value="${build.dir}"/>
         <xmlproperty file="${base.dir}/REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
         <delete file="${base.dir}/REVISION.XML"/>
@@ -168 +166 @@
         <property name="version.entry.commit.revision" value="UNKNOWN"/>
         <property name="version.entry.commit.date" value="UNKNOWN"/>
-        <mkdir dir="${revision.dir}"/>
         <!-- add Build-Name: ... when making special builds, e.g. DEBIAN -->
-        <echo file="${revision.dir}/REVISION">
+        <echo file="${resources.dir}/REVISION">
 # automatically generated by JOSM build.xml - do not edit
 Revision: ${version.entry.commit.revision}
@@ -188 +185 @@
       ** Main target that builds JOSM and checks XML against schemas
     -->
-    <target name="dist" depends="compile,extract-libraries,epsg,copy-resources,create-revision,check-schemas">
+    <target name="dist" depends="compile,extract-libraries,epsg,copy-resources,check-schemas">
         <echo>Revision ${version.entry.commit.revision}</echo>
         <copy file="CONTRIBUTION" todir="${build.dir}"/>
@@ -325 +322 @@
         </javac>
     </target>
-    <target name="copy-resources" description="Copy resource files to build directory">
+    <target name="create-resources" depends="create-revision" description="Create generated resource files">
+        <copy todir="${resources.dir}">
+            <file file="CONTRIBUTION"/>
+            <file file="README"/>
+            <file file="LICENSE"/>
+        </copy>
+    </target>
+    <target name="copy-resources" depends="create-resources" description="Copy resource files to build directory">
         <copy todir="build" failonerror="no" includeemptydirs="no">
             <fileset dir="${resources.dir}"/>
@@ -1142 +1146 @@
             </fileset>
             <fileset dir="${resources.dir}"/>
-            <fileset file="CONTRIBUTION"/>
-            <fileset file="README"/>
-            <fileset file="LICENSE"/>
         </jar>
     </target>