harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951678 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/build/ classlib/depends/build/platform/ classlib/depends/libs/ classlib/make/ classlib/modules/archive/src/main/native/archive/unix/ classlib/modules/archive/...
Date Sat, 05 Jun 2010 08:42:13 GMT
Author: hindessm
Date: Sat Jun  5 08:42:11 2010
New Revision: 951678

URL: http://svn.apache.org/viewvc?rev=951678&view=rev
Log:
Merge changes from trunk@951343.

Added:
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/test/resources/jars/org/apache/harmony/tests/instrument/BCP.jar
      - copied unchanged from r951343, harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/resources/jars/org/apache/harmony/tests/instrument/BCP.jar
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/test/resources/jars/org/apache/harmony/tests/instrument/BCPTest.jar
      - copied unchanged from r951343, harmony/enhanced/java/trunk/classlib/modules/instrument/src/test/resources/jars/org/apache/harmony/tests/instrument/BCPTest.jar
    harmony/enhanced/java/branches/java6/drlvm/make/build.properties
      - copied unchanged from r951343, harmony/enhanced/java/trunk/drlvm/make/build.properties
    harmony/enhanced/java/branches/java6/ibm-v4/make/build.properties
      - copied unchanged from r951343, harmony/enhanced/java/trunk/ibm-v4/make/build.properties
Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/build.xml
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/build/defines.mk
    harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mk
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
    harmony/enhanced/java/branches/java6/classlib/make/properties.xml
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/native/security/windows/makefile
    harmony/enhanced/java/branches/java6/common_resources/   (props changed)
    harmony/enhanced/java/branches/java6/common_resources/make/svn.xml
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  5 08:42:11 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-950187
+/harmony/enhanced/java/trunk:929253-951343
 /harmony/enhanced/trunk:810871-929252

Modified: harmony/enhanced/java/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/build.xml?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/build.xml (original)
+++ harmony/enhanced/java/branches/java6/build.xml Sat Jun  5 08:42:11 2010
@@ -38,7 +38,10 @@
     <property name="vm.dir" value="drlvm" />
     <property name="vm.dir.loc" location="${vm.dir}" />
 
-    <property name="hy.local.zlib" value="false" />
+    <!-- import some vm-specific properties -->
+    <property file="${vm.dir.loc}/make/build.properties" />
+
+    <import file="common_resources/make/properties.xml" />
 
     <description>
         Apache Harmony project federation script
@@ -441,6 +444,8 @@ Usage:
         <propertyref name="use.libstdc++5" />
         <propertyref name="harmony.java.version" />
         <propertyref name="is.federated.build" />
+        <propertyref name="hy.no.thr" />
+        <propertyref name="hy.zip.api" />
     </propertyset>
     
     <target name="build-classlib"
@@ -657,104 +662,51 @@ Usage:
     <!-- ============================================================== -->
     <!-- sets up a platform                                             -->
     <!-- ============================================================== -->
-    <target name="init" depends="-svn-prop">
-        <!-- Determine our operating system -->
-        <condition property="is.windows">
-            <os family="windows" />
-        </condition>
-
-        <condition property="is.unix">
-            <os family="unix" />
-        </condition>
-
-        <condition property="is.linux">
-            <os name="linux" />
-        </condition>
-
-        <!-- this special case makes sense -->
-        <condition property="harmony.os" value="windows">
-            <isset property="is.windows"/>
-        </condition>
-        <condition property="harmony.os" value="linux">
-            <os name="linux" />
-        </condition>
-
-        <property name="harmony.os" value="${os.name}" />
+    <target name="init" depends="-svn-info">
 
-        <!-- Conditions for different architectures -->
-        <condition property="is.x86_64">
-            <os arch="x86_64"/>
-        </condition>
-        <condition property="is.x86">
-            <or>
-                <os arch="x86"/>
-                <os arch="i386"/>
-            </or>
-        </condition>
-        <condition property="is.ia64">
-            <os arch="ia64" />
-        </condition>
-        <condition property="is.64bit">
-            <or>
-                <os arch="ia64" />
-                <os arch="x86_64"/>
-            </or>
-        </condition>
-        <condition property="is.32bit">
-            <or>
-                <os arch="x86"/>
-                <os arch="i386"/>
-            </or>
-        </condition>
-
-        <!-- Normalized architecture name -->
-        <condition property="harmony.arch" value="x86">
-            <isset property="is.x86" />
-        </condition>
-        <condition property="harmony.arch" value="x86_64">
-            <or>
-                <os arch="x86_64"/>
-                <os arch="amd64"/>
-                <os arch="em64t"/>
-            </or>
-        </condition>
-        <property name="harmony.arch" value="${os.arch}" />
+        <property name="harmony.version" value="${svn.revision}" />
+        <property name="harmony.long.version" value="${svn.info}" />
 
         <condition property="version.prefix" value="select-">
             <istrue value="${hy.select}" />
         </condition>
         <property name="version.prefix" value="" />
 
