--- build.xml.patch2 2014-05-04 10:34:25.147194000 +0200
+++ build.xml 2014-05-05 07:48:06.626517130 +0200
@@ -69,27 +69,7 @@
match=".*git-svn-id: [^@]*@([0-9]+).*(\d{4}-\d{2}-\d{2}.\d{2}\:\d{2}\:\d{2}\s*[+-]\d{2}:?\d{2})\s*$"
replace="<info><entry><commit revision="\1"><date>\2</date></commit></entry></info>"/>
</target>
- <!--
- ** Creates the REVISION file to be included in the distribution
- -->
- <target name="create-revision" depends="init-svn-revision-xml, init-git-revision-xml">
- <property name="revision.dir" value="${build.dir}"/>
- <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION.XML"/>
- <tstamp>
- <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
- </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">
-# automatically generated by JOSM build.xml - do not edit
-Revision: ${version.entry.commit.revision}
-Is-Local-Build: true
-Build-Date: ${build.tstamp}
-</echo>
- </target>
+
<!--
** Check internal XML files against their XSD
-->
@@ -104,11 +84,24 @@ Build-Date: ${build.tstamp}
<!--
** Main target that builds JOSM and checks XML against schemas
-->
- <target name="dist" depends="compile,create-revision,check-schemas">
+ <target name="dist" depends="compile,check-schemas">
+ <property name="revision.dir" value="${build.dir}"/>
+ <tstamp>
+ <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
+ </tstamp>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <property name="version.entry.commit.revision" value="UNKNOWN"/>
+ <property name="version.entry.commit.date" value="UNKNOWN"/>
<echo>Revision ${version.entry.commit.revision}</echo>
<copy file="CONTRIBUTION" todir="build"/>
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
+ <echo file="${revision.dir}/REVISION">
+# automatically generated by JOSM build.xml - do not edit
+Revision: ${version.entry.commit.revision}
+Is-Local-Build: true
+Build-Date: ${build.tstamp}
+ </echo>
<!-- create josm-custom.jar -->
<delete file="dist/josm-custom.jar"/>
<jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">