harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r586950 - in /harmony/enhanced/classlib/trunk: make/properties.xml modules/archive/build.xml
Date Sun, 21 Oct 2007 20:07:50 GMT
Author: hindessm
Date: Sun Oct 21 13:07:49 2007
New Revision: 586950

URL: http://svn.apache.org/viewvc?rev=586950&view=rev
Log:
Fixing hy.local.zlib mode.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=586950&r1=586949&r2=586950&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Sun Oct 21 13:07:49 2007
@@ -290,6 +290,13 @@
         </not>
     </condition>
 
+    <property name="hy.local.zlib" value="false" />
+    <condition property="hy.skip.zlib" value="true">
+        <not>
+            <equals arg1="${hy.local.zlib}" arg2="false" />
+        </not>
+    </condition>
+
     <property name="hy.zip.api" value="false" />
     <condition property="hy.skip.zip.api" value="true">
         <not>

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=586950&r1=586949&r2=586950&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Sun Oct 21 13:07:49 2007
@@ -46,7 +46,7 @@
     <target name="copy-native-includes"
             depends="overlay-oss, copy-zipsup-include, copy-zlib-include" />
 
-    <target name="copy-zlib-include" unless="hy.local.zlib">
+    <target name="copy-zlib-include" unless="hy.skip.zlib">
         <copy todir="${hy.hdk}/include" overwrite="yes">
             <fileset dir="${hy.archive.src.main.native}/zlib_dist">
                 <include name="zlib.h" />
@@ -63,13 +63,13 @@
         </copy>
 	</target>
     
-    <target name="overlay-oss" unless="hy.local.zlib">
+    <target name="overlay-oss" unless="hy.skip.zlib">
         <mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
         <unzip src="${zlib.zip}" dest="${hy.archive.src.main.native}/zlib_dist" />
         <chmod dir="${hy.archive.src.main.native}/zlib_dist" perm="ugo+r" />
     </target>
     
-    <target name="clean-overlay-oss" unless="hy.local.zlib" >
+    <target name="clean-overlay-oss" unless="hy.skip.zlib" >
         <delete dir="${hy.archive.src.main.native}/zlib_dist" quiet="true" />
     </target>
     
@@ -81,7 +81,7 @@
         <make dir="${hy.archive.src.main.native}/zip/${hy.os.family}" />
     </target>
         
-    <target name="-build-native-zlib" unless="hy.local.zlib">
+    <target name="-build-native-zlib" unless="hy.skip.zlib">
         <make dir="${hy.archive.src.main.native}/zlib/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.archive.src.main.native}/zlib">
@@ -112,7 +112,7 @@
               target="clean" />
     </target>
 
-    <target name="-clean-native-zlib" unless="hy.local.zlib">
+    <target name="-clean-native-zlib" unless="hy.skip.zlib">
         <make dir="${hy.archive.src.main.native}/zlib/${hy.os.family}"
               target="clean" />
     </target>



Mime
View raw message