+        <condition property="vm.prefix" value="">
+            <equals arg1="drlvm" arg2="${vm.dir}" />
+        </condition>
+        <property name="vm.prefix" value="${vm.dir}-" />
+
         <property name="harmony.deploy.suffix" value="-snapshot" />
 
         <property name="harmony.java.version" value="6.0" />
 
         <property name="deploy.file.prefix"
-            value="apache-harmony-${version.prefix}${harmony.java.version}-" />
+            value="apache-harmony-${version.prefix}${harmony.java.version}-${vm.prefix}" />
 
         <property name="archive.dir.prefix"
-            value="harmony-${version.prefix}${harmony.java.version}-" />
+            value="harmony-${version.prefix}${harmony.java.version}-${vm.prefix}" />
 
         <property name="deploy.hdk.file.prefix"
                  value="${deploy.file.prefix}hdk-r${harmony.version}" />
         <property name="deploy.hdk.tar"
-                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" />
+                 value="${deploy.hdk.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.tar.gz" />
         <property name="deploy.hdk.zip"
-                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" />
+                 value="${deploy.hdk.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.zip" />
 
         <property name="deploy.jdk.file.prefix"
                  value="${deploy.file.prefix}jdk-r${harmony.version}" />
         <property name="deploy.jdk.tar"
-                 value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" />
+                 value="${deploy.jdk.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.tar.gz" />
         <property name="deploy.jdk.zip"
-                 value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" />
+                 value="${deploy.jdk.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.zip" />
 
         <property name="deploy.jre.file.prefix"
                  value="${deploy.file.prefix}jre-r${harmony.version}" />
         <property name="deploy.jre.tar"
-                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" />
+                 value="${deploy.jre.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.tar.gz" />
         <property name="deploy.jre.zip"
-                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" />
+                 value="${deploy.jre.file.prefix}-${hy.os}-${hy.arch}${harmony.deploy.suffix}.zip" />
 
         <property name="deploy.src.file.prefix"
                  value="${deploy.file.prefix}src-r${harmony.version}" />
@@ -781,56 +733,18 @@ Usage:
                    Apache Harmony Federated Build
             ==========================================
             svn rev          :  ${harmony.version}
-            operating system :  ${harmony.os}
-            CPU architecture :  ${harmony.arch}
+            operating system :  ${hy.os}
+            CPU architecture :  ${hy.arch}
             ant os name/arch :  ${os.name}/${os.arch}
             hosting Java     :  ${java.version} (${java.vendor})
             build mode       :  ${hy.cfg}
             output location  :  ${target.dir}
             SVN root         :  ${svn.root}
+            archive.dir      :  ${archive.dir.prefix}
+            archive.name     :  ${deploy.file.prefix}
         </echo>
     </target>
 
