changeset in /hg/icedtea6: 2008-06-11 Lillian Angel <langel at re...

[Lillian Angel]

changeset 485da23424a2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=485da23424a2
description:
	2008-06-11  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
	        like the Sun's verify Java version applet, check for the "_" in the
	        version string. Our version string format is now correct:
	        java version "1.6.0_0"
	        OpenJDK  Runtime Environment (build 1.6.0_0-b10)
	        OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 26 insertions(+), 10 deletions(-)
ChangeLog   |   10 ++++++++++
Makefile.am |   11 +++++++----
Makefile.in |   15 +++++++++------

diffs (90 lines):

diff -r c400aa599d8b -r 485da23424a2 ChangeLog
--- a/ChangeLog	Tue Jun 10 10:21:11 2008 -0400
+++ b/ChangeLog	Wed Jun 11 12:32:56 2008 -0400
@@ -1,3 +1,13 @@ 2008-06-10  Lillian Angel  <langel at redha
+2008-06-11  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
+	like the Sun's verify Java version applet, check for the "_" in the
+	version string. Our version string format is now correct:
+	java version "1.6.0_0"
+	OpenJDK  Runtime Environment (build 1.6.0_0-b10)
+	OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
+	* Makefile.in: Regenerated.
+
 2008-06-10  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.in: Regenerated.
diff -r c400aa599d8b -r 485da23424a2 Makefile.am
--- a/Makefile.am	Tue Jun 10 10:21:11 2008 -0400
+++ b/Makefile.am	Wed Jun 11 12:32:56 2008 -0400
@@ -62,6 +62,7 @@ ICEDTEA_BOOT_DIR= \
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
 if CORE_BUILD
   ICEDTEA_CORE_BUILD = yes
 else
@@ -76,8 +77,9 @@ ICEDTEA_ENV = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
         "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -134,8 +136,9 @@ ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
 	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
diff -r c400aa599d8b -r 485da23424a2 Makefile.in
--- a/Makefile.in	Tue Jun 10 10:21:11 2008 -0400
+++ b/Makefile.in	Wed Jun 11 12:32:56 2008 -0400
@@ -285,15 +285,17 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 
+JDK_UPDATE_VERSION = 0
 @CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD = 
 @CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
 @ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD = 
 @ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -325,9 +327,10 @@ ICEDTEA_CLS_DIR_ECJ = \
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \