harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r541513 - /harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml
Date Fri, 25 May 2007 02:27:09 GMT
Author: smishura
Date: Thu May 24 19:27:08 2007
New Revision: 541513

URL: http://svn.apache.org/viewvc?view=rev&rev=541513
Log:
Apply patch from HARMONY-3501 that patches Ant bug 30569 for v.1.7.0

Modified:
    harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml?view=diff&rev=541513&r1=541512&r2=541513
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml Thu May 24 19:27:08 2007
@@ -86,24 +86,44 @@
         </loadproperties>
     </target>
 
+    <condition property="ant.to.patch" value="1.6.5">
+        <contains string="${ant.version}" substring="1.6.5"/>
+    </condition>
+
+    <condition property="ant.to.patch" value="1.7.0">
+        <contains string="${ant.version}" substring="1.7.0"/>
+    </condition>
+
     <!-- Fixes Ant's Bug described at: 
          http://issues.apache.org/bugzilla/show_bug.cgi?id=30569
         -->
-    <target name="patch-ant" depends="make-dirs, define-tasks">
+    <target name="patch-ant" depends="make-dirs, define-ant-contrib" if="ant.to.patch">
+
+        <condition 
+            property="ant.patch.url"
+            value="http://issues.apache.org/bugzilla/attachment.cgi?id=15681"
+            else="http://issues.apache.org/bugzilla/attachment.cgi?id=19566">
+            <equals arg1="${ant.to.patch}" arg2="1.6.5"/>
+        </condition>
+
+        <mkdir dir="${temp.files.dir}/${ant.to.patch}"/>
+        <property name="ant.patch.file" 
+                  value="${temp.files.dir}/${ant.to.patch}/SubAnt.java"/>
+
         <if>
-            <not><available file="${temp.files.dir}/SubAnt.java"/></not>
+            <not><available file="${ant.patch.file}"/></not>
         <then>
-            <get src="http://issues.apache.org/bugzilla/attachment.cgi?id=15681"
-                 dest="${temp.files.dir}/SubAnt.java"
+            <get src="${ant.patch.url}"
+                 dest="${ant.patch.file}"
                  usetimestamp="true"
                  verbose="true"
             />
         </then>
         </if>
         <javac 
-            srcdir="${temp.files.dir}"
+            srcdir="${temp.files.dir}/${ant.to.patch}"
             destdir="${classes.dir}"
-            includesfile="${temp.files.dir}/SubAnt.java">
+            includesfile="${ant.patch.file}">
             <depend targetdir="${classes.dir}/org/apache/tools/ant/taskdefs">
                 <mapper>
                     <globmapper from="*.java" to="*.class"/>



Mime
View raw message