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

Timestamp:

2014-02-27T15:26:00+01:00 (11 years ago)

Author:

bastik

Message:

plugin build: add another fallback when plugin is not under version control (set revision as UNKNOWN)

File:

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

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

@@ -203 +203 @@
     -->
     <target name="init-git-revision-xml" if="git.svn.fail">
-        <exec append="false" output="REVISION.XML" executable="git" failifexecutionfails="false">
+        <exec append="false" output="REVISION.XML" executable="git" failifexecutionfails="false" resultproperty="git.info.result">
             <arg value="log"/>
             <arg value="-1"/>
@@ -212 +212 @@
                        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">
+       <condition property="git.fail">
+           <not>
+               <and>
+                   <equals arg1="${git.info.result}" arg2="0" />
+                   <length file="REVISION.XML" when="greater" length="1" />
+               </and>
+           </not>
+       </condition>
+    </target>
+    <target name="init-revision-fallback" if="git.fail">
+        <tstamp>
+            <format property="current.time" pattern="yyyy-MM-dd'T'HH:mm:ss.SSS" />
+        </tstamp>
+        <echo file="REVISION.XML"><![CDATA[<info><entry><commit revision="UNKNOWN"><date>${current.time}</date></commit></entry></info>]]></echo>
+    </target>
+    <target name="revision" depends="init-svn-revision-xml, init-git-svn-revision-xml, init-git-revision-xml, init-revision-fallback">
       <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
       <delete file="REVISION.XML"/>