You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/05/01 00:30:15 UTC
svn commit: r939852 - in /harmony/enhanced/java/branches/mrh: ./ classlib/
classlib/depends/oss/ classlib/modules/archive/
classlib/modules/archive/make/ classlib/modules/awt/make/
classlib/modules/awt/src/main/native/gl/windows/ classlib/modules/awt/s...
Author: hindessm
Date: Fri Apr 30 22:30:14 2010
New Revision: 939852
URL: http://svn.apache.org/viewvc?rev=939852&view=rev
Log:
Merging from trunk@939820.
Added:
harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/depends.properties
- copied unchanged from r939820, harmony/enhanced/java/trunk/classlib/modules/archive/make/depends.properties
Removed:
harmony/enhanced/java/branches/mrh/classlib/depends/oss/zlib_1.2.3.zip
Modified:
harmony/enhanced/java/branches/mrh/ (props changed)
harmony/enhanced/java/branches/mrh/classlib/ (props changed)
harmony/enhanced/java/branches/mrh/classlib/depends/oss/ (props changed)
harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile
harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c
harmony/enhanced/java/branches/mrh/common_resources/ (props changed)
harmony/enhanced/java/branches/mrh/drlvm/ (props changed)
harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties
harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml
Propchange: harmony/enhanced/java/branches/mrh/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 30 22:30:14 2010
@@ -1 +1 @@
-/harmony/enhanced/java/trunk:935751-938409
+/harmony/enhanced/java/trunk:935751-939820
Propchange: harmony/enhanced/java/branches/mrh/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 30 22:30:14 2010
@@ -1,2 +1,2 @@
/harmony/enhanced/classlib/trunk:926318-926838
-/harmony/enhanced/java/trunk/classlib:935751-938409
+/harmony/enhanced/java/trunk/classlib:935751-939820
Propchange: harmony/enhanced/java/branches/mrh/classlib/depends/oss/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 30 22:30:14 2010
@@ -1,2 +1,3 @@
findbugs-1.3.9
fdlibm-5.3
+zlib-1.2.5
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml Fri Apr 30 22:30:14 2010
@@ -23,18 +23,29 @@
<property name="hy.hdk" location="${basedir}/../../deploy" />
<property name="depends.dir" location="${basedir}/../../depends" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <import file="${hy.hdk}/build/ant/depends.xml" />
<property file="../../make/depends.properties" />
+ <property file="make/depends.properties" />
- <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
-
- <target name="build" depends="-build-no-check"/>
+ <target name="build" depends="check-depends,-build-no-check"/>
<target name="-build-no-check" depends="-build-jar,-test-jar" />
<target name="clean" depends="-clean-java,-clean-native,-clean-test" />
<target name="check-depends"
- depends="-overlay-oss,-copy-zipsup-include,-copy-zlib-include" />
+ depends="-check-depends,-overlay-oss,
+ -copy-zipsup-include,-copy-zlib-include" />
+
+ <target name="-check-depends" unless="hy.skip.zlib">
+ <check-one-file src="${zlib.url}" dest="${zlib.tar}" />
+ </target>
+
+ <target name="fetch-depends" unless="hy.skip.zlib">
+ <mkdir dir="${zlib.dir}" />
+ <download-one-file src="${zlib.url}" dest="${zlib.tar}"
+ md5="${zlib.md5}" />
+ </target>
<target name="-copy-zlib-include" unless="hy.skip.zlib">
<!-- TOFIX: should add property for: unless="skip.native.build" -->
@@ -59,15 +70,24 @@
depends="-extract-props,-unzip-oss,-ascii2ebcdic-conversion"
unless="hy.skip.zlib" />
- <target name="-extract-props">
- <uptodate property="zlib.uptodate"
- srcfile="${zlib.zip}"
+ <target name="-extract-props" unless="hy.skip.zlib">
+ <uptodate property="zlib.extracted"
+ srcfile="${zlib.tar}"
targetfile="src/main/native/zlib_dist/README" />
+ <condition property="zlib.uptodate" value="true">
+ <or>
+ <isset property="hy.skip.zlib" />
+ <isset property="zlib.extracted" />
+ </or>
+ </condition>
</target>
<target name="-unzip-oss" unless="zlib.uptodate">
<mkdir dir="src/main/native/zlib_dist" />
- <unzip src="${zlib.zip}" dest="src/main/native/zlib_dist" />
+ <untar src="${zlib.tar}" dest="src/main/native/zlib_dist"
+ compression="gzip">
+ <mapper type="flatten"/>
+ </untar>
<chmod dir="src/main/native/zlib_dist" perm="ugo+r" />
<touch file="src/main/native/zlib_dist/README" />
</target>
@@ -85,7 +105,8 @@
<exclude name="**/*.o" />
</fileset>
</copy>
- <fixcrlf srcdir="src/main/native/zlib_dist" includes="**/*" excludes="**/*.o" eol="unix" />
+ <fixcrlf srcdir="src/main/native/zlib_dist"
+ includes="**/*" excludes="**/*.o" eol="unix" />
<delete dir="src/main/native/zlib_dist_ascii" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties Fri Apr 30 22:30:14 2010
@@ -25,25 +25,23 @@ awt.base=http://people.apache.org/~hinde
jpeg.ver=6b
jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
jpeg.testfile=${jpeg.dir}/jversion.h
-jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
-jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
-jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
-jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
+jpeg.tar=${depends.lib.dir}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.url=${awt.base}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.md5@x86@=84d69fb0eb5baca4e0dd36cf017dd6a6
+jpeg.md5@x86_64@=1c111660a0e8d048286ac645bd72c22c
-lcms.ver@x86@=1.18
-lcms.ver@x86_64@=1.15
+lcms.ver=1.19
lcms.dir=${depends.lib.dir}/lcms-${lcms.ver}
-lcms.testfile=${lcms.dir}/lcms.h
-lcms.tar=${depends.lib.dir}/lcms-${lcms.ver}.tar.gz
-lcms.url=${awt.base}/lcms-${lcms.ver}.tar.gz
-lcms.md5@x86@=85cf182f4bf93c9fabe0ddd9fc396a8a
-lcms.md5@x86_64@=e23282246ba9e1cf8b32c52d7fe97c78
+lcms.testfile=${lcms.dir}/include/lcms.h
+lcms.tar=${depends.lib.dir}/harmony-lcms-${lcms.ver}.tar.gz
+lcms.url=${awt.base}/harmony-lcms-${lcms.ver}.tar.gz
+lcms.md5@x86@=48e8ce8481fcebdbb31cdebac38a0c05
+lcms.md5@x86_64@=d7dfc53649e352877e3eb6daad12c290
-png.ver@x86@=1.2.38
-png.ver@x86_64@=1.2.12
-png.dir=${depends.lib.dir}/png-${png.ver}
+png.ver=1.4.1
+png.dir=${depends.lib.dir}/libpng-${png.ver}
png.testfile=${png.dir}/png.h
-png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
-png.url=${awt.base}/png-${png.ver}.tar.gz
-png.md5@x86@=d7cc20b44f12b4e46da29ed6cccbcba5
-png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc
+png.tar=${depends.lib.dir}/harmony-libpng-${png.ver}.tar.gz
+png.url=${awt.base}/harmony-libpng-${png.ver}.tar.gz
+png.md5@x86@=c1dda2d4e71557b6d901be921b77c761
+png.md5@x86_64@=083ff91fa54e4e354613785d6cae2f09
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/windows/makefile Fri Apr 30 22:30:14 2010
@@ -16,7 +16,7 @@
APPVER = 5.0 # Need WINVER=0x0500 to get HMONITOR defined.
!include <$(HY_HDK)\build\make\defines.mak>
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\libpng-$(HY_PNG_VER)\# avoid continuation
LIBBASE=gl
DLLNAME=$(DLLPATH)$(LIBBASE).dll
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/windows/makefile Fri Apr 30 22:30:14 2010
@@ -22,7 +22,7 @@ DLLNAME=$(DLLPATH)$(LIBBASE).dll
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR) /I$(SHAREDSUB)include
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(LCMS_DIR)include /I$(SHAREDSUB)include
BUILDFILES = \
$(SHAREDSUB)cmmerror.obj \
@@ -35,7 +35,7 @@ VIRTFILES = $(LIBBASE).res
SYSLIBFILES = ws2_32.lib Iphlpapi.lib
MDLLIBFILES = $(MDLLIBFILES) \
- $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)lcms$(HY_LINKLIB_SUFFIX)
+ $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
DLLBASE=0x13300000
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties Fri Apr 30 22:30:14 2010
@@ -19,16 +19,15 @@ awt.base=http://people.apache.org/~hinde
jpeg.ver=6b
jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
jpeg.testfile=${jpeg.dir}/jversion.h
-jpeg.tar=${depends.lib.dir}/jpeg-${jpeg.ver}.tar.gz
-jpeg.url=${awt.base}/jpeg-${jpeg.ver}.tar.gz
-jpeg.md5@x86@=610ebc3e6a9f93c9ac9d9261b3fe6611
-jpeg.md5@x86_64@=132fe7221ba3e5c3aa96b851a42ef2a4
+jpeg.tar=${depends.lib.dir}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.url=${awt.base}/harmony-jpeg-${jpeg.ver}.tar.gz
+jpeg.md5@x86@=84d69fb0eb5baca4e0dd36cf017dd6a6
+jpeg.md5@x86_64@=1c111660a0e8d048286ac645bd72c22c
-png.ver@x86@=1.2.38
-png.ver@x86_64@=1.2.12
-png.dir=${depends.lib.dir}/png-${png.ver}
+png.ver=1.4.1
+png.dir=${depends.lib.dir}/libpng-${png.ver}
png.testfile=${png.dir}/png.h
-png.tar=${depends.lib.dir}/png-${png.ver}.tar.gz
-png.url=${awt.base}/png-${png.ver}.tar.gz
-png.md5@x86@=d7cc20b44f12b4e46da29ed6cccbcba5
-png.md5@x86_64@=b562d8042aeb71d877cfd10518d019bc
+png.tar=${depends.lib.dir}/harmony-libpng-${png.ver}.tar.gz
+png.url=${awt.base}/harmony-libpng-${png.ver}.tar.gz
+png.md5@x86@=c1dda2d4e71557b6d901be921b77c761
+png.md5@x86_64@=083ff91fa54e4e354613785d6cae2f09
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile Fri Apr 30 22:30:14 2010
@@ -15,7 +15,7 @@
!include <$(HY_HDK)\build\make\defines.mak>
-PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
+PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\libpng-$(HY_PNG_VER)\# avoid continuation
LIBBASE=pngencoder
DLLNAME=$(DLLPATH)$(LIBBASE).dll
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java Fri Apr 30 22:30:14 2010
@@ -72,7 +72,7 @@ public class Environment {
return new String(env, "UTF-8");
} catch (UnsupportedEncodingException e) {
// UTF-8 should always be supported so this should not be reached
- throw new RuntimeException(e);
+ throw new AssertionError(e);
}
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/windows/OSFileSystemWin32.c Fri Apr 30 22:30:14 2010
@@ -230,13 +230,11 @@ Java_org_apache_harmony_luni_platform_OS
(*env)->ReleaseByteArrayElements(env, toRelease, buf, JNI_ABORT);
}
- if(bytesWritten == -1 && hyerror_last_error_number() == HYPORT_ERROR_FILE_LOCKED){
- throwNewExceptionByName(env, "java/io/IOException", netLookupErrorString(env, HYPORT_ERROR_FILE_LOCKED));
- break;
- }
- if(bytesWritten == -1){
+ if(bytesWritten < 0){
+ throwNewExceptionByName(env, "java/io/IOException",
+ netLookupErrorString(env, hyerror_last_error_number()));
totalWritten = -1;
- break;
+ break;
}
totalWritten += bytesWritten;
Propchange: harmony/enhanced/java/branches/mrh/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 30 22:30:14 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/java/trunk/common_resources:935751-938409
+/harmony/enhanced/java/trunk/common_resources:935751-939820
/harmony/enhanced/trunk/common_resources:476396-920147
/incubator/harmony/enhanced/trunk/common_resources:423974-476394
Propchange: harmony/enhanced/java/branches/mrh/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 30 22:30:14 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/java/trunk/drlvm:935751-938409
+/harmony/enhanced/java/trunk/drlvm:935751-939820
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/working_vm:423974-476394
Modified: harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties Fri Apr 30 22:30:14 2010
@@ -30,17 +30,6 @@ apr.src.rootdir=apr-1.3.9
apr.src.tgz.url=http://archive.apache.org/dist/apr/apr-1.3.9.tar.gz
apr.src.tgz.md5=85bcd8005153b8fa63b1e3f95ea31f07
-# ZLIB, version 1.2.1 or above
-# http://www.zlib.net/
-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/zlib124-dll.zip
-zlib.md5@x86@=8dc3c0e8d1c4f27df820bba86de3aa99
-zlib.url@x86_64@=https://issues.apache.org/jira/secure/attachment/12351498/zlib-x86_64-dll.zip
-zlib.md5@x86_64@=7397278304667d4e68e9af073da45d98
-
-
# Ant-contrib, version 0.6 or above
# http://sourceforge.net/project/showfiles.php?group_id=36177
ant-contrib=${depends.jars}/ant-contrib-1.0b3/ant-contrib.zip
Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml?rev=939852&r1=939851&r2=939852&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/vmcore.xml Fri Apr 30 22:30:14 2010
@@ -21,24 +21,16 @@
<property name="component" value="vmcore"/>
<import file="common-vm.xml"/>
- <target name="fetch-depends" depends="fetch-depends-win">
+ <target name="fetch-depends">
<fetch dep="icuhdr"/>
<fetch dep="icudll"/>
</target>
- <target name="fetch-depends-win" if="is.windows">
- <fetch dep="zlib"/>
- </target>
-
- <target name="check-depends" depends="check-depends-win">
+ <target name="check-depends">
<check-one-file dest="${icuhdr}" src="${icuhdr.url}"/>
<check-one-file dest="${icudll}" src="${icudll.url}"/>
</target>
- <target name="check-depends-win" if="is.windows">
- <check-one-file dest="${zlib}" src="${zlib.url}"/>
- </target>
-
<target name="-check-setup">
<available file="${drlvm.include.dir}/unicode" property="icu4c.hdr.available"/>
<available file="${drlvm.shlib.dir}/${linklib.prefix}icuuc${linklib.suffix}"
@@ -51,7 +43,7 @@
</condition>
</target>
- <target name="setup" depends="-check-setup,-setup-win" unless="setup.complete">
+ <target name="setup" depends="-check-setup" unless="setup.complete">
<check-one-file dest="${icuhdr}" src="${icuhdr.url}"/>
<check-one-file dest="${icudll}" src="${icudll.url}"/>
<mkdir dir="${drlvm.include.dir}/unicode"/>
@@ -73,34 +65,6 @@
dest="${drlvm.shlib.dir}/${linklib.prefix}icuuc${linklib.suffix}"/>
</target>
- <target name="-check-setup-win" if="is.windows">
- <condition property="zlib.available">
- <and>
- <available file="${drlvm.bin.dir}/zlib1.dll"/>
- <available file="${drlvm.include.dir}/zlib.h"/>
- </and>
- </condition>
- <condition property="win.setup.complete">
- <isset property="zlib.available"/>
- </condition>
- </target>
-
- <target name="-setup-win" depends="-check-setup-win"
- if="is.windows" unless="win.setup.complete">
- <check-one-file dest="${zlib}" src="${zlib.url}"/>
- <unzip src="${zlib}" dest="${zlib.dir}">
- <mapper type="flatten" />
- </unzip>
- <copy file="${zlib.dir}/zlib1.dll" todir="${drlvm.bin.dir}"/>
- <copy file="${zlib.dir}/zdll.lib" todir="${drlvm.lib.dir}" />
- <copy todir="${drlvm.include.dir}">
- <fileset dir="${zlib.dir}">
- <include name="zconf.h" />
- <include name="zlib.h" />
- </fileset>
- </copy>
- </target>
-
<target name="build" depends="setup,stamp-version,-common-vm">
<init-native component="vmcore"/>
@@ -133,6 +97,7 @@
<include name="vmcore/src/lil/em64t/include" if="is.x86_64"/>
</dirset>
<pathelement location="${drlvm.include.dir}" />
+ <pathelement location="${hy.hdk}/include" />
</path>
<depend-includes paths="vmcore.includes"/>
<depend-selector rebuild-flag="vmcore.includes.uptodate" id="vmcore.depends"/>
@@ -221,15 +186,17 @@
dir="${drlvm.lib.dir}" />
<libset libs="hythr" dir="${drlvm.shlib.dir}" />
<libset libs="icuuc" dir="${drlvm.shlib.dir}"/>
- <libset libs="zdll" dir="${drlvm.lib.dir}" if="is.windows"/>
<libset libs="ch" dir="${drlvm.shlib.dir}" />
+ <libset libs="hyzlib" dir="${hy.hdk.shlibs}"
+ unless="hy.skip.zlib"/>
+ <syslibset type="shared" libs="z" if="hy.skip.zlib"/>
<linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm64.def" if="is.windows.x86_64"/>
<linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm.def" if="is.windows.x86"/>
<linkerarg value="--version-script=${vm.home}/vmcore/build/vmcore.exp" if="is.unix"/>
- <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread,gcc_s,rt" if="is.linux"/>
- <syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/>
+ <syslibset type="shared" libs="m,dl,stdc++,xml2,pthread,gcc_s,rt" if="is.linux"/>
+ <syslibset type="shared" libs="m,stdc++,pthread" if="is.freebsd"/>
<libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
<linkerarg value="--export-dynamic" if="is.freebsd"/>
</linker>