Ant: write REVISION to resources/

[simon04]

CONTRIBUTION, REVISION, README, LICENSE are additional resource files.

For an easier IDE setup (IntelliJ), those files should be copied/written to the resources/ directory.

Vincent, can I apply the following patch?

build.xml

@@ -160 +160 @@
       ** Creates the REVISION file to be included in the distribution
     -->
     <target name="create-revision" depends="init-properties,init-svn-revision-xml,init-git-revision-xml">
-        <property name="revision.dir" value="${build.dir}"/>
+        <copy todir="${resources.dir}">
+            <file file="CONTRIBUTION"/>
+            <file file="README"/>
+            <file file="LICENSE"/>
+        </copy>
         <xmlproperty file="${base.dir}/REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
         <delete file="${base.dir}/REVISION.XML"/>
         <tstamp>
@@ -168 +172 @@
         </tstamp>
         <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}
 Is-Local-Build: true
@@ -188 +191 @@
     <!--
       ** 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,create-revision,copy-resources,check-schemas">
         <echo>Revision ${version.entry.commit.revision}</echo>
-        <copy file="CONTRIBUTION" todir="${build.dir}"/>
-        <copy file="README" todir="${build.dir}"/>
-        <copy file="LICENSE" todir="${build.dir}"/>
         <!-- create josm-custom.jar -->
         <delete file="${dist.jar}"/>
         <jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">

[taylor.smock]

This also affects Eclipse, not just IntelliJ (I had been wondering why I was suddenly on an unknown JOSM version, when building/testing features).

[simon04]

In 16349/josm:

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

[Klumbumbus]

Milestone renamed