harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r929541 - in /harmony/enhanced/java/trunk/drlvm/make: depends.properties vm/vmcore.xml
Date Wed, 31 Mar 2010 14:03:26 GMT
Author: hindessm
Date: Wed Mar 31 14:03:25 2010
New Revision: 929541

URL: http://svn.apache.org/viewvc?rev=929541&view=rev
Log:
Fix for dependency download for windows 32-bit covered by "[#HARMONY-6489]
http://www.zlib.net/zlib123-dll.zip  is no longer available".  Hopefully
this doesn't break windows 64-bit.

Modified:
    harmony/enhanced/java/trunk/drlvm/make/depends.properties
    harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml

Modified: harmony/enhanced/java/trunk/drlvm/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/depends.properties?rev=929541&r1=929540&r2=929541&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/drlvm/make/depends.properties Wed Mar 31 14:03:25 2010
@@ -32,10 +32,11 @@ apr.src.tgz.md5=85bcd8005153b8fa63b1e3f9
 
 # ZLIB, version 1.2.1 or above
 # http://www.zlib.net/
-zlib.dir=${base.dep.dir}/libs/${hy.platform.variant}/zlib-123
+zlib.dir@x86@=${base.dep.dir}/libs/${hy.platform.variant}/zlib-124
+zlib.dir@x86_64@=${base.dep.dir}/libs/${hy.platform.variant}/zlib-123
 zlib=${zlib.dir}/zlib.zip
-zlib.url@x86@=http://www.zlib.net/zlib123-dll.zip
-zlib.md5@x86@=cc7fa97f9c19386bb701acc79d0abbca
+zlib.url@x86@=http://www.zlib.net/zlib124-dll.zip
+zlib.md5@x86@=8dc3c0e8d1c4f27df820bba86de3aa99
 zlib.url@x86_64@=http://issues.apache.org/jira/secure/attachment/12351498/zlib-x86_64-dll.zip
 zlib.md5@x86_64@=7397278304667d4e68e9af073da45d98
 

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml?rev=929541&r1=929540&r2=929541&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml Wed Mar 31 14:03:25 2010
@@ -89,13 +89,14 @@
         if="is.windows" unless="win.setup.complete">
         <check-one-file dest="${zlib}" src="${zlib.url}"/>
         <unzip src="${zlib}" dest="${zlib.dir}">
-            <patternset includes="include/** lib/** zlib1.dll"/>
+            <mapper type="flatten" />
         </unzip>
         <copy file="${zlib.dir}/zlib1.dll" todir="${drlvm.bin.dir}"/>
-        <copy file="${zlib.dir}/lib/zdll.lib" todir="${drlvm.lib.dir}"/>
+        <copy file="${zlib.dir}/zdll.lib" todir="${drlvm.lib.dir}" />
         <copy todir="${drlvm.include.dir}">
-            <fileset dir="${zlib.dir}/include">
-                <include name="*.h" />
+            <fileset dir="${zlib.dir}">
+                <include name="zconf.h" />
+                <include name="zlib.h" />
             </fileset>
         </copy>
     </target>



Mime
View raw message