changeset in /hg/icedtea6: 2009-02-23 Lillian Angel <langel at re...

[Lillian Angel]

changeset 0848286d8e5c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0848286d8e5c
description:
	2009-02-23  Lillian Angel  <langel at redhat.com>

	        * AUTHORS: Added Mark Reinhold.

	2009-02-23  Mark Reinhold  <mr at sun.com>

	        * Makefile.am: Set PRODUCT_NAME to OpenJDK, unless doing a CACAO
	        build (set to IcedTea).
	        * patches/icedtea-version.patch: Introduced two new make variables:
	        JDK_DERIVATIVE_NAME to set "IcedTea6 <version>" and
	        DISTRO_PACKAGE_VERSION carries the argument given to the
	        --with-pkgversion configure option.

diffstat:

4 files changed, 76 insertions(+), 6 deletions(-)
AUTHORS                       |    1 
ChangeLog                     |   19 ++++++++++++++--
Makefile.am                   |   16 +++++++++++---
patches/icedtea-version.patch |   46 +++++++++++++++++++++++++++++++++++++++++

diffs (118 lines):

diff -r eb9c06e57a89 -r 0848286d8e5c AUTHORS
--- a/AUTHORS	Mon Feb 23 07:49:42 2009 -0500
+++ b/AUTHORS	Mon Feb 23 15:42:22 2009 -0500
@@ -25,6 +25,7 @@ Raif Naffah <admin at naffah-raif.name>
 Raif Naffah <admin at naffah-raif.name>
 Parag Nemade <pnemade at redhat.com>
 Xerxes RÃ¥nby <xerxes at zafena.se>
+Mark Reinhold <mr at sun.com>
 Bernhard Rosenkränzer <bero at arklinux.org>
 Marc Schoenefeld <mschoene at redhat.com>
 Keith Seitz <keiths at redhat.com>
diff -r eb9c06e57a89 -r 0848286d8e5c ChangeLog
--- a/ChangeLog	Mon Feb 23 07:49:42 2009 -0500
+++ b/ChangeLog	Mon Feb 23 15:42:22 2009 -0500
@@ -1,7 +1,20 @@ 2009-02-23  Gary Benson  <gbenson at redhat
+2009-02-23  Lillian Angel  <langel at redhat.com>
+
+	* AUTHORS: Added Mark Reinhold.
+
+2009-02-23  Mark Reinhold  <mr at sun.com>
+
+	* Makefile.am: Set PRODUCT_NAME to OpenJDK, unless doing a CACAO
+	build (set to IcedTea).
+	* patches/icedtea-version.patch: Introduced two new make variables:
+	JDK_DERIVATIVE_NAME to set "IcedTea6 <version>" and
+	DISTRO_PACKAGE_VERSION carries the argument given to the
+	--with-pkgversion configure option.
+
 2009-02-23  Gary Benson  <gbenson at redhat.com>
-            Robert Schuster  <robertschuster at fsfe.org>
-
-    * configure.ac (llvm_components): Add nativecodegen.
+	    Robert Schuster  <robertschuster at fsfe.org>
+
+	* configure.ac (llvm_components): Add nativecodegen.
 
 2009-02-23  Gary Benson  <gbenson at redhat.com>
 
diff -r eb9c06e57a89 -r 0848286d8e5c Makefile.am
--- a/Makefile.am	Mon Feb 23 07:49:42 2009 -0500
+++ b/Makefile.am	Mon Feb 23 15:42:22 2009 -0500
@@ -758,10 +758,20 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{node|short}')`" ; \
 	fi ; \
 	icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
+	if ! test "x$(WITH_CACAO)" = "xno"; then \
+	  echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \
+	    >>openjdk/jdk/make/common/shared/Defs.gmk ; \
+	  echo "PRODUCT_NAME=IcedTea6" \
+	    >>openjdk/jdk/make/common/shared/Defs.gmk ; \
+	else \
+	  echo "JDK_DERIVATIVE_NAME=IcedTea6 $${icedtea_version}" \
+	    >>openjdk/jdk/make/common/shared/Defs.gmk ; \
+	fi
+
 	if [ -n "$(PKGVERSION)" ]; then \
-	  icedtea_version="$${icedtea_version} ($(PKGVERSION))" ; \
-	fi; \
-	sed -i "s#OpenJDK#OpenJDK $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
+	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
+	    >>openjdk/jdk/make/common/shared/Defs.gmk ; \
+	fi
 
 if ENABLE_PLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
diff -r eb9c06e57a89 -r 0848286d8e5c patches/icedtea-version.patch
--- a/patches/icedtea-version.patch	Mon Feb 23 07:49:42 2009 -0500
+++ b/patches/icedtea-version.patch	Mon Feb 23 15:42:22 2009 -0500
@@ -23,3 +23,49 @@
    PRODUCT_NAME = OpenJDK
    PRODUCT_SUFFIX = Runtime Environment
    JDK_RC_PLATFORM_NAME = Platform
+--- openjdk/jdk/src/share/classes/sun/misc/Version-template.java.~1~	2008-11-25 01:04:53.000000000 -0800
++++ openjdk/jdk/src/share/classes/sun/misc/Version-template.java	2009-02-20 09:03:25.000000000 -0800
+@@ -41,6 +41,12 @@
+     private static final String java_runtime_version =
+         "@@java_runtime_version@@";
+ 
++    private static final String jdk_derivative_name =
++        "@@jdk_derivative_name@@";
++
++    private static final String distro_package_version =
++        "@@distro_package_version@@";
++
+     static {
+         init();
+     }
+@@ -82,8 +88,17 @@
+         ps.println(launcher_name + " version \"" + java_version + "\"");
+ 
+         /* Second line: runtime version (ie, libraries). */
+-        ps.println(java_runtime_name + " (build " +
+-                           java_runtime_version + ")");
++	StringBuilder sb = new StringBuilder();
++	sb.append(java_runtime_name);
++	if (jdk_derivative_name.length() > 0) {
++	    sb.append(" (").append(jdk_derivative_name).append(")");
++	}
++	if (distro_package_version.length() > 0) {
++	    sb.append(" (").append(distro_package_version).append(")");
++	} else {
++	    sb.append(" (build ").append(java_runtime_version).append(")");
++	}
++	ps.println(sb.toString());
+ 
+         /* Third line: JVM information. */
+         String java_vm_name    = System.getProperty("java.vm.name");
+--- openjdk/jdk/make/java/version/Makefile.~1~	2008-11-25 01:01:15.000000000 -0800
++++ openjdk/jdk/make/java/version/Makefile	2009-02-20 09:03:56.000000000 -0800
+@@ -39,6 +39,8 @@
+ 	$(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
+ 	    -e 's/@@java_version@@/$(RELEASE)/g' \
+ 	    -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
++	    -e 's/@@jdk_derivative_name@@/$(JDK_DERIVATIVE_NAME)/g' \
++	    -e 's/@@distro_package_version@@/$(DISTRO_PACKAGE_VERSION)/g' \
+ 	    -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
+ 	$< > $@.temp
+ 	@$(MV) $@.temp $@