-    <!-- ============================================================== -->
-    <!-- svn-prop: gets svn revision number of the build.xml file       -->
-    <!-- ============================================================== -->
-    <target name="-svn-prop">
-        
-        <tempfile suffix=".xml" property="svn.tmp"/>
-        <exec executable="svn" output="${svn.tmp}" resultproperty="svn.rc">
-            <arg line="info ${basedir} --non-interactive --xml" />
-        </exec>
-        <condition property="svn.info.file" value="${svn.tmp}">
-            <equals arg1="0" arg2="${svn.rc}"/>
-        </condition>
-        <xmlproperty file="${svn.info.file}" prefix="federated" 
-            keeproot="no" collapseAttributes="yes"/>
-        <delete file="${svn.tmp}" quiet="true"/>
-
-        <condition property="is.svn">
-            <isset property="federated.entry.revision"/>
-        </condition>
-
-        <condition property="svn.revision" value="${federated.entry.revision}" else="unknown">
-            <isset property="is.svn"/>
-        </condition>
-            <condition property="svn.root" 
-                value="${federated.entry.repository.root}"
-                else="http://svn.apache.org/repos/asf">
-                <isset property="is.svn"/>
-            </condition>
-
-        <condition property="svn.info" value="${svn.root} ${svn.revision}">
-            <isset property="is.svn"/>
-        </condition>
-        <tstamp>
-            <format property="svn.info" pattern="'Unknown revision at' dd-MMM-yyyy hh:mm aa"/>
-        </tstamp>
-
-        <property name="harmony.version" value="${svn.revision}" />
-        <property name="harmony.long.version" value="${svn.info}" />
-
-    </target>
 
     <target name="bundle-src-tgz" depends="init" if="is.unix">
 

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  5 08:42:11 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-950187
+/harmony/enhanced/java/trunk/classlib:929253-951343
 /harmony/enhanced/trunk/classlib:810871-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/working_classlib:423974-476394

Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/defines.mk?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/defines.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/defines.mk Sat Jun  5 08:42:11 2010
@@ -24,7 +24,9 @@ CPP = $(CC) -E
 AS = as
 AR = ar
 RANLIB=echo
-ARFLAGS = rcv
+ARFLAGS =
+ARCREATE = rcv
+AREXTRACT = xo
 DLL_LD = $(CC)
 DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
 CXX_DLL_LD = $(CXX)

Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc32.mk?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc32.mk Sat Jun  5 08:42:11 2010
@@ -25,7 +25,7 @@ WARNFLAGS =
 HYDEBUGCFLAGS = -g -O0
 HYRELEASEFLAGS = -s -O3 -DNDEBUG
 
-ARFLAGS = -X32 rcv
+ARFLAGS = -X32
 ASFLAGS += -a32 -mppc
 DLL_LD = $(LD)
 DLL_LDFLAGS = -bE:$(EXPFILE)

Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc64.mk?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/platform/aix.ppc64.mk Sat Jun  5 08:42:11 2010
@@ -25,7 +25,7 @@ WARNFLAGS =
 HYDEBUGCFLAGS = -g -O0
 HYRELEASEFLAGS = -s -O3 -DNDEBUG
 
-ARFLAGS = -X64 rcv
+ARFLAGS = -X64
 ASFLAGS += -a64 -many
 DLL_LD = $(LD)
 DLL_LDFLAGS = -bE:$(EXPFILE)

Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mk?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mk Sat Jun  5 08:42:11 2010
@@ -37,7 +37,7 @@ endif
 all: $(DLLNAME) $(EXENAME) $(LIBNAME)
 
 $(LIBNAME): $(BUILDFILES)
-	$(AR) $(ARFLAGS) $@ $(BUILDFILES)
+	$(AR) $(ARFLAGS) $(ARCREATE) $@ $(BUILDFILES)
 	$(RANLIB) $@
 
 $(EXPFILE): exports.txt

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  5 08:42:11 2010
@@ -1,3 +1,3 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-950187
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-951343
 /harmony/enhanced/trunk/classlib/depends/libs:810871-929252

Modified: harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml Sat Jun  5 08:42:11 2010
@@ -25,9 +25,7 @@
     where possible.
     </description>
 
-    <!-- temporary workaround for Ant bug 47382 - to be removed when that is resolved and released -->
-    <copy file="${basedir}/make/depends.properties" tofile="${basedir}/make/depends.properties.ascii" outputencoding="ISO-8859-1" />
-    <loadproperties srcfile="${basedir}/make/depends.properties.ascii" encoding="ISO-8859-1">
+    <loadproperties srcfile="${basedir}/make/depends.properties">
       <filterchain>
         <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
             <param type="token" name="${hy.arch}" value=""/>
@@ -37,7 +35,6 @@
         </filterreader>
       </filterchain>
     </loadproperties>
-    <delete file="${basedir}/make/depends.properties.ascii" />
 
     <macrodef name="download-one-file">
         <attribute name="src" />

