Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 86861 invoked from network); 14 Sep 2010 20:47:45 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Sep 2010 20:47:45 -0000 Received: (qmail 7388 invoked by uid 500); 14 Sep 2010 20:47:45 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 7349 invoked by uid 500); 14 Sep 2010 20:47:44 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 7342 invoked by uid 99); 14 Sep 2010 20:47:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Sep 2010 20:47:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Sep 2010 20:47:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E93E323889DA; Tue, 14 Sep 2010 20:47:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r997086 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/archive/src/main/native/zip/unix/makefile classlib/modules/instrument/src/main/native/instrument/unix/makefile drlvm/ jdktools/ Date: Tue, 14 Sep 2010 20:47:23 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100914204723.E93E323889DA@eris.apache.org> Author: hindessm Date: Tue Sep 14 20:47:23 2010 New Revision: 997086 URL: http://svn.apache.org/viewvc?rev=997086&view=rev Log: Merge change from /harmony/enhanced/java/trunk@996996: r996996 | hindessm | 2010-09-14 18:14:54 +0100 (Tue, 14 Sep 2010) | 1 line Fix instrument so it works with hy.local.zlib=true. Modified: harmony/enhanced/java/branches/java6/ (props changed) harmony/enhanced/java/branches/java6/classlib/ (props changed) harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed) harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/unix/makefile harmony/enhanced/java/branches/java6/drlvm/ (props changed) harmony/enhanced/java/branches/java6/jdktools/ (props changed) Propchange: harmony/enhanced/java/branches/java6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 14 20:47:23 2010 @@ -1,4 +1,4 @@ /harmony/enhanced/java/branches/mrh:935751-941490 -/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904 +/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996 /harmony/enhanced/trunk:476395-929252 /incubator/harmony/enhanced/trunk:292550-476394 Propchange: harmony/enhanced/java/branches/java6/classlib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 14 20:47:23 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-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904 +/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996 /harmony/enhanced/trunk/classlib:476395-929252 /harmony/enhanced/trunk/working_classlib:476396-920147 /incubator/harmony/enhanced/trunk/classlib:292550-476394 Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 14 20:47:23 2010 @@ -1,4 +1,4 @@ /harmony/enhanced/classlib/trunk/depends/libs:544451-926091 -/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904 +/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394 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=997086&r1=997085&r2=997086&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 Tue Sep 14 20:47:23 2010 @@ -24,6 +24,18 @@ INCLUDES += -I../../zlib_dist BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \ $(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o +ifeq ($(HY_LOCAL_ZLIB),true) +DEFINES += -DHY_LOCAL_ZLIB +else + +ifeq ($(HY_OS),zos) +MDLLIBZLIB += $(LIBPATH)libhyzlib$(HY_LINKLIB_SUFFIX) +else +MDLLIBZLIB += $(DLLPATH)libhyzlib$(HY_LINKLIB_SUFFIX) +endif + +endif + LIBNAME = $(LIBPATH)libhyzip.a %.o: $(LIBPATH)libhypool.a(%.o) 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=997086&r1=997085&r2=997086&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 Tue Sep 14 20:47:23 2010 @@ -26,6 +26,10 @@ ifneq ($(HY_ZIP_API),true) MDLLIBFILES += $(LIBPATH)libhyzip.a endif +ifeq ($(HY_LOCAL_ZLIB),true) +DEFINES += -DHY_LOCAL_ZLIB +endif + MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) DLLNAME = $(DLLPATH)libhyinstrument$(HY_SHLIB_SUFFIX) Propchange: harmony/enhanced/java/branches/java6/drlvm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 14 20:47:23 2010 @@ -1,5 +1,5 @@ /harmony/enhanced/java/branches/mrh/drlvm:935751-941490 -/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904 +/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996 /harmony/enhanced/trunk/drlvm:476395-929252 /harmony/enhanced/trunk/working_vm:476396-920147 /incubator/harmony/enhanced/trunk/drlvm:292550-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 14 20:47:23 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904 +/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687,996798,996801,996806,996812,996814,996824,996904,996996 /harmony/enhanced/jdktools/trunk:630107-925933 /harmony/enhanced/trunk/jdktools:476395-929252 /harmony/enhanced/trunk/working_jdktools:476396-920147