changeset in /hg/icedtea6: 2008-10-21 Matthias Klose <doko at ubu...
doko at ubuntu.com
doko at ubuntu.com
Tue Oct 21 07:45:46 PDT 2008
changeset 5fabd5969958 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5fabd5969958
description:
2008-10-21 Matthias Klose <doko at ubuntu.com>
* configure.ac: Add new option --with-pkgversion,
substitute PKGVERSION and DIST_ID.
* Makefile.am (ICEDTEA_ENV): Add DISTRIBUTION_ID;
(stamps/patch.stamp): Encode PKGVERSION in IcedTea version.
* patches/icedtea-version.patch: Add DISTRIBUTION_ID in vm crash report.
diffstat:
4 files changed, 72 insertions(+), 1 deletion(-)
ChangeLog | 8 ++++++++
Makefile.am | 8 +++++++-
configure.ac | 22 ++++++++++++++++++++++
patches/icedtea-version.patch | 35 +++++++++++++++++++++++++++++++++++
diffs (125 lines):
diff -r be559c26fdbc -r 5fabd5969958 ChangeLog
--- a/ChangeLog Mon Oct 20 19:30:04 2008 +0100
+++ b/ChangeLog Tue Oct 21 16:45:19 2008 +0200
@@ -1,3 +1,11 @@ 2008-10-20 Andrew John Hughes <gnu_and
+2008-10-21 Matthias Klose <doko at ubuntu.com>
+
+ * configure.ac: Add new option --with-pkgversion,
+ substitute PKGVERSION and DIST_ID.
+ * Makefile.am (ICEDTEA_ENV): Add DISTRIBUTION_ID;
+ (stamps/patch.stamp): Encode PKGVERSION in IcedTea version.
+ * patches/icedtea-version.patch: Add DISTRIBUTION_ID in vm crash report.
+
2008-10-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
* HACKING: Add new patch.
diff -r be559c26fdbc -r 5fabd5969958 Makefile.am
--- a/Makefile.am Mon Oct 20 19:30:04 2008 +0100
+++ b/Makefile.am Tue Oct 21 16:45:19 2008 +0200
@@ -172,6 +172,8 @@ ICEDTEA_ENV = \
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
"JAVAC=" \
"RHINO_JAR=$(RHINO_JAR)"
+
+ICEDTEA_ENV += $(if $(DIST_ID),"DISTRIBUTION_ID=$(DIST_ID)")
if WITH_CACAO
ICEDTEA_ENV += \
@@ -633,11 +635,15 @@ stamps/patch.stamp: stamps/patch-fsg.sta
echo ERROR patch $${all_patches_ok} FAILED! ; \
echo WARNING make clean-patch before retrying a fix ; \
exit 2; \
- fi ; \
+ fi
+
if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
fi ; \
icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
+ if [ -n "$(PKGVERSION)" ]; then \
+ icedtea_version="$${icedtea_version} ($(PKGVERSION))" ; \
+ fi; \
sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
if ENABLE_PLUGIN
diff -r be559c26fdbc -r 5fabd5969958 configure.ac
--- a/configure.ac Mon Oct 20 19:30:04 2008 +0100
+++ b/configure.ac Tue Oct 21 16:45:19 2008 +0200
@@ -32,6 +32,7 @@ FIND_TOOL([GAWK], [gawk])
FIND_TOOL([GAWK], [gawk])
AC_PATH_TOOL([HG],[hg])
AC_SUBST([HG])
+AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
AC_CHECK_WITH_GCJ
AC_MSG_CHECKING([for a JDK home directory])
@@ -223,6 +224,27 @@ AC_ARG_WITH([parallel-jobs],
])
AC_MSG_RESULT(${PARALLEL_JOBS})
AC_SUBST(PARALLEL_JOBS)
+
+AC_ARG_WITH([pkgversion],
+ [AS_HELP_STRING([--with-pkgversion=PKG],
+ [Use PKG in the version string in addition to "IcedTea"])],
+ [case "$withval" in
+ yes) AC_MSG_ERROR([package version not specified]) ;;
+ no) PKGVERSION= ;;
+ *) PKGVERSION="$withval" ;;
+ esac],
+ [PKGVERSION=])
+AC_SUBST(PKGVERSION)
+
+if test -n "$LSB_RELEASE"; then
+ DIST_ID=$($LSB_RELEASE -ds)
+else
+ DIST_ID='Custom build'
+fi
+if test -n "$PKGVERSION"; then
+ DIST_ID="$DIST_ID, package $PKGVERSION"
+fi
+AC_SUBST(DIST_ID)
SET_ARCH_DIRS
if test "${with_openjdk}" = true
diff -r be559c26fdbc -r 5fabd5969958 patches/icedtea-version.patch
--- a/patches/icedtea-version.patch Mon Oct 20 19:30:04 2008 +0100
+++ b/patches/icedtea-version.patch Tue Oct 21 16:45:19 2008 +0200
@@ -26,3 +26,38 @@ diff -Nru openjdk.orig/jdk/make/common/s
# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
ifdef BUILD_NUMBER
+--- openjdk/hotspot/src/share/vm/utilities/vmError.cpp~ 2008-08-28 10:23:18.000000000 +0200
++++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-10-21 14:05:12.000000000 +0200
+@@ -168,7 +168,8 @@
+
+ static void print_bug_submit_message(outputStream *out, Thread *thread) {
+ if (out == NULL) return;
+- out->print_raw_cr("# If you would like to submit a bug report, please visit:");
++ out->print_raw_cr("# If you would like to submit a bug report, please include");
++ out->print_raw_cr("# instructions how to reproduce the bug and visit:");
+ 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
+@@ -340,6 +341,9 @@
+ Abstract_VM_Version::vm_info_string(),
+ Abstract_VM_Version::vm_platform_string()
+ );
++#ifdef DISTRIBUTION_ID
++ st->print_cr("# Distribution: %s", DISTRIBUTION_ID);
++#endif
+
+ STEP(60, "(printing problematic frame)")
+
+--- openjdk/hotspot/build/linux/makefiles/vm.make~ 2008-08-28 10:22:55.000000000 +0200
++++ openjdk/hotspot/build/linux/makefiles/vm.make 2008-10-21 14:03:36.000000000 +0200
+@@ -111,6 +111,10 @@
+ ${JRE_VERSION} \
+ ${VM_DISTRO}
+
++ifdef DISTRIBUTION_ID
++CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
++endif
++
+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
+ CFLAGS += $(CFLAGS_WARN/BYFILE)
+
More information about the distro-pkg-dev
mailing list