harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r650389 - /harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml
Date Tue, 22 Apr 2008 07:00:29 GMT
Author: smishura
Date: Tue Apr 22 00:00:02 2008
New Revision: 650389

URL: http://svn.apache.org/viewvc?rev=650389&view=rev
Log:
Fix condition to make it work with ANT 1.7

Modified:
    harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml?rev=650389&r1=650388&r2=650389&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml Tue Apr 22 00:00:02
2008
@@ -218,9 +218,18 @@
             </propertyset>
         </ant>
         
-        <condition property="upload.dir" value="${framework.parameters.optional.upload.dir}">
-            <isset property="framework.parameters.optional.upload.dir"/>
+        <condition property="upload.dir"
+                   value="${framework.parameters.optional.upload.dir}">
+            <and>
+                <isset property="framework.parameters.optional.upload.dir" />
+
+                <!-- workaround: ANT 1.7 XmlProperty task sets empty value -->
+                <length string="${framework.parameters.optional.upload.dir}"
+                        when="greater"
+                        length="0" />
+            </and>
         </condition>
+
         <propertycopy property="skip.upload" from="${suite.name}.parameters.cc.skip.upload"
silent="true"/>
         <runtarget target="upload-status-report"/>
         



Mime
View raw message