/hg/release/icedtea6-1.7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jan 20 18:24:52 PST 2010
changeset 8f7c9c70ff2c in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=8f7c9c70ff2c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 20 15:26:30 2010 +0000
Include Mercurial revisions and distro name in version output.
2010-01-08 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Calculate JDK and HotSpot Mercurial
revisions if available and pass to build. Also pass
DIST_NAME to build.
* acinclude.m4: (IT_GET_LSB_DATA): Moved from configure.ac
and extended to also obtain the name of the distribution
from either lsb_release -is or $build_os.
* configure.ac: Invoke IT_GET_LSB_DATA macro.
* patches/icedtea-version.patch: Updated to use distribution
name and JDK and HotSpot Mercurial revision IDs.
changeset 0079cf8cbdd7 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=0079cf8cbdd7
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 21 01:57:01 2010 +0000
Include derivative name and version (e.g IcedTea6 1.7) in crash
dump. Obtain Mercurial revisions at configure time.
2010-01-20 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Pass DERIVATIVE_ID and
HOTSPOT_BUILD_VERSION to build (later only when the HotSpot
Mercurial revision is available). (patch.stamp):
Move revision derivation to configure.
* acinclude.m4: (IT_GET_LSB_DATA): Report results.
(IT_CHECK_FOR_MERCURIAL): Macro wrapper around check for hg.
(IT_OBTAIN_HG_REVISIONS): Obtain Mercurial revisions for
IcedTea, JDK and HotSpot if available.
* configure.ac: Call new macros.
* patches/icedtea-version-hotspot.patch: Updated to include
DERIVATIVE_ID (IcedTea6 version) in the crash dump output.
changeset aed7457ef615 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=aed7457ef615
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 21 02:29:55 2010 +0000
Update ChangeLog following patch import.
changeset 3469e88d33ea in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=3469e88d33ea
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 21 02:23:36 2010 +0000
Fix make dist so tarballs can be built.
2010-01-21 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Fix paths to patches and
IcedTeaNPPlugin.cc for make dist.
diffstat:
6 files changed, 211 insertions(+), 70 deletions(-)
ChangeLog | 41 +++++++++++++++
Makefile.am | 35 ++++++++++---
acinclude.m4 | 59 ++++++++++++++++++++++
configure.ac | 16 +-----
patches/icedtea-version-hotspot.patch | 42 +++++++++------
patches/icedtea-version.patch | 88 +++++++++++++++++++++------------
diffs (444 lines):
diff -r 6df6b86a20bd -r 3469e88d33ea ChangeLog
--- a/ChangeLog Wed Jan 20 16:28:45 2010 +0100
+++ b/ChangeLog Thu Jan 21 02:23:36 2010 +0000
@@ -1,3 +1,44 @@ 2010-01-20 Xerxes RÃ¥nby <xerxes at zafen
+2010-01-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Fix paths to patches and IcedTeaNPPlugin.cc
+ for make dist.
+
+2010-01-20 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Pass DERIVATIVE_ID and HOTSPOT_BUILD_VERSION
+ to build (later only when the HotSpot Mercurial
+ revision is available).
+ (patch.stamp): Move revision derivation to configure.
+ * acinclude.m4:
+ (IT_GET_LSB_DATA): Report results.
+ (IT_CHECK_FOR_MERCURIAL): Macro wrapper around check for hg.
+ (IT_OBTAIN_HG_REVISIONS): Obtain Mercurial revisions for
+ IcedTea, JDK and HotSpot if available.
+ * configure.ac:
+ Call new macros.
+ * patches/icedtea-version-hotspot.patch:
+ Updated to include DERIVATIVE_ID (IcedTea6 version)
+ in the crash dump output.
+
+2010-01-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Calculate JDK and HotSpot Mercurial revisions
+ if available and pass to build. Also pass
+ DIST_NAME to build.
+ * acinclude.m4:
+ (IT_GET_LSB_DATA): Moved from configure.ac
+ and extended to also obtain the name of
+ the distribution from either lsb_release -is
+ or $build_os.
+ * configure.ac:
+ Invoke IT_GET_LSB_DATA macro.
+ * patches/icedtea-version.patch:
+ Updated to use distribution name and JDK and
+ HotSpot Mercurial revision IDs.
+
2010-01-20 Xerxes RÃ¥nby <xerxes at zafena.se>
PR icedtea/431:
diff -r 6df6b86a20bd -r 3469e88d33ea Makefile.am
--- a/Makefile.am Wed Jan 20 16:28:45 2010 +0100
+++ b/Makefile.am Thu Jan 21 02:23:36 2010 +0000
@@ -380,6 +380,11 @@ endif
JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
+
+if HAS_ICEDTEA_REVISION
+ICEDTEA_REV="+${ICEDTEA_REVISION}"
+endif
+
ICEDTEA_ENV = \
IMPORT_BINARY_PLUGS=true \
ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
@@ -421,6 +426,7 @@ ICEDTEA_ENV = \
JDK_HOME="" \
RHINO_JAR="$(RHINO_JAR)" \
DISTRIBUTION_ID="$(DIST_ID)" \
+ DERIVATIVE_ID="IcedTea6 $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true"
@@ -449,6 +455,11 @@ if USE_ALT_JAR
if USE_ALT_JAR
ICEDTEA_ENV += \
ALT_JAR_CMD="$(ALT_JAR_CMD)"
+endif
+
+if HAS_HOTSPOT_REVISION
+ICEDTEA_ENV += \
+ HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
endif
# OpenJDK ecj build environment.
@@ -500,6 +511,8 @@ ICEDTEA_ENV_ECJ = \
JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
+ DISTRIBUTION_ID="$(DIST_ID)" \
+ DERIVATIVE_ID="IcedTea6 $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true"
@@ -525,20 +538,24 @@ ICEDTEA_ENV_ECJ += \
CROSS_TARGET_ARCH="$(CROSS_TARGET_ARCH)"
endif
+if HAS_HOTSPOT_REVISION
+ICEDTEA_ENV_ECJ += \
+ HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
+endif
+
# Source files
# FIXME (distclean): Add generated file list
# FIXME (distclean): Add jtreg sources
# FIXME (distclean): Add pulseaudio sources
EXTRA_DIST = rt generated \
- patches/* \
+ $(abs_top_srcdir)/patches/* \
tools-copy contrib ports \
extra overlays \
javaws.png javaws.desktop visualvm.desktop \
jconsole.desktop policytool.desktop \
test/jtreg \
IcedTeaPlugin.cc \
- IcedTeaNPPlugin.cc \
HACKING pulseaudio fsg.sh \
plugin \
hotspot.map \
@@ -931,10 +948,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
exit 2; \
fi
- if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
- revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{node|short}')`" ; \
- fi ; \
- icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
+ icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \
if ! test "x$(WITH_CACAO)" = "xno"; then \
echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \
>>openjdk/jdk/make/common/shared/Defs.gmk ; \
@@ -943,8 +957,13 @@ stamps/patch.stamp: stamps/patch-fsg.sta
else \
echo "JDK_DERIVATIVE_NAME=IcedTea6 $${icedtea_version}" \
>>openjdk/jdk/make/common/shared/Defs.gmk ; \
- fi
-
+ fi ;
+
+if HAS_JDK_REVISION
+ echo "JDK_REVID=$(JDK_REVISION)" >>openjdk/jdk/make/common/shared/Defs.gmk ;
+endif
+
+ echo "DISTRO_NAME=$(DIST_NAME)" >>openjdk/jdk/make/common/shared/Defs.gmk ; \
if [ -n "$(PKGVERSION)" ]; then \
echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
>>openjdk/jdk/make/common/shared/Defs.gmk ; \
diff -r 6df6b86a20bd -r 3469e88d33ea acinclude.m4
--- a/acinclude.m4 Wed Jan 20 16:28:45 2010 +0100
+++ b/acinclude.m4 Thu Jan 21 02:23:36 2010 +0000
@@ -1146,3 +1146,62 @@ AC_SUBST(PARALLEL_JOBS)
AC_SUBST(PARALLEL_JOBS)
])
+AC_DEFUN([IT_GET_LSB_DATA],
+[
+AC_MSG_CHECKING([build identification])
+if test -n "$LSB_RELEASE"; then
+ lsb_info="$($LSB_RELEASE -ds | sed 's/^"//;s/"$//')"
+ if test -n "$PKGVERSION"; then
+ DIST_ID="$lsb_info, package $PKGVERSION"
+ else
+ DIST_ID="Built on $lsb_info ($(date))"
+ fi
+ DIST_NAME="$($LSB_RELEASE -is | sed 's/^"//;s/"$//')"
+else
+ DIST_ID="Custom build ($(date))"
+ DIST_NAME="$build_os"
+fi
+AC_MSG_RESULT([${DIST_ID}])
+AC_SUBST(DIST_ID)
+AC_SUBST(DIST_NAME)
+])
+
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_MERCURIAL],
+[
+ AC_PATH_TOOL([HG],[hg])
+ AC_SUBST([HG])
+])
+
+AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS],
+[
+ AC_REQUIRE([IT_CHECK_FOR_MERCURIAL])
+ AC_REQUIRE([WITH_OPENJDK_SRC_DIR])
+ ICEDTEA_REVISION="none";
+ JDK_REVISION="none";
+ HOTSPOT_REVISION="none";
+ if which ${HG} >/dev/null; then
+ AC_MSG_CHECKING([for IcedTea Mercurial revision ID])
+ if test -e ${abs_top_srcdir}/.hg ; then
+ ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} tip --template '{node|short}')`" ;
+ fi ;
+ AC_MSG_RESULT([${ICEDTEA_REVISION}])
+ AC_SUBST([ICEDTEA_REVISION])
+ AC_MSG_CHECKING([for JDK Mercurial revision ID])
+ if test -e ${OPENJDK_SRC_DIR}/jdk/.hg ; then
+ JDK_REVISION="r`(cd ${OPENJDK_SRC_DIR}/jdk; ${HG} tip --template '{node|short}')`" ;
+ fi ;
+ AC_MSG_RESULT([${JDK_REVISION}])
+ AC_SUBST([JDK_REVISION])
+ AC_MSG_CHECKING([for HotSpot Mercurial revision ID])
+ if test -e ${OPENJDK_SRC_DIR}/hotspot/.hg ; then \
+ HOTSPOT_REVISION="r`(cd ${OPENJDK_SRC_DIR}/hotspot; ${HG} tip --template '{node|short}')`" ;
+ fi ;
+ AC_MSG_RESULT([${HOTSPOT_REVISION}])
+ AC_SUBST([HOTSPOT_REVISION])
+ fi;
+ AM_CONDITIONAL([HAS_ICEDTEA_REVISION], test "x${ICEDTEA_REVISION}" != xnone)
+ AM_CONDITIONAL([HAS_JDK_REVISION], test "x${JDK_REVISION}" != xnone)
+ AM_CONDITIONAL([HAS_HOTSPOT_REVISION], test "x${HOTSPOT_REVISION}" != xnone)
+])
+
diff -r 6df6b86a20bd -r 3469e88d33ea configure.ac
--- a/configure.ac Wed Jan 20 16:28:45 2010 +0100
+++ b/configure.ac Thu Jan 21 02:23:36 2010 +0000
@@ -39,8 +39,8 @@ dnl OpenJDK's README-builds.html lists g
dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
dnl check for it explicitly rather than using AC_PROG_AWK.
FIND_TOOL([GAWK], [gawk])
-AC_PATH_TOOL([HG],[hg])
-AC_SUBST([HG])
+IT_CHECK_FOR_MERCURIAL
+IT_OBTAIN_HG_REVISIONS
AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
AC_CHECK_WITH_GCJ
AC_CHECK_WITH_HOTSPOT_BUILD
@@ -177,17 +177,7 @@ AC_ARG_WITH([pkgversion],
[PKGVERSION=])
AC_SUBST(PKGVERSION)
-if test -n "$LSB_RELEASE"; then
- lsb_info="$($LSB_RELEASE -ds | sed 's/^"//;s/"$//')"
- if test -n "$PKGVERSION"; then
- DIST_ID="$lsb_info, package $PKGVERSION"
- else
- DIST_ID="Built on $lsb_info"
- fi
-else
- DIST_ID="Custom build ($(date))"
-fi
-AC_SUBST(DIST_ID)
+IT_GET_LSB_DATA
SET_ARCH_DIRS
SET_OS_DIRS
diff -r 6df6b86a20bd -r 3469e88d33ea patches/icedtea-version-hotspot.patch
--- a/patches/icedtea-version-hotspot.patch Wed Jan 20 16:28:45 2010 +0100
+++ b/patches/icedtea-version-hotspot.patch Thu Jan 21 02:23:36 2010 +0000
@@ -1,10 +1,14 @@ diff -Nru openjdk.orig/hotspot/make/linu
diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2008-11-06 08:40:50.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/vm.make 2008-11-19 12:15:54.000000000 +0000
-@@ -86,6 +86,10 @@
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2010-01-18 22:58:55.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/vm.make 2010-01-20 17:26:22.000000000 +0000
+@@ -86,6 +86,14 @@
${JRE_VERSION} \
${VM_DISTRO}
++ifdef DERIVATIVE_ID
++CPPFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
++endif
++
+ifdef DISTRIBUTION_ID
+CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
+endif
@@ -12,9 +16,21 @@ diff -Nru openjdk.orig/hotspot/make/linu
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
CFLAGS += $(CFLAGS_WARN/BYFILE)
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2010-01-18 23:00:22.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2010-01-20 17:24:22.000000000 +0000
+@@ -25,7 +25,7 @@
+ #include "incls/_precompiled.incl"
+ #include "incls/_arguments.cpp.incl"
+
+-#define DEFAULT_VENDOR_URL_BUG "http://java.sun.com/webapps/bugreport/crash.jsp"
++#define DEFAULT_VENDOR_URL_BUG "http://icedtea.classpath.org/bugzilla"
+ #define DEFAULT_JAVA_LAUNCHER "generic"
+
+ char** Arguments::_jvm_flags_array = NULL;
diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp
---- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp 2008-11-06 08:40:58.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-11-19 12:15:54.000000000 +0000
+--- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp 2010-01-18 22:56:40.000000000 +0000
++++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2010-01-20 17:25:15.000000000 +0000
@@ -165,7 +165,8 @@
static void print_bug_submit_message(outputStream *out, Thread *thread) {
@@ -25,24 +41,16 @@ diff -Nru openjdk.orig/hotspot/src/share
out->print_raw ("# ");
out->print_raw_cr(Arguments::java_vendor_url_bug());
// If the crash is in native code, encourage user to submit a bug to the
-@@ -339,6 +340,9 @@
+@@ -341,6 +342,12 @@
Abstract_VM_Version::vm_platform_string(),
UseCompressedOops ? "compressed oops" : ""
);
++#ifdef DERIVATIVE_ID
++ st->print_cr("# Derivative: %s", DERIVATIVE_ID);
++#endif
+#ifdef DISTRIBUTION_ID
+ st->print_cr("# Distribution: %s", DISTRIBUTION_ID);
+#endif
STEP(60, "(printing problematic frame)")
---- arguments.cpp 2008-12-15 12:25:14.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2008-12-15 12:25:32.000000000 -0500
-@@ -25,7 +25,7 @@
- #include "incls/_precompiled.incl"
- #include "incls/_arguments.cpp.incl"
-
--#define DEFAULT_VENDOR_URL_BUG "http://java.sun.com/webapps/bugreport/crash.jsp"
-+#define DEFAULT_VENDOR_URL_BUG "http://icedtea.classpath.org/bugzilla"
- #define DEFAULT_JAVA_LAUNCHER "generic"
-
- char** Arguments::_jvm_flags_array = NULL;
diff -r 6df6b86a20bd -r 3469e88d33ea patches/icedtea-version.patch
--- a/patches/icedtea-version.patch Wed Jan 20 16:28:45 2010 +0100
+++ b/patches/icedtea-version.patch Thu Jan 21 02:23:36 2010 +0000
@@ -1,5 +1,6 @@
---- openjdkold/jdk/make/common/shared/Defs.gmk 2008-08-28 04:10:47.000000000 -0400
-+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-02-08 08:30:21.000000000 -0500
+diff -r 134c345baf84 make/common/shared/Defs.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs.gmk Thu Jun 18 11:12:13 2009 +0800
++++ openjdk/jdk/make/common/shared/Defs.gmk Sat Jan 09 00:26:19 2010 +0000
@@ -194,7 +194,7 @@
# Default names
@@ -9,22 +10,48 @@
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 @@
+diff -r 134c345baf84 make/java/version/Makefile
+--- openjdk.orig/jdk/make/java/version/Makefile Thu Jun 18 11:12:13 2009 +0800
++++ openjdk/jdk/make/java/version/Makefile Sat Jan 09 00:26:19 2010 +0000
+@@ -39,7 +39,12 @@
+ $(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_name@@/$(DISTRO_NAME)/g' \
++ -e 's/@@distro_package_version@@/$(DISTRO_PACKAGE_VERSION)/g' \
+ -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
++ -e 's/@@jdk_revid@@/$(JDK_REVID)/g' \
++ -e 's/@@hotspot_revid@@/$(HOTSPOT_REVID)/g' \
+ $< > $@.temp
+ @$(MV) $@.temp $@
+
+diff -r 134c345baf84 src/share/classes/sun/misc/Version-template.java
+--- openjdk.orig/jdk/src/share/classes/sun/misc/Version-template.java Thu Jun 18 11:12:13 2009 +0800
++++ openjdk/jdk/src/share/classes/sun/misc/Version-template.java Sat Jan 09 00:26:19 2010 +0000
+@@ -41,6 +41,21 @@
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_name =
++ "@@distro_name@@";
++
+ private static final String distro_package_version =
+ "@@distro_package_version@@";
++
++ private static final String jdk_revid =
++ "@@jdk_revid@@";
++
++ private static final String hotspot_revid =
++ "@@hotspot_revid@@";
+
static {
init();
}
-@@ -81,12 +87,26 @@
+@@ -81,14 +96,34 @@
/* First line: platform version. */
ps.println(launcher_name + " version \"" + java_version + "\"");
@@ -33,35 +60,32 @@
/* Second line: runtime version (ie, libraries). */
- ps.println(java_runtime_name + " (build " +
- java_runtime_version + ")");
-+ StringBuilder sb = new StringBuilder();
-+ 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(")");
-+ }
-+ 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());
++ StringBuilder sb = new StringBuilder();
++ 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(")");
++ }
++ if (distro_package_version.length() > 0) {
++ sb.append(" (").append(distro_package_version).append(")");
++ } else {
++ sb.append(" (");
++ if (distro_name.length() > 0)
++ sb.append(distro_name).append(" ");
++ sb.append("build ").append(java_runtime_version);
++ if (jdk_revid.length() > 0)
++ sb.append("+").append(jdk_revid);
++ sb.append(")");
++ }
++ ps.println(sb.toString());
/* Third line: JVM information. */
- 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 @@
- $(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 $@
+ java_vm_info + ")");
+ }
More information about the distro-pkg-dev
mailing list