changeset in /hg/icedtea: Port CACAO version patch.

[Andrew John Hughes]

changeset 74222c209012 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=74222c209012
description:
	Port CACAO version patch.

	2009-03-07  Matthias Klose  <doko at ubuntu.com>

		* patches/icedtea-version.patch: Identify as IcedTea when Cacao is used
		as JVM.

diffstat:

2 files changed, 17 insertions(+), 4 deletions(-)
ChangeLog                     |    5 ++++-
patches/icedtea-version.patch |   16 +++++++++++++---

diffs (56 lines):

diff -r bf30f173b8c9 -r 74222c209012 ChangeLog
--- a/ChangeLog	Thu Mar 19 12:08:46 2009 +0000
+++ b/ChangeLog	Thu Mar 19 12:15:24 2009 +0000
@@ -1,9 +1,12 @@ 2009-03-07  Matthias Klose  <doko at ubuntu
 2009-03-07  Matthias Klose  <doko at ubuntu.com>
 
-	* Makefile.am (icedtea.stamp, icedtea-debug.stamp): Create target dirs.
 	* patches/icedtea-version.patch: Identify as IcedTea when Cacao is used
 	as JVM.
 
+2009-03-07  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (icedtea.stamp, icedtea-debug.stamp): Create target dirs.
+	
 2009-03-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* ChangeLog,
diff -r bf30f173b8c9 -r 74222c209012 patches/icedtea-version.patch
--- a/patches/icedtea-version.patch	Thu Mar 19 12:08:46 2009 +0000
+++ b/patches/icedtea-version.patch	Thu Mar 19 12:15:24 2009 +0000
@@ -25,14 +25,21 @@ diff -Nru openjdk.orig/jdk/make/common/s
      static {
          init();
      }
-@@ -82,8 +88,17 @@
+@@ -81,12 +87,26 @@
+         /* First line: platform version. */
          ps.println(launcher_name + " version \"" + java_version + "\"");
  
++        String java_vm_name    = System.getProperty("java.vm.name");
++
          /* 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 (java_vm_name.toLowerCase().startsWith("cacao")) {
++	    sb.append("IcedTea Runtime Environment");
++	} else {
++	    sb.append(java_runtime_name);
++	}
 +	if (jdk_derivative_name.length() > 0) {
 +	    sb.append(" (").append(jdk_derivative_name).append(")");
 +	}
@@ -44,7 +51,10 @@ diff -Nru openjdk.orig/jdk/make/common/s
 +	ps.println(sb.toString());
  
          /* Third line: JVM information. */
-         String java_vm_name    = System.getProperty("java.vm.name");
+-        String java_vm_name    = System.getProperty("java.vm.name");
+         String java_vm_version = System.getProperty("java.vm.version");
+         String java_vm_info    = System.getProperty("java.vm.info");
+         ps.println(java_vm_name + " (build " + java_vm_version + ", " +
 --- 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 @@