From 52dac61212e5f7907c50e324320ee108e15ace79 Mon Sep 17 00:00:00 2001 From: Paul Klingaman Date: Mon, 14 Feb 2011 14:29:10 -0500 Subject: [PATCH 1/5] 7019371: JDK7 is not building UPX. IFTW wrappers are not compressed Reviewed-by: billyh, jqzuo --- make/deploy-rules.gmk | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 1308d51518b..d05d4097e3c 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -64,19 +64,17 @@ ifneq ($(JQS), off) endif endif endif - -ifneq ($(KERNEL), off) - ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), windows) - # Only set up to use UPX compression if it is available - UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(UP_TMP), true) - DEPLOY_BUILD_TARGETS += cmd-comp-all - endif + +ifeq ($(ARCH_DATA_MODEL), 32) + ifeq ($(PLATFORM), windows) + # Only set up to use UPX compression if it is available + UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \ + $(ECHO) true ; \ + else \ + $(ECHO) false ; \ + fi ) + ifeq ($(UP_TMP), true) + DEPLOY_BUILD_TARGETS += cmd-comp-all endif endif endif From 932f3af0eb865e3436062bdd9ae12603945e701f Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:29:01 -0800 Subject: [PATCH 2/5] 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg --- LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index eeab58c21c9..b40a0f457d7 100644 --- a/LICENSE +++ b/LICENSE @@ -325,11 +325,11 @@ License instead of this License. "CLASSPATH" EXCEPTION TO THE GPL -Certain source files distributed by Sun Microsystems, Inc. are subject to -the following clarification and special exception to the GPL, but only where -Sun has expressly included in the particular source file's header the words -"Sun designates this particular file as subject to the "Classpath" exception -as provided by Sun in the LICENSE file that accompanied this code." +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of From cff49a9152743837431d69e886cba92173e60930 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:30:31 -0800 Subject: [PATCH 3/5] 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg --- hotspot/LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hotspot/LICENSE b/hotspot/LICENSE index b53eb1fd1f4..b40a0f457d7 100644 --- a/hotspot/LICENSE +++ b/hotspot/LICENSE @@ -325,11 +325,11 @@ License instead of this License. "CLASSPATH" EXCEPTION TO THE GPL -Certain source files distributed by Oracle and/or its affiliates, are subject to -the following clarification and special exception to the GPL, but only where -Oracle has expressly included in the particular source file's header the words -"Oracle designates this particular file as subject to the "Classpath" exception -as provided by Oracle in the LICENSE file that accompanied this code." +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of From edcd96a12953320e2b2af28ee4601c36a8cc0145 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Fri, 18 Feb 2011 14:23:28 -0800 Subject: [PATCH 4/5] Added tag jdk7-b130 for changeset 00d174cbd0bb --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 4fe77eb16d4..b6d73caeb29 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -104,3 +104,4 @@ b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127 57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128 a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129 +cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130 From 4138cbb7b06d838f8a345652508c6910fc561b9b Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Fri, 18 Feb 2011 14:23:37 -0800 Subject: [PATCH 5/5] Added tag jdk7-b130 for changeset 70ed6d8368bc --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index b18bf3dc7f1..83b71afb041 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -148,3 +148,4 @@ d535bf4c12355a2897e918da9f8910c0aceec4fb hs20-b07 9a5762f448595794d449a8e17342abd81a3fadaf jdk7-b128 ae4b185f2ed14af7bab610738c333840598cdcc4 jdk7-b129 ae4b185f2ed14af7bab610738c333840598cdcc4 hs21-b01 +e9aa2ca89ad6c53420623d579765f9706ec523d7 jdk7-b130