Modified: harmony/enhanced/java/branches/java6/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/properties.xml?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/properties.xml Sat Jun  5 08:42:11 2010
@@ -575,6 +575,8 @@ properties in preference to these:
                 <property name="hy.hdk" value="${hy.hdk}"/>
                 <property name="svn.revision" value="${svn.revision}"/>
                 <property name="svn.info" value="${svn.info}"/>
+                <property name="hy.no.thr" value="${hy.no.thr}"/>
+                <property name="hy.zip.api" value="${hy.zip.api}"/>
                 <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
                     <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
                 </fileset>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile Sat Jun  5 08:42:11 2010
@@ -37,8 +37,7 @@ MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LI
 endif
 
 MDLLIBFILES += \
-	$(MDLLIBZLIB) $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+	$(MDLLIBZLIB) $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME=$(DLLPATH)libhyarchive$(HY_SHLIB_SUFFIX)
 EXPNAME=HYARCHIVE_0.1

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile Sat Jun  5 08:42:11 2010
@@ -42,7 +42,6 @@ MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)h
 
 MDLLIBFILES = $(MDLLIBFILES) \
         $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
 	$(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13100000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile Sat Jun  5 08:42:11 2010
@@ -22,7 +22,11 @@ include $(HY_HDK)/build/make/defines.mk
 INCLUDES += -I../../zlib_dist
 
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
-	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
+	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o
+
 LIBNAME = $(LIBPATH)libhyzip.a
 
+%.o: $(LIBPATH)libhypool.a(%.o)
+	ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
+
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile Sat Jun  5 08:42:11 2010
@@ -22,7 +22,8 @@
 LIBBASE=hyzip
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
-	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
+	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj \
+        $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
 HYCFLAGS = $(HYCFLAGS) /I..\..\zlib_dist
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile Sat Jun  5 08:42:11 2010
@@ -21,13 +21,7 @@ include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += \
-        $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyauth$(HY_SHLIB_SUFFIX)
 EXPNAME = HYAUTH_0.1

Modified: harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile Sat Jun  5 08:42:11 2010
@@ -28,13 +28,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-!IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = $(MDLLIBFILES) \
-	$(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
-	$(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/makefile Sat Jun  5 08:42:11 2010
@@ -32,13 +32,6 @@ BUILDFILES = \
   FontLibExports.o \
   $(SHAREDSUB)TypeDefinition.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += \
-	$(LIBPATH)libhypool.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 OSLIBS += $(STDCLIBS)
 
 DLLNAME=$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/windows/makefile Sat Jun  5 08:42:11 2010
@@ -41,9 +41,7 @@ BUILDFILES = \
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool.lib $(LIBPATH)vmi.lib \
-  $(LIBPATH)hyzlib.lib 
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzlib.lib 
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/unix/makefile Sat Jun  5 08:42:11 2010
@@ -34,14 +34,6 @@ BUILDFILES = \
 
 OSLIBS += -lpng
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a
-endif
-
-MDLLIBFILES += $(MDLLIBZLIB) \
-	$(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 OSLIBS += $(STDCLIBS) $(XLIBS)
 
 DLLNAME=$(DLLPATH)libgl$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile Sat Jun  5 08:42:11 2010
@@ -45,7 +45,6 @@ SYSLIBFILES = ws2_32.lib Iphlpapi.lib \
               Msimg32.lib gdiplus.lib User32.lib uxTheme.lib 
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(PNG_DIR)libpng$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile Sat Jun  5 08:42:11 2010
@@ -21,13 +21,6 @@ BUILDFILES = $(SHAREDSUB)JpegDecoder.o
 
 OSLIBS += -ljpeg
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 DLLNAME=$(DLLPATH)libjpegdecoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGDECODER_0.1
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile Sat Jun  5 08:42:11 2010
@@ -29,8 +29,7 @@ BUILDFILES = $(SHAREDSUB)JpegDecoder.obj
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/unix/makefile Sat Jun  5 08:42:11 2010
@@ -26,13 +26,6 @@ BUILDFILES = \
 
 OSLIBS += -llcms
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 DLLNAME=$(DLLPATH)liblcmm$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLCMM_0.1
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile Sat Jun  5 08:42:11 2010
@@ -34,8 +34,7 @@ BUILDFILES = \
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LCMS_DIR)Lib/MS/lcms$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/makefile Sat Jun  5 08:42:11 2010
@@ -26,13 +26,7 @@ endif
 
 BUILDFILES = LinuxNativeFont.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) \
-	$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += -lm $(XLIBS)
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile Sat Jun  5 08:42:11 2010
@@ -20,13 +20,6 @@ INCLUDES += -I$(SHARED)common -I$(SHARED
 BUILDFILES = \
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 OSLIBS += $(STDCLIBS)
 
 DLLNAME=$(DLLPATH)liboglwrapper$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile Sat Jun  5 08:42:11 2010
@@ -27,8 +27,6 @@ BUILDFILES = $(SHAREDSUB)org_apache_harm
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
-
 DLLBASE=0x13300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile Sat Jun  5 08:42:11 2010
@@ -31,7 +31,7 @@ BUILDFILES = \
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) 
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) 
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/winfont/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/winfont/windows/makefile Sat Jun  5 08:42:11 2010
@@ -30,7 +30,8 @@ BUILDFILES = winFont.obj
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib 
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LIBPATH)FL$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) \
+  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(LIBPATH)FL$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile Sat Jun  5 08:42:11 2010
@@ -23,13 +23,6 @@ BUILDFILES = \
   org_apache_harmony_awt_nativebridge_linux_X11.o \
   org_apache_harmony_awt_nativebridge_linux_Xft.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 OSLIBS += $(STDCLIBS) $(XLIBS)
 
 DLLNAME=$(DLLPATH)libX11Wrapper$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile Sat Jun  5 08:42:11 2010
