Changeset 30306 in osm for applications/editors/josm/plugins/build-common.xml

Timestamp:

2014-02-26T20:52:10+01:00 (11 years ago)

Author:

simon04

Message:

JOSM: allow plugins to be built from a Git (non-SVN) mirror

File:

• applications/editors/josm/plugins/build-common.xml (modified) (2 diffs)

applications/editors/josm/plugins/build-common.xml

@@ -170 +170 @@
     </target>
     <!--
-      ** Initializes the REVISION.XML file from git information
-    -->
-    <target name="init-git-revision-xml" unless="svn.info.success">
-        <exec append="false" output="REVISION.XML" executable="git" failifexecutionfails="false">
+      ** Initializes the REVISION.XML file from git-svn information.
+         Obtains the revision from the git-svn-id field.
+    -->
+    <target name="init-git-svn-revision-xml" unless="svn.info.success">
+        <exec append="false" output="REVISION.XML" executable="git" failifexecutionfails="false" resultproperty="git.svn.info.result">
             <arg value="log"/>
             <arg value="-1"/>
@@ -188 +189 @@
                        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="&lt;info&gt;&lt;entry&gt;&lt;commit revision=&quot;\1&quot;&gt;&lt;date&gt;\2&lt;/date&gt;&lt;/commit&gt;&lt;/entry&gt;&lt;/info&gt;"/>
-    </target>
-    <target name="revision" depends="init-svn-revision-xml, init-git-revision-xml">
+       <condition property="git.svn.fail">
+           <not>
+               <and>
+                   <equals arg1="${git.svn.info.result}" arg2="0" />
+                   <length file="REVISION.XML" when="greater" length="1" />
+               </and>
+           </not>
+       </condition>
+   </target>
+    <!--
+      ** Initializes the REVISION.XML file from git (w/o svn) information.
+         Uses Unix date as revision number.
+    -->
+    <target name="init-git-revision-xml" if="git.svn.fail">
+        <exec append="false" output="REVISION.XML" executable="git" failifexecutionfails="false">
+            <arg value="log"/>
+            <arg value="-1"/>
+            <arg value="--pretty=format:%at%n%ai"/>
+            <arg value="HEAD"/>
+        </exec>
+        <replaceregexp file="REVISION.XML" flags="s"
+                       match="\s*(\d*)\s+(\d{4}-\d{2}-\d{2}.\d{2}\:\d{2}\:\d{2}\s*[+-]\d{2}:?\d{2})\s*$"
+                       replace="&lt;info&gt;&lt;entry&gt;&lt;commit revision=&quot;\1&quot;&gt;&lt;date&gt;\2&lt;/date&gt;&lt;/commit&gt;&lt;/entry&gt;&lt;/info&gt;"/>
+    </target>
+    <target name="revision" depends="init-svn-revision-xml, init-git-svn-revision-xml, init-git-revision-xml">
       <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
       <delete file="REVISION.XML"/>