harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r614567 - /harmony/enhanced/trunk/build.xml
Date Wed, 23 Jan 2008 15:42:40 GMT
Author: smishura
Date: Wed Jan 23 07:42:30 2008
New Revision: 614567

URL: http://svn.apache.org/viewvc?rev=614567&view=rev
Log:
Another quick fix for commit r614462. The build fails on Windows with:
make\depends.xml:492: Can't get http://svn.apache.org/repos/asf/harmony/standard/depends/libs/windows.x86.libstdc++6/icu-3.4.zip

Modified:
    harmony/enhanced/trunk/build.xml

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=614567&r1=614566&r2=614567&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Wed Jan 23 07:42:30 2008
@@ -319,12 +319,17 @@
     <!-- ================================================================================
-->
     <!--    build the classlib - ensure depends are up to date an then rebuild       
    -->
     <!-- ================================================================================
-->
+
+    <propertyset id="required.pops">
+        <propertyref name="hy.cfg" />
+        <propertyref name="hy.no.sig" />
+        <propertyref name="hy.local.zlib" />
+        <propertyref name="use.libstdc++6" />
+    </propertyset>
+    
     <target name="build_classlib" depends="auto_fetch_classlib_libs">
         <ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false"
>
-            <property name="hy.cfg" value="${hy.cfg}"/>
-            <property name="hy.no.sig" value="${hy.no.sig}"/>
-            <property name="hy.local.zlib" value="${hy.local.zlib}"/>
-            <property name="use.libstdc++6" value="${use.libstdc++6}"/>
+            <propertyset refid="required.pops" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
@@ -333,10 +338,7 @@
 
     <target name="auto_fetch_classlib_libs" if="auto.fetch">
         <ant target="fetch_classlib_libs">
-            <property name="hy.cfg" value="${hy.cfg}"/>
-            <property name="hy.no.sig" value="${hy.no.sig}"/>
-            <property name="hy.local.zlib" value="${hy.local.zlib}"/>
-            <property name="use.libstdc++6" value="${use.libstdc++6}"/>
+            <propertyset refid="required.pops" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
         </ant>
@@ -344,10 +346,7 @@
 
     <target name="fetch_classlib_libs">
         <ant antfile="working_classlib/build.xml" target="fetch-depends" inheritall="false"
>
-            <property name="hy.cfg" value="${hy.cfg}"/>
-            <property name="hy.no.sig" value="${hy.no.sig}"/>
-            <property name="hy.local.zlib" value="${hy.local.zlib}"/>
-            <property name="use.libstdc++6" value="${use.libstdc++6}"/>
+            <propertyset refid="required.pops" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
         </ant>
@@ -355,10 +354,7 @@
 
     <target name="clean_classlib">
         <ant antfile="working_classlib/build.xml" target="clean" inheritAll="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
-            <property name="hy.no.sig" value="${hy.no.sig}"/>
-            <property name="hy.local.zlib" value="${hy.local.zlib}"/>
-            <property name="use.libstdc++6" value="${use.libstdc++6}"/>
+            <propertyset refid="required.pops" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
             <property name="keep.working" value="true" />



Mime
View raw message