@@ -25,13 +25,6 @@ else
 MDLLIBFILES += $(LIBPATH)libjpeg.a
 endif
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 DLLNAME=$(DLLPATH)libjpegencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGENCODER_0.1
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile Sat Jun  5 08:42:11 2010
@@ -40,8 +40,7 @@ BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(JPEG_DIR)libjpeg$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile Sat Jun  5 08:42:11 2010
@@ -26,15 +26,6 @@ MDLLIBFILES += $(LIBPATH)libpng.a
 DEFINES += -DPNGAPI=
 endif
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
-OSLIBS += $(STDCLIBS)
-
 ifeq ($(HY_OS),zos)
 MDLLIBFILES += $(MDLLIBZLIB)
 endif

Modified: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile Sat Jun  5 08:42:11 2010
@@ -31,7 +31,6 @@ VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX) $(PNG_DIR)libpng$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13300000

Modified: harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/shared/inst_agt.c Sat Jun  5 08:42:11 2010
@@ -380,10 +380,35 @@ jint Parse_Options(JavaVM *vm, JNIEnv *e
     //add bootclasspath
 
     bootclasspath = read_attribute(vm, manifest, lwrmanifest,"boot-class-path");
-    if(NULL != bootclasspath){
+    if (NULL != bootclasspath){
+        
+#if defined(WIN32) || defined(WIN64)
+        // On Windows the agent jar path can have a mixture of forward and back slashes.
+        // For ease, convert forward slashes to back slashes
+        char *currentSlash = strchr(jar_name, '/');
+        while (currentSlash) {
+            *currentSlash = '\\';
+            currentSlash = strchr(currentSlash, '/');
+        }
+#endif
+
         bootclasspath_item = strtok(bootclasspath, " ");
         while(NULL != bootclasspath_item){
-            check_jvmti_error(env, (*jvmti)->AddToBootstrapClassLoaderSearch(jvmti, bootclasspath_item),"Failed to add bootstrap classpath.");
+            if ((bootclasspath_item[0] != DIR_SEPARATOR) && (strrchr(jar_name, DIR_SEPARATOR))) {
+                // This is not an absolute path, so add this relative path to the path of the agent library
+                int lastSeparatorOff = strrchr(jar_name, DIR_SEPARATOR) - jar_name + 1;
+                int size = lastSeparatorOff + strlen(bootclasspath_item) + 1;
+                char *jarPath = (char *)hymem_allocate_memory(size);
+                
+                memcpy(jarPath, jar_name, lastSeparatorOff);
+                strcpy(jarPath + lastSeparatorOff, bootclasspath_item);
+                check_jvmti_error(env, (*jvmti)->AddToBootstrapClassLoaderSearch(jvmti, jarPath),"Failed to add bootstrap classpath.");
+                hymem_free_memory(jarPath);
+            } else {
+                // This is either an absolute path of jar_name has not path before the filename
+                check_jvmti_error(env, (*jvmti)->AddToBootstrapClassLoaderSearch(jvmti, bootclasspath_item),"Failed to add bootstrap classpath.");
+            }           
+
             bootclasspath_item = strtok(NULL, " ");
         }
         hymem_free_memory(bootclasspath);

Modified: harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/unix/makefile Sat Jun  5 08:42:11 2010
@@ -26,9 +26,7 @@ ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a 
 endif
 
-MDLLIBFILES += \
-	$(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyinstrument$(HY_SHLIB_SUFFIX)
 EXPNAME = HYINSTRUMENT_0.1

Modified: harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/windows/makefile Sat Jun  5 08:42:11 2010
@@ -33,11 +33,11 @@ VIRTFILES = hyinstrument.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
 !IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) \
+              $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
 !ENDIF
 
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
-  $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java Sat Jun  5 08:42:11 2010
@@ -28,10 +28,10 @@ public class InstrumentTest extends Test
      */
     public void test_addTransformer_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_addTransformer_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -41,10 +41,10 @@ public class InstrumentTest extends Test
      */
     public void test_removeTransformer_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -54,10 +54,10 @@ public class InstrumentTest extends Test
      */
     public void test_removeTransformer_notExists() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_removeTransformer_notExists.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -67,10 +67,10 @@ public class InstrumentTest extends Test
      */
     public void test_loadClass_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/loading_class.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -85,10 +85,10 @@ public class InstrumentTest extends Test
      */
     public void test_new_classLoader_Exists() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/new_classloader.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertNotNull(result);
     }
@@ -98,10 +98,10 @@ public class InstrumentTest extends Test
      */
     public void test_Property_Premain_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Property_Premain_null.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -120,10 +120,10 @@ public class InstrumentTest extends Test
      */
     public void test_Property_other_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Property_other_null.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertNotNull(result);
     }
@@ -133,10 +133,10 @@ public class InstrumentTest extends Test
      */
     public void test_Properity_case_sensitive() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Properity_case_sensitive.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -146,10 +146,10 @@ public class InstrumentTest extends Test
      */
     public void test_BadFormatJar() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
         arg[1] = "";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/BadFormatJar.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -167,10 +167,10 @@ public class InstrumentTest extends Test
      */
     public void test_Premain_Class_null() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/Premain_Class_null.jar";
         try {
             Support_Exec.execJava(arg, path, true);
             fail("Should fail here!");
@@ -185,10 +185,10 @@ public class InstrumentTest extends Test
      */
     public void test_zero_byte_transformer() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/zero_byte_class.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
@@ -198,11 +198,23 @@ public class InstrumentTest extends Test
      */
     public void test_old_version() throws Exception {
         String[] arg = new String[2];
-        arg[0] = "-javaagent:src/test/resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
         arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
         String[] path = new String[1];
-        path[0] = "src/test/resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
+        path[0] = "resources/jars/org/apache/harmony/tests/instrument/old_version_class.jar";
         String result = Support_Exec.execJava(arg, path, true);
         assertEquals("", result);
     }
+
+    /**
+     * @tests test manifest Boot-Class-Path property is treated 
+     *        correctly
+     */
+    public void test_boot_class_path() throws Exception {
+        String[] arg = new String[2];
+        arg[0] = "-javaagent:resources/jars/org/apache/harmony/tests/instrument/BCPTest.jar";
+        arg[1] = "org/apache/harmony/tests/java/lang/instrument/TestMain";
+        String result = Support_Exec.execJava(arg, null, true);
+        assertEquals("Hello World", result.trim());
+    }
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile Sat Jun  5 08:42:11 2010
@@ -21,7 +21,10 @@ include $(HY_HDK)/build/make/defines.mk
 
 INCLUDES += -I../../include/shared
 BUILDFILES = $(SHAREDSUB)hyzip.o $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
-	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
+	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o
 LIBNAME = $(LIBPATH)libhyzip.a
 
+%.o: $(LIBPATH)libhypool.a(%.o)
+	ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
+
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/windows/makefile Sat Jun  5 08:42:11 2010
@@ -26,5 +26,6 @@ BUILDFILES = \
 	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
 
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\include\shared /I..\..\include\windows
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/makefile Sat Jun  5 08:42:11 2010
@@ -40,11 +40,7 @@ BUILDFILES = \
 	$(SHAREDSUB)OSMemory.o OSMemoryLinux32.o $(SHAREDSUB)OSNetworkSystem.o \
 	OSNetworkSystemLinux.o hyenv.o consoleimpl.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
+MDLLIBFILES += $(LIBPATH)libhyfdlibm.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += -lm

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/makefile Sat Jun  5 08:42:11 2010
@@ -43,12 +43,7 @@ VIRTFILES = hyluni.res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib Mswsock.lib
 
-!IF "$(HY_ZIP_API)" != "true"
 MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
-MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hyfdlibm$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000

Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmi/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmi/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmi/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmi/unix/makefile Sat Jun  5 08:42:11 2010
@@ -20,7 +20,7 @@
 include $(HY_HDK)/build/make/defines.mk
 
 BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
-MDLLIBFILES = $(LIBPATH)libhypool.a
+MDLLIBFILES =
 
 DLLNAME = ../libvmi$(HY_SHLIB_SUFFIX)
 EXPNAME = VMI_0.1

Modified: harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/unix/makefile Sat Jun  5 08:42:11 2010
@@ -24,13 +24,6 @@ BUILDFILES = \
   $(SHAREDSUB)org_apache_harmony_misc_accessors_ObjectAccessorImpl.o \
   $(SHAREDSUB)org_apache_harmony_misc_accessors_StringAccessorImpl.o
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)
-endif
-
-MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
-
 DLLNAME=$(DLLPATH)libaccessors$(HY_SHLIB_SUFFIX)
 EXPNAME=HYMISC_0.1
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/windows/makefile Sat Jun  5 08:42:11 2010
@@ -29,9 +29,6 @@ BUILDFILES = \
 VIRTFILES = accessors.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
-
 DLLBASE=0x13300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/unix/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/unix/makefile Sat Jun  5 08:42:11 2010
@@ -25,13 +25,7 @@ ifeq ($(HY_OS),linux)
 BUILDFILES += EpollSelectorImpl.o
 endif
 
-ifneq ($(HY_ZIP_API),true)
-MDLLIBFILES += $(LIBPATH)libhyzip.a 
-endif
-
-MDLLIBFILES = \
-	$(LIBPATH)libhycommon.a \
-	$(LIBPATH)libhypool.a
+MDLLIBFILES = $(LIBPATH)libhycommon.a
 
 DLLNAME = $(DLLPATH)libhynio$(HY_SHLIB_SUFFIX)
 EXPNAME = HYNIO_0.1

Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/windows/makefile Sat Jun  5 08:42:11 2010
@@ -31,13 +31,7 @@ VIRTFILES = hynio.res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-!IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = \
-  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
 MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) \
   $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 
 DLLBASE=0x13200000

