From 3bf1b8793ffc84bb20acafd8a65e80234cce4d13 Mon Sep 17 00:00:00 2001 From: Paul Klingaman Date: Wed, 17 Nov 2010 11:55:01 -0500 Subject: [PATCH 1/4] 6997515: KERNEL=0 in JDK7 build causes loss of lzma compression Reviewed-by: billyh, jqzuo --- make/deploy-rules.gmk | 2 -- 1 file changed, 2 deletions(-) diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 7e080a60e40..6b9f50c9767 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -46,7 +46,6 @@ DEPLOY_BUILD_TARGETS = sanity deploy # Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available ifeq ($(ARCH_DATA_MODEL), 32) ifeq ($(PLATFORM), windows) - ifneq ($(KERNEL), off) EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ $(ECHO) true ; \ else \ @@ -55,7 +54,6 @@ ifeq ($(ARCH_DATA_MODEL), 32) ifeq ($(EC_TMP), true) DEPLOY_BUILD_TARGETS += extra-comp-all endif - endif endif endif From b23d739ffb9ac691d4a73bc4fa5b77f19eb00b3f Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Mon, 22 Nov 2010 14:57:11 -0800 Subject: [PATCH 2/4] Added tag jdk7-b119 for changeset a683e80b9ca8 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 3708e167562..a04c44511d9 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -131,3 +131,4 @@ bdbc48857210a509b3c50a3291ecb9dd6a72e016 jdk7-b115 806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117 698b7b727e12de44139d8cca6ab9a494ead13253 jdk7-b118 3ef7426b4deac5dcfd4afb35cabe9ab3d666df91 hs20-b02 +5484e7c53fa7da5e869902437ee08a9ae10c1c69 jdk7-b119 From 5d80d9aad5af4969f53f6cca95643e3aa2e20e8e Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Thu, 2 Dec 2010 19:03:54 -0800 Subject: [PATCH 3/4] Added tag jdk7-b120 for changeset a841cb10e4ea --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 35f1f600c87..77da515c6e4 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -94,3 +94,4 @@ e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115 7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117 a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119 +366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120 From 636b550f8cc73dbb03f682e41dbca3d1e4bbd2da Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Thu, 2 Dec 2010 19:04:00 -0800 Subject: [PATCH 4/4] Added tag jdk7-b120 for changeset 6df7c2b3dbea --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 3708e167562..6d9274748c8 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -131,3 +131,4 @@ bdbc48857210a509b3c50a3291ecb9dd6a72e016 jdk7-b115 806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117 698b7b727e12de44139d8cca6ab9a494ead13253 jdk7-b118 3ef7426b4deac5dcfd4afb35cabe9ab3d666df91 hs20-b02 +f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120