Changeset 18976 in osm

Timestamp:

2009-12-07T08:48:23+01:00 (15 years ago)

Author:

guggis

Message:

Made build.xml more robust.

File:

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

applications/editors/josm/plugins/tageditor/build.xml

@@ -220 +220 @@
         <!-- ** make sure svn is present as a command line tool ** -->
         <target name="ensure-svn-present">
-                <exec append="true" output="svn.log" executable="svn" failonerror="false" resultproperty="svn.exit.code">
+                <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
                         <env key="LANG" value="C" />
                         <arg value="--version" />
                 </exec>
-                <fail message="Fatal: command 'svn' not found. Please make sure svn is installed on your system.">
+                <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
+                        <!-- return code not set at all? Most likely svn isn't installed -->
+                        <condition>
+                                <not>
+                                        <isset property="svn.exit.code" />
+                                </not>
+                        </condition>
+                </fail>
+                <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
+                        <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
                         <condition>
                                 <isfailure code="${svn.exit.code}" />
@@ -230 +239 @@
                 </fail>
         </target>
+
         <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
         </target>