Mercurial > hg > release > icedtea6-1.12

changeset 15:c007666ad99d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-06-14 Lillian Angel <langel@redhat.com> * icedtea-version.patch: Changes LAUNCHER_NAME to "java" instead of "openjdk". Also, removes -MILESTONE from RELEASE string. "java -version" now outputs the expected string. * Makefile.am: Added new patch to list.
author Lillian Angel <langel@redhat.com>
date Thu, 14 Jun 2007 16:40:03 -0400
parents 794f996ef76a
children 17a423f00daf
files ChangeLog Makefile.am Makefile.in icedtea-version.patch
diffstat 4 files changed, 37 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 14 14:55:15 2007 -0400
+++ b/ChangeLog	Thu Jun 14 16:40:03 2007 -0400
@@ -1,3 +1,10 @@
+2007-06-14  Lillian Angel  <langel@redhat.com>
+
+	* icedtea-version.patch: Changes LAUNCHER_NAME to "java" instead of
+	"openjdk". Also, removes -MILESTONE from RELEASE string. "java 
+	-version" now outputs the expected string.
+	* Makefile.am: Added new patch to list.
+
 2007-06-14  Kyle Galloway  <kgallowa@redhat.com>
 
 	* javac.in: Add -bootclasspath option to supply libgcj-x.x.x.jar to
--- a/Makefile.am	Thu Jun 14 14:55:15 2007 -0400
+++ b/Makefile.am	Thu Jun 14 16:40:03 2007 -0400
@@ -9,7 +9,8 @@
 ICEDTEA_PATCHES = \
 	icedtea-copy-plugs.patch \
 	icedtea-lesstif.patch \
-	icedtea-ports.patch
+	icedtea-ports.patch \
+	icedtea-version.patch
 
 ICEDTEA_ECJ_PATCH = \
 	icedtea-ecj-bootstrap.patch
--- a/Makefile.in	Thu Jun 14 14:55:15 2007 -0400
+++ b/Makefile.in	Thu Jun 14 16:40:03 2007 -0400
@@ -177,7 +177,8 @@
 ICEDTEA_PATCHES = \
 	icedtea-copy-plugs.patch \
 	icedtea-lesstif.patch \
-	icedtea-ports.patch
+	icedtea-ports.patch \
+	icedtea-version.patch
 
 ICEDTEA_ECJ_PATCH = \
 	icedtea-ecj-bootstrap.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/icedtea-version.patch	Thu Jun 14 16:40:03 2007 -0400
@@ -0,0 +1,26 @@
+--- openjdk/j2se/make/common/shared/Defs.gmk	2007-05-24 03:33:20.000000000 -0400
++++ openjdk/j2se/make/common/shared/Defs.gmk	2007-06-14 16:07:25.000000000 -0400
+@@ -187,7 +187,7 @@
+ COMPANY_NAME = Sun Microsystems, Inc.
+ 
+ ifdef OPENJDK
+-  LAUNCHER_NAME = openjdk
++  LAUNCHER_NAME = java
+   PRODUCT_NAME = OpenJDK
+   PRODUCT_SUFFIX = Runtime Environment
+   COMPANY_NAME =
+@@ -246,12 +246,8 @@
+ JDK_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_VERSION))
+ JDK_MKTG_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_MKTG_VERSION))
+ 
+-# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
+-ifneq ($(MILESTONE),fcs)
+-  RELEASE      = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
+-else
+-  RELEASE      = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
+-endif
++# RELEASE is JDK_VERSION 
++RELEASE      = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
+ 
+ # FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
+ ifdef BUILD_NUMBER