/hg/icedtea: 2 new changesets

[andrew at icedtea.classpath.org]

changeset bee59676264f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bee59676264f
author: Stefan Ring <stefan at complang.tuwien.ac.at>
date: Mon Jun 14 22:19:24 2010 +0200

	PR icedtea/495: Extend JAR_KNOWS_ATFILE patch

	2010-06-15 Stefan Ring <stefan at complang.tuwien.ac.at>

	 PR icedtea/495
		* patches/boot/jar.patch: Apply workaround in more places.


changeset 09f5a7f1fb25 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=09f5a7f1fb25
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 15 18:21:49 2010 +0100

	Bring recent Zero fixes into HotSpot.

	2010-06-15 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Bump HotSpot changeset ID and HA256
	checksum to incorporate recent Zero fixes (as in OpenJDK6).


diffstat:

3 files changed, 57 insertions(+), 2 deletions(-)
ChangeLog              |   11 +++++++++++
Makefile.am            |    4 ++--
patches/boot/jar.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++

diffs (90 lines):

diff -r 731f4c50030c -r 09f5a7f1fb25 ChangeLog
--- a/ChangeLog	Mon Jun 14 17:17:14 2010 +0100
+++ b/ChangeLog	Tue Jun 15 18:21:49 2010 +0100
@@ -1,3 +1,14 @@ 2010-06-14  Andrew John Hughes  <ahughes
+2010-06-15  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Bump HotSpot changeset ID and HA256 checksum
+	to incorporate recent Zero fixes (as in OpenJDK6).
+
+2010-06-15  Stefan Ring  <stefan at complang.tuwien.ac.at>
+
+	PR icedtea/495
+	* patches/boot/jar.patch: Apply workaround in more places.
+
 2010-06-14  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 731f4c50030c -r 09f5a7f1fb25 Makefile.am
--- a/Makefile.am	Mon Jun 14 17:17:14 2010 +0100
+++ b/Makefile.am	Tue Jun 15 18:21:49 2010 +0100
@@ -3,7 +3,7 @@ OPENJDK_VERSION = b89
 OPENJDK_VERSION = b89
 
 CORBA_CHANGESET = e805b4155d76
-HOTSPOT_CHANGESET = 5a92a37da3b9
+HOTSPOT_CHANGESET = a393ff93e7e5
 JAXP_CHANGESET  = 826bafcb6c4a
 JAXWS_CHANGESET = 1661166c82dc
 JDK_CHANGESET = 2dead33effe1
@@ -11,7 +11,7 @@ OPENJDK_CHANGESET = 195fcceefddc
 OPENJDK_CHANGESET = 195fcceefddc
 
 CORBA_SHA256SUM = 870e2eac993a4eef48197ed7309cab176b56a994add1de215a026599052627cb
-HOTSPOT_SHA256SUM = f3dbd5689769cac89951a2e762db6ad2365942f7f99d69c33e96874622f09d7d
+HOTSPOT_SHA256SUM = 995d64e272ecde0e00b69e36371bc7f8a82638c1f598c956f98e10538e41d695
 JAXP_SHA256SUM = 42d004e51a1f01d146ad230ce48996ddf8da3719fe571a41653f431d6b2e8a7b
 JAXWS_SHA256SUM = 4523909cd46fd61b5c6670bf932099d5899236a37a4058e7b2bcb855e503a0e4
 JDK_SHA256SUM = ef0d2624d6844516ac079483ea576623733ce0f27fd57bb359ffe07f7c4ac60f
diff -r 731f4c50030c -r 09f5a7f1fb25 patches/boot/jar.patch
--- a/patches/boot/jar.patch	Mon Jun 14 17:17:14 2010 +0100
+++ b/patches/boot/jar.patch	Tue Jun 15 18:21:49 2010 +0100
@@ -24,3 +24,47 @@ diff -Nru ../openjdk.orig/openjdk-boot/j
  
  # Create jsse.jar containing SunJSSE implementation classes
  JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar
+@@ -711,9 +722,19 @@
+ RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar
+ $(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE)
+ 	$(prep-target)
++ifneq (,$(JAR_KNOWS_ATFILE))
+ 	$(CD) $(CLASSBINDIR) && \
+ 	    $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ 	        @$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
++	$(CD) $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
++	    $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
++	        $(BOOT_JAR_JFLAGS)
++else
++	$(CD) $(CLASSBINDIR) && \
++	    $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++	        $(BOOT_JAR_JFLAGS) `cat $(RT_JAR_FILELIST)`
++endif
+ 	@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
+ 
+ # Meta-index construction to make core class loaders lazier
+--- openjdk-boot/jdk/make/modules/Makefile.orig	2010-06-13 10:37:13.000000000 +0200
++++ openjdk-boot/jdk/make/modules/Makefile	2010-06-13 10:42:37.000000000 +0200
+@@ -111,10 +111,21 @@
+            fi ; \
+            $(MKDIR) -p $(ABS_MODULES_DIR)/$$m/lib; \
+ 	   $(CD) $(MODULE_CLASSES) && \
++ifneq (,$(JAR_KNOWS_ATFILE))
+                $(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \
+ 		   $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \
+ 	           @$(TMP)/tmp.cf \
+                    $(BOOT_JAR_JFLAGS); \
++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
++               $(CAT) $(TMP)/tmp.cf | \
++               $(BOOT_JAR_CMD) c0mf@ $(MODULE_JAR_MANIFEST_FILE) \
++		   $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \
++                   $(BOOT_JAR_JFLAGS); \
++else
++               $(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \
++		   $(ABS_MODULES_DIR)/$$m/lib/$$m.jar \
++                   $(BOOT_JAR_JFLAGS) `cat $(TMP)/tmp.cf`; \
++endif
+ 	   for s in `$(GREP) "^$$m" $(MODULES_LIST)` ; do \
+                if [ -d $(TMP)/$$s ] ; then \
+                	   $(CP) -rf $(TMP)/$$s/*  $(ABS_MODULES_DIR)/$$m; \