Changeset 16341 in josm

Timestamp:

2020-04-18T18:41:15+02:00 (4 years ago)

Author:

simon04

Message:

see #19117 - ant create-revision: detect SVN/Git based on dir

File:

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

trunk/build.xml

@@ -48 +48 @@
             </or>
         </condition>
+        <available property="svn.present" file="${base.dir}/.svn"/>
+        <available property="git.present" file="${base.dir}/.git"/>
         <property name="build.dir" location="${base.dir}/build"/>
         <property name="dist.dir" location="${base.dir}/dist"/>
@@ -126 +128 @@
       ** Initializes the REVISION.XML file from SVN information
     -->
-    <target name="init-svn-revision-xml" depends="init-properties">
-        <exec append="false" output="${base.dir}/REVISION.XML" executable="svn" dir="${base.dir}" failifexecutionfails="false" resultproperty="svn.info.result">
+    <target name="init-svn-revision-xml" if="svn.present" depends="init-properties">
+        <exec append="false" output="${base.dir}/REVISION.XML" executable="svn" dir="${base.dir}" resultproperty="svn.info.result">
             <env key="LANG" value="C"/>
             <arg value="info"/>
@@ -133 +135 @@
             <arg value="."/>
         </exec>
-        <condition property="svn.info.success">
-            <equals arg1="${svn.info.result}" arg2="0" />
-        </condition>
     </target>
     <!--
       ** Initializes the REVISION.XML file from git information
     -->
-    <target name="init-git-revision-xml" unless="svn.info.success" depends="init-properties">
-        <exec append="false" output="${base.dir}/REVISION.XML" executable="git" dir="${base.dir}" failifexecutionfails="false">
+    <target name="init-git-revision-xml" if="git.present" depends="init-properties">
+        <exec append="false" output="${base.dir}/REVISION.XML" executable="git" dir="${base.dir}">
             <arg value="log"/>
             <arg value="-1"/>