Mercurial > hg > icedtea9
changeset 1668:860c644885b2
2009-02-23 Lillian Angel <langel@redhat.com>
* AUTHORS: Added Mark Reinhold.
2009-02-23 Mark Reinhold <mr@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.
(transplanted from 0848286d8e5c99ef8de8cc73c1091dc2cabe7c0d)
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Mon, 23 Feb 2009 15:42:22 -0500 |
| parents | 0841adbc32b5 |
| children | 4c8969cb6ee3 |
| files | AUTHORS ChangeLog Makefile.am patches/icedtea-version.patch |
| diffstat | 4 files changed, 74 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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@naffah-raif.name> Parag Nemade <pnemade@redhat.com> Xerxes Rånby <xerxes@zafena.se> +Mark Reinhold <mr@sun.com> Bernhard Rosenkränzer <bero@arklinux.org> Marc Schoenefeld <mschoene@redhat.com> Keith Seitz <keiths@redhat.com>
--- a/ChangeLog Mon Feb 23 07:49:42 2009 -0500 +++ b/ChangeLog Mon Feb 23 15:42:22 2009 -0500 @@ -69,10 +69,23 @@ * patches/hotspot/original/icedtea-includedb.patch, * patches/icedtea-libraries.patch: Recreated. +2009-02-23 Lillian Angel <langel@redhat.com> + + * AUTHORS: Added Mark Reinhold. + +2009-02-23 Mark Reinhold <mr@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@redhat.com> - Robert Schuster <robertschuster@fsfe.org> - - * configure.ac (llvm_components): Add nativecodegen. + Robert Schuster <robertschuster@fsfe.org> + + * configure.ac (llvm_components): Add nativecodegen. 2009-02-23 Gary Benson <gbenson@redhat.com>
--- a/Makefile.am Mon Feb 23 07:49:42 2009 -0500 +++ b/Makefile.am Mon Feb 23 15:42:22 2009 -0500 @@ -2098,8 +2098,19 @@ 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))" ; \ + echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \ + >>openjdk/jdk/make/common/shared/Defs.gmk ; \ fi; \ if test x"$(PROJECT_NAME)" != "xjdk7"; then \ proj_suffix="-$(PROJECT_NAME)"; \ @@ -2107,7 +2118,6 @@ if test x"$(VERSION_SUFFIX)" != "x"; then \ ver_suffix="-$(VERSION_SUFFIX)"; \ fi ; \ - sed -i "s#OpenJDK#OpenJDK (IcedTea $${icedtea_version})#" openjdk/jdk/make/common/shared/Defs.gmk ; \ sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \ openjdk/jdk/make/common/shared/Defs.gmk; \ cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/
--- 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 @@ -10,3 +10,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 $@