Modified: harmony/enhanced/java/branches/java6/classlib/modules/prefs/src/main/native/prefs/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/prefs/src/main/native/prefs/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/prefs/src/main/native/prefs/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/prefs/src/main/native/prefs/windows/makefile Sat Jun  5 08:42:11 2010
@@ -31,13 +31,7 @@ VIRTFILES = $(LIBBASE).res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-!IF "$(HY_ZIP_API)" != "true"
-MDLLIBFILES = \
-  $(LIBPATH)hyzip$(HY_LINKLIB_SUFFIX) $(LIBPATH)hyzlib$(HY_LINKLIB_SUFFIX)
-!ENDIF
-
-MDLLIBFILES = $(MDLLIBFILES) \
-  $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x13300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/native/security/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/native/security/windows/makefile?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/native/security/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/native/security/windows/makefile Sat Jun  5 08:42:11 2010
@@ -28,7 +28,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 
-MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX) $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES = $(LIBPATH)hycommon$(HY_LINKLIB_SUFFIX)
 DLLBASE=0x1300000
 
 !include <$(HY_HDK)\build\make\rules.mak>

Propchange: harmony/enhanced/java/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  5 08:42:11 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh/common_resources:935751-941490
-/harmony/enhanced/java/trunk/common_resources:929253-950187
+/harmony/enhanced/java/trunk/common_resources:929253-951343
 /harmony/enhanced/trunk/common_resources:476396-929252
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Modified: harmony/enhanced/java/branches/java6/common_resources/make/svn.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/svn.xml?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/svn.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/svn.xml Sat Jun  5 08:42:11 2010
@@ -35,6 +35,12 @@
             value="${global.entry.repository.root} ${svn.revision}">
             <isset property="is.svn"/>
         </condition>
