changeset in /hg/icedtea: Fix ecj build and use of PulseAudio.

[Andrew John Hughes]

changeset 6c315f0c65a5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6c315f0c65a5
description:
	Fix ecj build and use of PulseAudio.

	2008-10-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Make PULSE_JAVA_DIR use srcdir, link
		rt-system.jar to the system rt.jar and include
		com.sun.net.httpserver in rt.jar for jaxws.
		* patches/icedtea-ecj.patch:
		Include rt-system.jar in jaxws compilation bootclasspath
		so java.net and java.util.concurrent classes can be found.
		Add back missing javazic patch.

diffstat:

3 files changed, 33 insertions(+), 4 deletions(-)
ChangeLog                 |   11 +++++++++++
Makefile.am               |    5 ++++-
patches/icedtea-ecj.patch |   21 ++++++++++++++++++---

diffs (103 lines):

diff -r d07cdbac2dc6 -r 6c315f0c65a5 ChangeLog
--- a/ChangeLog	Fri Oct 17 04:03:27 2008 +0100
+++ b/ChangeLog	Sun Oct 19 04:45:28 2008 +0100
@@ -1,3 +1,14 @@ 2008-10-17  Andrew John Hughes  <gnu_and
+2008-10-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Make PULSE_JAVA_DIR use srcdir, link
+	rt-system.jar to the system rt.jar and include
+	com.sun.net.httpserver in rt.jar for jaxws.
+	* patches/icedtea-ecj.patch:
+	Include rt-system.jar in jaxws compilation bootclasspath
+	so java.net and java.util.concurrent classes can be found.
+	Add back missing javazic patch.
+
 2008-10-17  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* rt/netscape/javascript/JSException.java,
diff -r d07cdbac2dc6 -r 6c315f0c65a5 Makefile.am
--- a/Makefile.am	Fri Oct 17 04:03:27 2008 +0100
+++ b/Makefile.am	Sun Oct 19 04:45:28 2008 +0100
@@ -30,7 +30,7 @@ endif
 
 if ENABLE_PULSE_JAVA
 # include the makefile in pulseaudio subdir
-PULSE_JAVA_DIR = pulseaudio
+PULSE_JAVA_DIR = $(srcdir)/pulseaudio
 PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
 PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
 PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_DIR)/bin
@@ -992,6 +992,8 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/rt.jar \
+	    bootstrap/ecj/jre/lib/rt-system.jar; \
 	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
 	  if ! test -d bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
@@ -1281,6 +1283,7 @@ ICEDTEA_COPY_DIRS = \
 	com/sun/jdi/request \
 	com/sun/jmx/snmp/agent \
 	com/sun/tools/jdi \
+	com/sun/net/httpserver \
 	java/io \
 	java/util \
 	java/rmi \
diff -r d07cdbac2dc6 -r 6c315f0c65a5 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Fri Oct 17 04:03:27 2008 +0100
+++ b/patches/icedtea-ecj.patch	Sun Oct 19 04:45:28 2008 +0100
@@ -350,7 +350,7 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
  javac.memoryInitialSize = 128m
 diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
 --- openjdk-ecj.orig/jaxws/make/build.xml	2008-10-17 03:12:24.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml	2008-10-17 03:28:27.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml	2008-10-19 03:42:43.000000000 +0100
 @@ -84,7 +84,10 @@
        <mkdir dir="${build.toolclasses.dir}"/>
        <javac srcdir="${make.tools.dir}/StripProperties"
@@ -363,7 +363,7 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
        <taskdef name="pstrip"
  		 classname="StripPropertiesTask"
  		 classpath="${build.toolclasses.dir}/"/>
-@@ -96,10 +99,12 @@
+@@ -96,11 +99,13 @@
        <javac fork="true"
               srcdir="${src.classes.dir}"
               destdir="${build.classes.dir}"
@@ -372,11 +372,13 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
               memoryMaximumSize="${javac.memoryMaximumSize}"
               target="${javac.target}"
 -             excludes="com/sun/tools/internal/txw2/**">
+-	 <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/>
 +             excludes="com/sun/tools/internal/txw2/**"
 + 	     source="1.5">
- 	 <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/>
++	 <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/jre/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/>
           <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
           <compilerarg line="${javac.version.opt}"/>
+          <compilerarg line="${javac.no.jdk.warnings}"/>
 diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
 --- openjdk-ecj.orig/jaxws/make/Makefile	2008-10-17 03:12:24.000000000 +0100
 +++ openjdk-ecj/jaxws/make/Makefile	2008-10-17 03:29:11.000000000 +0100
@@ -618,6 +620,19 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
  	@$(java-vm-cleanup)
  
  fontconfigs.clean :
+diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile	2008-10-19 04:36:26.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile	2008-10-19 04:37:33.000000000 +0100
+@@ -62,7 +62,8 @@
+ $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
+ 	$(RM) -r $(@D)
+ 	$(prep-target)
+-	$(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
++	$(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \
++		build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
+ 	@$(java-vm-cleanup)
+ 
+ $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
 diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
 --- openjdk-ecj.orig/jdk/make/sun/text/Makefile	2008-09-25 08:43:37.000000000 +0100
 +++ openjdk-ecj/jdk/make/sun/text/Makefile	2008-10-17 03:21:22.000000000 +0100