changeset in /hg/icedtea: Merge with IcedTea tip.

[gnu_andrew at member.fsf.org]

changeset 7975ee6908a5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7975ee6908a5
description:
	Merge with IcedTea tip.

diffstat:

4 files changed, 23 insertions(+), 13 deletions(-)
ChangeLog                 |   11 +++++++++++
Makefile.am               |    6 +++---
Makefile.in               |    6 +++---
patches/icedtea-ecj.patch |   13 ++++++-------

diffs (109 lines):

diff -r df0892463d09 -r 7975ee6908a5 ChangeLog
--- a/ChangeLog	Fri May 30 15:50:34 2008 +0100
+++ b/ChangeLog	Fri May 30 15:52:51 2008 +0100
@@ -1,3 +1,14 @@ 2008-05-30  Andrew John Hughes  <gnu_and
+2008-05-30  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-ecj.patch: Use `cat file-list` not gjar -@ stdin.
+
+2008-05-30  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (check-jdk): Use BUILD_OUTPUT_DIR not LINUX_DIR.
+	(check-langtools): Likewise.
+	(check-hotspot): Likewise.
+	* Makefile.in: Regenerated.
+
 2008-05-30  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* .hgignore:
diff -r df0892463d09 -r 7975ee6908a5 Makefile.am
--- a/Makefile.am	Fri May 30 15:50:34 2008 +0100
+++ b/Makefile.am	Fri May 30 15:52:51 2008 +0100
@@ -989,21 +989,21 @@ check-hotspot: jtreg
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/hotspot/test
 
 check-langtools: jtreg
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
-		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/langtools/test
 
 check-jdk: jtreg
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
-		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/jdk/test
 
 clean-jtreg-reports:
diff -r df0892463d09 -r 7975ee6908a5 Makefile.in
--- a/Makefile.in	Fri May 30 15:50:34 2008 +0100
+++ b/Makefile.in	Fri May 30 15:52:51 2008 +0100
@@ -1429,21 +1429,21 @@ check-hotspot: jtreg
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/hotspot/test
 
 check-langtools: jtreg
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
-		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/langtools/test
 
 check-jdk: jtreg
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
-		-jdk:`pwd`/openjdk/control/build/$(LINUX_DIR)/j2sdk-image \
+		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/jdk/test
 
 clean-jtreg-reports:
diff -r df0892463d09 -r 7975ee6908a5 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Fri May 30 15:50:34 2008 +0100
+++ b/patches/icedtea-ecj.patch	Fri May 30 15:52:51 2008 +0100
@@ -661,15 +661,14 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
 @@ -649,10 +649,11 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
  	$(prep-target)
- 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
 -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
 +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
  	$(prep-target)
 -	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 -	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
-+	(cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
-+	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS))
++	(cd $(CLASSBINDIR) && \
++	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
  	@$(java-vm-cleanup)
  
  # Create jsse.jar containing SunJSSE implementation classes
@@ -682,9 +681,9 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
  	$(prep-target)
 -	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 -	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
-+	(cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
-+	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS))
++	(cd $(CLASSBINDIR) && \
++	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
  	@$(java-vm-cleanup)
  
  # Meta-index construction to make core class loaders lazier