+        <condition property="svn.root" 
+                   value="${global.entry.repository.root}"
+                   else="http://svn.apache.org/repos/asf">
+            <isset property="is.svn"/>
+        </condition>
+        
         <tstamp>
             <format property="svn.info" pattern="'Unknown revision at' dd-MMM-yyyy hh:mm aa"/>
         </tstamp>

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  5 08:42:11 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-950187
+/harmony/enhanced/java/trunk/drlvm:929253-951343
 /harmony/enhanced/trunk/drlvm:810871-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun  5 08:42:11 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-950187
+/harmony/enhanced/java/trunk/jdktools:929253-951343
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:810871-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c?rev=951678&r1=951677&r2=951678&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c Sat Jun  5 08:42:11 2010
@@ -15,6 +15,10 @@
  *  limitations under the License.
  */
 
+#if defined(FREEBSD)
+#include <sys/param.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
@@ -85,8 +89,8 @@ typedef struct ToolData {
 } TOOLDATA;
 
 char     *cleanToolName(const char *);
-char     *getExeDir();
-char     *getRoot();
+char     *getExeDir(const char*);
+char     *getRoot(const char*);
 TOOLDATA *getToolData(const char *, const char *, int toolType);
 int getToolType(const char*, const char*);
 char* jarFile(const char*, const char*);
