Changeset 18976 in osm for applications/editors


Ignore:
Timestamp:
2009-12-07T08:48:23+01:00 (15 years ago)
Author:
guggis
Message:

Made build.xml more robust.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/tageditor/build.xml

    r18955 r18976  
    220220        <!-- ** make sure svn is present as a command line tool ** -->
    221221        <target name="ensure-svn-present">
    222                 <exec append="true" output="svn.log" executable="svn" failonerror="false" resultproperty="svn.exit.code">
     222                <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    223223                        <env key="LANG" value="C" />
    224224                        <arg value="--version" />
    225225                </exec>
    226                 <fail message="Fatal: command 'svn' not found. Please make sure svn is installed on your system.">
     226                <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
     227                        <!-- return code not set at all? Most likely svn isn't installed -->
     228                        <condition>
     229                                <not>
     230                                        <isset property="svn.exit.code" />
     231                                </not>
     232                        </condition>
     233                </fail>
     234                <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
     235                        <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    227236                        <condition>
    228237                                <isfailure code="${svn.exit.code}" />
     
    230239                </fail>
    231240        </target>
     241
    232242        <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    233243        </target>
Note: See TracChangeset for help on using the changeset viewer.