/hg/icedtea6: 2 new changesets

[dlila at icedtea.classpath.org]

changeset 8927956c3b6b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8927956c3b6b
author: Denis Lila <dlila at redhat.com>
date: Wed Jun 15 10:35:39 2011 -0400

	Fix build regression.


changeset 7d491356b6d9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7d491356b6d9
author: Denis Lila <dlila at redhat.com>
date: Wed Jun 15 11:57:46 2011 -0400

	merge


diffstat:

 ChangeLog                          |  17 ++++++++++++++++-
 Makefile.am                        |  23 ++++++++++++-----------
 patches/jtreg-FileLoaderTest.patch |  35 +++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 12 deletions(-)

diffs (111 lines):

diff -r 78a0ce4fd551 -r 7d491356b6d9 ChangeLog
--- a/ChangeLog	Tue Jun 14 17:25:06 2011 +0200
+++ b/ChangeLog	Wed Jun 15 11:57:46 2011 -0400
@@ -1,4 +1,11 @@
-2011-06-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
+2011-06-15  Denis Lila  <dlila at redhat.com>
+
+	* Makefile.am: Add back the -classpath option to javah in
+	building the pulse audio header files. The bootstrap javah
+	doesn't recognize -J-Xbootclasspath/p: so it couldn't find
+	the classfiles.
+
+2011-06-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: added new patch
 	* patches/jtreg-EncodedMultiByteChar.patch:
@@ -6,6 +13,14 @@
 	openjdk/jdk/test/sun/net/www/protocol/file/EncodedMultiByteChar.java
 	deletes all its work files.
 
+2011-06-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: added new patch
+	* patches/jtreg-FileLoaderTest.patch:
+	Make sure that the regression test
+	openjdk/jdk/test/sun/misc/URLClassPath/FileLoaderTest.java
+	deletes all its work files.
+
 2011-06-14  Denis Lila  <dlila at redhat.com>
 
 	* Makefile.am: Add patch.
diff -r 78a0ce4fd551 -r 7d491356b6d9 Makefile.am
--- a/Makefile.am	Tue Jun 14 17:25:06 2011 +0200
+++ b/Makefile.am	Wed Jun 15 11:57:46 2011 -0400
@@ -355,7 +355,8 @@
 	patches/openjdk/7036148-npe-null-jmenu-name.patch \
 	patches/jtreg-ChangeDir.patch \
 	patches/jtreg-TempBuffer.patch \
-	patches/jtreg-EncodedMultiByteChar.patch
+	patches/jtreg-EncodedMultiByteChar.patch \
+	patches/jtreg-FileLoaderTest.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
@@ -1757,16 +1758,16 @@
 
 stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
 	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
-	  org.classpath.icedtea.pulseaudio.EventLoop ; \
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
-	  org.classpath.icedtea.pulseaudio.Stream ; \
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
-	  org.classpath.icedtea.pulseaudio.Operation; \
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
-	  org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
-	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) \
-	  org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
+	$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
 	mkdir -p stamps
 	touch stamps/pulse-java-headers.stamp
 
diff -r 78a0ce4fd551 -r 7d491356b6d9 patches/jtreg-FileLoaderTest.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-FileLoaderTest.patch	Wed Jun 15 11:57:46 2011 -0400
@@ -0,0 +1,36 @@
+--- openjdk.orig/jdk/test/sun/misc/URLClassPath/FileLoaderTest.java	2011-02-28 17:07:05.000000000 +0100
++++ openjdk/jdk/test/sun/misc/URLClassPath/FileLoaderTest.java	2011-06-14 16:49:57.000000000 +0200
+@@ -31,16 +31,24 @@
+ 
+ public class FileLoaderTest {
+   public static void main (String args[]) throws Exception {
+-      File tempFile = File.createTempFile("foo", ".txt");
+-      tempFile.deleteOnExit();
+-      String basestr = tempFile.toURL().toString();
+-      basestr = basestr.substring(0, basestr.lastIndexOf("/")+1);
+-      URL url = new URL(basestr+"."+"/");
++      File tempFile = null;
++      try
++      {
++          tempFile = File.createTempFile("foo", ".txt");
++          String basestr = tempFile.toURL().toString();
++          basestr = basestr.substring(0, basestr.lastIndexOf("/")+1);
++          URL url = new URL(basestr+"."+"/");
+ 
+-      ClassLoader cl = new URLClassLoader (new URL[] { url });
+-      if (cl.getResource (tempFile.getName()) == null) {
+-          throw new RuntimeException("Returned null instead of " +
+-                                     tempFile.toURL().toString());
++          ClassLoader cl = new URLClassLoader (new URL[] { url });
++          if (cl.getResource (tempFile.getName()) == null) {
++              throw new RuntimeException("Returned null instead of " +
++                      tempFile.toURL().toString());
++          }
++      }
++      finally {
++          if (tempFile != null) {
++              tempFile.delete();
++          }
+       }
+    }
+ }