harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r587802 - /harmony/enhanced/trunk/build.xml
Date Wed, 24 Oct 2007 07:05:25 GMT
Author: smishura
Date: Wed Oct 24 00:05:24 2007
New Revision: 587802

URL: http://svn.apache.org/viewvc?rev=587802&view=rev
Log:
Workaround for condition for 'svn.root' property. The build fails with:
switch_svn_vm:
     [exec] svn: '/harmony/enhanced/drlvm/trunk' does not appear to be a URL

This happen because the build relies on 'svn info' output
but some svn versions doesn't provide "Repository Root" string.
(IMO such dependencies on tools output should be avoided)

Modified:
    harmony/enhanced/trunk/build.xml

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=587802&r1=587801&r2=587802&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Wed Oct 24 00:05:24 2007
@@ -761,7 +761,15 @@
         <property name="harmony.long.version" value="${svn.info}" />
 
         <condition property="svn.root" value="${svn.root.tmp}" >
-            <equals arg1="${svn.rc}" arg2="0" />
+            <and>
+                <equals arg1="${svn.rc}" arg2="0" />
+                <!-- check length: it is an empty string             --> 
+                <!-- if svn output doesn't contain "Repository Root" -->
+                <length string="${svn.root.tmp}"
+                        trim="true"
+                        when="greater"
+                        length="0" />
+            </and>
         </condition>
 
         <!-- default SVN URLs -->



Mime
View raw message