Mercurial > hg > release > icedtea6-1.2
changeset 771:9e9a92bb08c4
* Merged with tip.
author | Christian Thalinger <twisti@complang.tuwien.ac.at> |
---|---|
date | Tue, 18 Mar 2008 17:50:29 +0100 |
parents | 37c4bc769489 (current diff) d74d0ad3c0bd (diff) |
children | 7d6ae0ee92ff |
files | ChangeLog |
diffstat | 2 files changed, 5 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 17 16:58:26 2008 +0100 +++ b/ChangeLog Tue Mar 18 17:50:29 2008 +0100 @@ -1,3 +1,8 @@ +2008-03-17 Lillian Angel <langel@redhat.com> + + * patches/icedtea-version.patch: Removed patches that changed OpenJDK + naming to IcedTea. + 2008-03-17 Gary Benson <gbenson@redhat.com> * patches/icedtea-static-libstdc++.patch: New file.
--- a/patches/icedtea-version.patch Mon Mar 17 16:58:26 2008 +0100 +++ b/patches/icedtea-version.patch Tue Mar 18 17:50:29 2008 +0100 @@ -1,22 +1,5 @@ --- openjdk.old/jdk/make/common/shared/Defs.gmk 2007-09-13 03:52:42.000000000 -0400 +++ openjdk/jdk/make/common/shared/Defs.gmk 2007-09-18 16:24:59.000000000 -0400 -@@ -194,13 +194,13 @@ - - # Default names - LAUNCHER_NAME = java --PRODUCT_NAME = Java(TM) -+PRODUCT_NAME = IcedTea - PRODUCT_SUFFIX = SE Runtime Environment - COMPANY_NAME = Sun Microsystems, Inc. - - ifdef OPENJDK -- LAUNCHER_NAME = openjdk -- PRODUCT_NAME = OpenJDK -+ LAUNCHER_NAME = java -+ PRODUCT_NAME = IcedTea - PRODUCT_SUFFIX = Runtime Environment - COMPANY_NAME = - endif @@ -258,12 +258,7 @@ JDK_UNDERSCORE_VERSION = $(subst .,_,$(JDK_VERSION)) JDK_MKTG_UNDERSCORE_VERSION = $(subst .,_,$(JDK_MKTG_VERSION)) @@ -31,17 +14,6 @@ # FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set ifdef BUILD_NUMBER ---- openjdk.old/hotspot/build/windows/projectfiles/common/Makefile 2007-09-27 22:30:19.000000000 -0400 -+++ openjdk/hotspot/build/windows/projectfiles/common/Makefile 2007-09-28 11:07:50.000000000 -0400 -@@ -123,7 +123,7 @@ - !if exists($(HOTSPOTWORKSPACE)\src\closed) - HOTSPOT_VM_DISTRO="Java HotSpot(TM)" - !else --HOTSPOT_VM_DISTRO="OpenJDK" -+HOTSPOT_VM_DISTRO="IcedTea" - !endif - !endif - --- openjdk.old/hotspot/src/share/vm/runtime/arguments.cpp 2007-12-10 15:46:40.000000000 -0500 +++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2007-12-19 09:41:41.000000000 -0500 @@ -28,7 +28,7 @@ @@ -53,14 +25,3 @@ #define DEFAULT_JAVA_LAUNCHER "generic" char** Arguments::_jvm_flags_array = NULL; ---- openjdkold/hotspot/build/linux/makefiles/vm.make 2008-02-12 04:14:13.000000000 -0500 -+++ openjdk/hotspot/build/linux/makefiles/vm.make 2008-02-15 14:46:59.000000000 -0500 -@@ -98,7 +98,7 @@ - ifeq ($(CLOSED_DIR_EXISTS), true) - VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"Java HotSpot(TM)\"" - else -- VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -+ VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"IcedTea\"" - endif - endif -