@@ -135,7 +139,7 @@ int main (int argc, char **argv, char **
      *  and the full paths to jars.  This way, we can be called 
      *  from anywhere
      */    
-    root = getRoot();
+    root = getRoot(argv[0]);
 
 //    printf("root = %s\n", root);
     
@@ -411,7 +415,7 @@ char *cleanToolName(const char *name) 
     }
          
     return temp;     
- #elif defined(LINUX) || defined(FREEBSD)
+ #else
  
     /*
      *  if we found a slash (and someone didn't do something 
@@ -423,20 +427,18 @@ char *cleanToolName(const char *name) 
     else { 
         return strdup(name);
     }
- #else
- #error Need to define basename-type function
  #endif
 }
 
 /******************************************************************
- *  getRoot()
+ *  getRoot(const char* argv0)
  * 
  *  returns the root (JDK or JRE) where this executable is located
  *  if it can figure it out or NULL if it can't
  */
-char *getRoot() { 
+char *getRoot(const char* argv0) { 
     
-    char *exeDir = getExeDir();
+    char *exeDir = getExeDir(argv0);
 
     char *last = strrchr(exeDir, PATH_SEPARATOR_CHAR);
     
@@ -449,36 +451,27 @@ char *getRoot() { 
 }
 
 /*****************************************************************
- * getExeDir()
+ * getExeDir(const char* argv0)
  * 
  *  returns directory of running exe
  */
-char *getExeDir() {
+char *getExeDir(const char* argv0) {
 
     char *last = NULL;
     
-#if defined(LINUX)
-    char buffer[PATH_MAX + 1];
-    
-    int size = readlink ("/proc/self/exe", buffer, sizeof(buffer)-2);
-    
-    buffer[size+1] = '\0';
-#elif defined(FREEBSD)
-    Dl_info info;
-    char buffer[PATH_MAX + 1];
-    if (dladdr( (const void*)&main, &info) == 0) {
-        return NULL;
-    }
-    strncpy(buffer, info.dli_fname, PATH_MAX);
-    buffer[PATH_MAX] = '\0';
-
-#elif defined(WIN32)
+#if defined(WIN32)
     char buffer[512];
     DWORD dwRet = GetModuleFileName(NULL, buffer, 512);
         
     // FIXME - handle this right - it could be that 512 isn't enough
 #else
-#error Need to implement executable name code
+    char buffer[PATH_MAX + 1];
+
+    char *rc = realpath(argv0, buffer);
+    if (!rc) {
+      return NULL;
+    }
+    buffer[PATH_MAX] = '\0';
 #endif
 
     last = strrchr(buffer, PATH_SEPARATOR_CHAR);



Mime
View raw message