Mercurial > hg > release > icedtea7-2.6

changeset 2010:05e6f20fb7fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump to b73, support drop zips and use extended rt.jar for build. 2009-10-08 Andrew John Hughes <ahughes@redhat.com> * ChangeLog: Remove stray tab. * Makefile.am: Bump to b73, move CACAO URLs to top, add support for new JAXP and JAXWS drop zips, remove references to non-existent clean-shared-objects and clean-copy targets, fix broken references to bootstrap-directory-symlink-boot.stamp, update build JDK with rt classes rather than creating a separate rt-closed.jar, add additional copy directories needed by gcj bootstrap. * acinclude.m4: (WITH_JAXP_DROP_ZIP): New options --with-jaxp-drop-zip to specify location of the JAXP drop. (WITH_JAF_DROP_ZIP): Likewise for JAF. (WITH_JAXWS_DROP_ZIP): And JAXWS. * configure.ac: Run new macros for drop zips. * javac.in: Use local extended rt.jar rather than original. * patches/boot/icedtea-jaxp-dependency.patch: Add the JAXP classes to the classpath when building JAXWS (existing build assumes com.sun.org.apache.xerces classes are in the boot JDK). * patches/boot/icedtea.patch, * patches/icedtea-alpha-fixes.patch, * patches/icedtea-ant.patch: Regenerated.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 14 Oct 2009 02:18:26 +0100
parents 19ad2af4b4e3
children 1a7fa6604936
files ChangeLog Makefile.am acinclude.m4 configure.ac javac.in patches/boot/icedtea-jaxp-dependency.patch patches/boot/icedtea.patch patches/icedtea-alpha-fixes.patch patches/icedtea-ant.patch
diffstat 9 files changed, 378 insertions(+), 239 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 08 13:19:08 2009 +0200
+++ b/ChangeLog	Wed Oct 14 02:18:26 2009 +0100
@@ -1,3 +1,30 @@
+2009-10-08  Andrew John Hughes  <ahughes@redhat.com>
+
+	* ChangeLog: Remove stray tab.
+	* Makefile.am: Bump to b73,
+	move CACAO URLs to top, add support
+	for new JAXP and JAXWS drop zips, remove
+	references to non-existent clean-shared-objects
+	and clean-copy targets, fix broken references to
+	bootstrap-directory-symlink-boot.stamp, update
+	build JDK with rt classes rather than creating a
+	separate rt-closed.jar, add additional copy
+	directories needed by gcj bootstrap.
+	* acinclude.m4:
+	(WITH_JAXP_DROP_ZIP): New options --with-jaxp-drop-zip
+	to specify location of the JAXP drop.
+	(WITH_JAF_DROP_ZIP): Likewise for JAF.
+	(WITH_JAXWS_DROP_ZIP): And JAXWS.
+	* configure.ac: Run new macros for drop zips.
+	* javac.in: Use local extended rt.jar rather than original.
+	* patches/boot/icedtea-jaxp-dependency.patch: Add the JAXP
+	classes to the classpath when building JAXWS (existing build
+	assumes com.sun.org.apache.xerces classes are in the boot JDK).
+	* patches/boot/icedtea.patch,
+	* patches/icedtea-alpha-fixes.patch,
+	* patches/icedtea-ant.patch:
+	Regenerated.
+
 2009-10-08  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
@@ -14204,7 +14231,7 @@
 	* Makefile.in: Regenerate.
 
 2008-01-07  Lillian Angel  <langel@redhat.com>
-	
+
 	Fixes Bug #92
 	* Makefile.am
 	(gcjwebplugin.so): Added check for ENABLE_PLUGIN.
--- a/Makefile.am	Thu Oct 08 13:19:08 2009 +0200
+++ b/Makefile.am	Wed Oct 14 02:18:26 2009 +0100
@@ -1,25 +1,27 @@
 # Dependencies
 
-OPENJDK_VERSION = b72
+OPENJDK_VERSION = b73
 
-CORBA_CHANGESET = 5fdcfb25dbb4
-HOTSPOT_CHANGESET = c8155bc21432
-JAXP_CHANGESET = fe2e7f835dd2
-JAXWS_CHANGESET = 501b8988da30
-JDK_CHANGESET = c2cd86f82ed7
-LANGTOOLS_CHANGESET = 5a36337cc053
-OPENJDK_CHANGESET = 717f2b969919
+CORBA_CHANGESET = bb1f254d2376
+HOTSPOT_CHANGESET = de2100353d9c
+JAXP_CHANGESET  = ca47845adba8
+JAXWS_CHANGESET = a85341f84531
+JDK_CHANGESET = 93da8a843f32
+LANGTOOLS_CHANGESET = 26651c0cabb7
+OPENJDK_CHANGESET = a580d2beece9
 
-CORBA_MD5SUM = 5a9fef662129c05b2dd05c79a2685178
-HOTSPOT_MD5SUM = e5b21a7e5cc5cae315cd9aa158ee9858
-JAXP_MD5SUM = f4bd08cf016fefe31c4269b9d90edec0
-JAXWS_MD5SUM = 8d0729f5c4ddec47393e636e7d6a4914
-JDK_MD5SUM = 622268153bc097a5b91d76305eb0502d
-LANGTOOLS_MD5SUM = eadbaead19df2fbe039fd12593e97197
-OPENJDK_MD5SUM = b5d1f6fad70a2b6af7b011169fbd6da3
+CORBA_MD5SUM = 80e4f10ff90ecd80b32a39dbe6f7fa77
+HOTSPOT_MD5SUM = efc9ee49fe1f10f9a6db2ec897e76937
+JAXP_MD5SUM = d2aa8cd7aaeeabfb9116f020921fb7ea
+JAXWS_MD5SUM = 0fa8f01a5baa8764106370321fdb3974
+JDK_MD5SUM = f127c5785e84443f869fb1695f786749
+LANGTOOLS_MD5SUM = 3b5f8641e805b22562452924d0bf4ea5
+OPENJDK_MD5SUM = 17bc02e01cfdb06ee06f01026e93b0a2
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
+CACAO_BASE_URL = http://www.complang.tuwien.ac.at
+CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
 
 NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
 NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz
@@ -29,6 +31,14 @@
 VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz
 VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe
 
+DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
+JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
+JAXWS_DROP_MD5SUM = debb949440c5a15ce999cfefbbc56526
+JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip
+JAF_DROP_MD5SUM = eb8cb7a4a7f14e211fbe2354878a2472
+JAXP_DROP_ZIP = jdk7-jaxp-2009_09_28.zip
+JAXP_DROP_MD5SUM = 8800970d03bab1fff188dcfafc346f5d
+
 OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot
 
 ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7
@@ -47,9 +57,6 @@
 LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools
 HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot
 
-CACAO_BASE_URL = http://www.complang.tuwien.ac.at
-CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
-
 JDK_SHARE = openjdk/jdk/src/share/classes
 JDK_SOLARIS = openjdk/jdk/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
@@ -361,7 +368,8 @@
 ICEDTEA_BOOT_PATCHES = patches/boot/icedtea.patch \
 	patches/boot/icedtea-hotspot-$(HSBUILD).patch \
 	patches/boot/icedtea-jopt.patch \
-	patches/boot/icedtea-dyn.patch
+	patches/boot/icedtea-dyn.patch \
+	patches/boot/icedtea-jaxp-dependency.patch
 
 if CP39408_JAVAH
 ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
@@ -456,7 +464,8 @@
 	ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \
 	DEBUG_CLASSFILES="true" \
 	DEBUG_BINARIES="true" \
-	DISABLE_INTREE_EC="true"
+	DISABLE_INTREE_EC="true" \
+	ALT_DROPS_DIR="$(abs_top_builddir)/drops"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -666,8 +675,10 @@
 
 check-local: jtregcheck
 
-distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java 
+distclean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
+ clean-clone clean-clone-boot clean-download
 	rm -rf stamps
+	rm -rf drops
 	rm -f rt-source-files.txt \
 	  hotspot-tools-source-files.txt \
 	  extra-source-files.txt \
@@ -675,8 +686,6 @@
 	rm -rf bootstrap
 	rm -rf lib
 	rm -rf extra-lib
-	rm -rf openjdk-boot
-	rm -rf openjdk
 	rm -rf hotspot-tools
 	rm -rf rt/netscape
 	rm -rf visualvm
@@ -710,8 +719,8 @@
 	clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \
 	clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
 	clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \
-	clean-tools-jar clean-shared-objects clean-visualvm clean-nbplatform \
-	clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \
+	clean-tools-jar clean-visualvm clean-nbplatform \
+	clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \
 	$(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \
 	clean-jtreg-reports 
 
@@ -741,7 +750,63 @@
 
 # Download OpenJDK sources.
 
-stamps/download.stamp: stamps/hgforest.stamp
+stamps/download-jaxp-drop.stamp:
+	mkdir -p drops
+if USE_ALT_JAXP_DROP_ZIP
+	ln -sf $(ALT_JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP)
+endif
+	if ! echo "$(JAXP_DROP_MD5SUM)  drops/$(JAXP_DROP_ZIP)" \
+	  | $(MD5SUM) --check ; \
+	then \
+	  if [ -f drops/$(JAXP_DROP_ZIP) ] ; \
+	  then \
+	    mv drops/$(JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP).old ; \
+	  fi ; \
+	  $(WGET) $(DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \
+	fi ;
+	mkdir -p stamps
+	touch stamps/download-jaxp-drop.stamp
+
+stamps/download-jaf-drop.stamp:
+	mkdir -p drops
+if USE_ALT_JAF_DROP_ZIP
+	ln -sf $(ALT_JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP)
+endif
+	if ! echo "$(JAF_DROP_MD5SUM)  drops/$(JAF_DROP_ZIP)" \
+	  | $(MD5SUM) --check ; \
+	then \
+	  if [ -f drops/$(JAF_DROP_ZIP) ] ; \
+	  then \
+	    mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
+	  fi ; \
+	  $(WGET) $(DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
+	fi ;
+	mkdir -p stamps
+	touch stamps/download-jaf-drop.stamp
+
+stamps/download-jaxws-drop.stamp:
+	mkdir -p drops
+if USE_ALT_JAXWS_DROP_ZIP
+	ln -sf $(ALT_JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP)
+endif
+	if ! echo "$(JAXWS_DROP_MD5SUM)  drops/$(JAXWS_DROP_ZIP)" \
+	  | $(MD5SUM) --check ; \
+	then \
+	  if [ -f drops/$(JAXWS_DROP_ZIP) ] ; \
+	  then \
+	    mv drops/$(JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP).old ; \
+	  fi ; \
+	  $(WGET) $(DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \
+	fi ;
+	mkdir -p stamps
+	touch stamps/download-jaxws-drop.stamp
+
+stamps/download-drops.stamp: stamps/download-jaxp-drop.stamp \
+ stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp
+	mkdir -p stamps
+	touch stamps/download-drops.stamp
+
+stamps/download.stamp: stamps/hgforest.stamp stamps/download-drops.stamp
 if !OPENJDK_SRC_DIR_FOUND
 if USE_ALT_OPENJDK_SRC_ZIP
 else
@@ -884,7 +949,23 @@
 	mkdir -p stamps
 	touch stamps/download.stamp
 
-clean-download:
+clean-download-jaxp-drop:
+	rm -f drops/$(JAXP_DROP_ZIP)
+	rm -f stamps/download-jaxp-drop.stamp
+
+clean-download-jaf-drop:
+	rm -f drops/$(JAF_DROP_ZIP)
+	rm -f stamps/download-jaf-drop.stamp
+
+clean-download-jaxws-drop:
+	rm -f drops/$(JAXWS_DROP_ZIP)
+	rm -f stamps/download-jaxws-drop.stamp
+
+clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \
+ clean-download-jaxws-drop
+	rm -f stamps/download-drops.stamp
+
+clean-download: clean-drops
 	rm -f $(OPENJDK_SRC_ZIP)
 if BUILD_CACAO
 	rm -f $(CACAO_SRC_ZIP)
@@ -1377,8 +1458,9 @@
 	  bootstrap/boot/lib/endorsed/xalan-j2-serializer.jar
 	ln -sf $(XERCES2_JAR) bootstrap/boot/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/boot/jre/lib; \
-	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
-	  bootstrap/boot/jre/lib/rt-system.jar; \
+	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
+	  bootstrap/boot/jre/lib/rt.jar; \
+	chmod u+w bootstrap/boot/jre/lib/rt.jar; \
 	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	  bootstrap/boot/jre/lib/; \
 	if ! test -d bootstrap/boot/jre/lib/$(INSTALL_ARCH_DIR); \
@@ -1433,10 +1515,10 @@
 	rm -f bootstrap/jdk1.6.0
 	ln -sf boot bootstrap/jdk1.6.0
 	mkdir -p stamps
-	touch stamps/bootstrap-directory-symlink-boot.stamp
+	touch stamps/bootstrap-directory-symlink-stage1.stamp
 
 clean-bootstrap-directory-symlink-stage1:
-	rm -f stamps/bootstrap-directory-symlink-boot.stamp
+	rm -f stamps/bootstrap-directory-symlink-stage1.stamp
 	rm -f bootstrap/jdk1.6.0
 
 # stage 2 symlink.
@@ -2201,8 +2283,7 @@
 	mkdir -p stamps
 	touch stamps/hotspot-tools.stamp
 
-clean-plugs: clean-plugs clean-shared-objects \
-	clean-copy clean-rt
+clean-plugs: clean-plugs clean-rt
 	rm -f stamps/plugs.stamp
 	rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
@@ -2216,11 +2297,15 @@
 	$(JDK_SHARE)/com/sun/tools/jdi \
 	$(JDK_SHARE)/com/sun/net/httpserver \
 	$(JDK_SHARE)/java/io \
+	$(JDK_SHARE)/java/security/cert \
 	$(JDK_SHARE)/java/util \
 	$(JDK_SHARE)/java/rmi \
+	$(JDK_SHARE)/javax/net/ssl \
+	$(JDK_SHARE)/javax/rmi/ssl \
+	$(JDK_SHARE)/javax/script \
+	$(JDK_SHARE)/javax/security/auth/kerberos \
+	$(JDK_SHARE)/javax/security/sasl \
 	$(JDK_SHARE)/sun/awt/ \
-	$(JDK_SHARE)/javax/net/ssl \
-	$(JDK_SHARE)/javax/script \
 	$(JAXWS)/javax/xml/bind
 
 # tools.jar class files.
@@ -2316,13 +2401,13 @@
 
 # rt-closed.jar.
 bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
-	mkdir -p bootstrap/jdk1.7.0/jre/lib
-	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-	  -C lib/rt javax -C lib/rt sun ;
 	if test -d bootstrap/boot/jre/lib ; \
 	then \
-	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-	    bootstrap/boot/jre/lib/rt.jar; \
+	  $(ICEDTEA_BOOT_DIR)/bin/jar uf bootstrap/boot/jre/lib/rt.jar \
+	     -C lib/rt com -C lib/rt java -C lib/rt javax -C lib/rt sun ; \
+	  mkdir -p bootstrap/jdk1.7.0/jre/lib ; \
+	  ln -sf ${abs_top_builddir}/bootstrap/boot/jre/lib/rt.jar \
+		bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
 	fi
 
 # Target Aliases
@@ -2352,6 +2437,14 @@
 
 download: stamps/download.stamp
 
+download-drops: stamps/download-drops.stamp
+
+download-jaf-drop: stamps/download-jaf-drop.stamp
+
+download-jaxp-drop: stamps/download-jaxp-drop.stamp
+
+download-jaxws-drop: stamps/download-jaxws-drop.stamp
+
 extract: stamps/extract.stamp
 
 extract-cacao: stamps/extract-cacao.stamp
--- a/acinclude.m4	Thu Oct 08 13:19:08 2009 +0200
+++ b/acinclude.m4	Wed Oct 14 02:18:26 2009 +0100
@@ -1100,6 +1100,57 @@
   AC_SUBST(ALT_LANGTOOLS_SRC_ZIP)
 ])
 
+AC_DEFUN([WITH_JAXP_DROP_ZIP],
+[
+  AC_MSG_CHECKING(for a JAXP drop zip)
+  AC_ARG_WITH([jaxp-drop-zip],
+              [AS_HELP_STRING(--with-jaxp-drop-zip,specify the location of the JAXP drop zip)],
+  [
+    ALT_JAXP_DROP_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test x = x)
+  ],
+  [ 
+    ALT_JAXP_DROP_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_JAXP_DROP_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_JAXP_DROP_ZIP})
+  AC_SUBST(ALT_JAXP_DROP_ZIP)
+])
+
+AC_DEFUN([WITH_JAF_DROP_ZIP],
+[
+  AC_MSG_CHECKING(for a JAF drop zip)
+  AC_ARG_WITH([jaf-drop-zip],
+              [AS_HELP_STRING(--with-jaf-drop-zip,specify the location of the JAF drop zip)],
+  [
+    ALT_JAF_DROP_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test x = x)
+  ],
+  [ 
+    ALT_JAF_DROP_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_JAF_DROP_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_JAF_DROP_ZIP})
+  AC_SUBST(ALT_JAF_DROP_ZIP)
+])
+
+AC_DEFUN([WITH_JAXWS_DROP_ZIP],
+[
+  AC_MSG_CHECKING(for a JAXWS drop zip)
+  AC_ARG_WITH([jaxws-drop-zip],
+              [AS_HELP_STRING(--with-jaxws-drop-zip,specify the location of the JAXWS drop zip)],
+  [
+    ALT_JAXWS_DROP_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test x = x)
+  ],
+  [ 
+    ALT_JAXWS_DROP_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_JAXWS_DROP_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_JAXWS_DROP_ZIP})
+  AC_SUBST(ALT_JAXWS_DROP_ZIP)
+])
+
 AC_DEFUN([AC_CHECK_WITH_HG_REVISION],
 [
   AC_MSG_CHECKING([which Mercurial revision to use])
--- a/configure.ac	Thu Oct 08 13:19:08 2009 +0200
+++ b/configure.ac	Wed Oct 14 02:18:26 2009 +0100
@@ -225,6 +225,9 @@
 WITH_LANGTOOLS_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 WITH_ALT_JAR_BINARY
+WITH_JAXP_DROP_ZIP
+WITH_JAF_DROP_ZIP
+WITH_JAXWS_DROP_ZIP
 
 AC_CHECK_ENABLE_CACAO
 AC_CHECK_WITH_CACAO_HOME
--- a/javac.in	Thu Oct 08 13:19:08 2009 +0200
+++ b/javac.in	Wed Oct 14 02:18:26 2009 +0100
@@ -17,7 +17,7 @@
 }
 
 my @bcoption;
-push @bcoption, '-bootclasspath', glob '@SYSTEM_JDK_DIR@/jre/lib/rt.jar'
+push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'
     unless grep {$_ eq '-bootclasspath'} @ARGV;
 my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/icedtea-jaxp-dependency.patch	Wed Oct 14 02:18:26 2009 +0100
@@ -0,0 +1,26 @@
+diff -Nru openjdk-boot.orig/jaxws/build.properties openjdk-boot/jaxws/build.properties
+--- openjdk-boot.orig/jaxws/build.properties	2009-10-12 15:42:14.000000000 +0100
++++ openjdk-boot/jaxws/build.properties	2009-10-12 15:45:40.000000000 +0100
+@@ -58,6 +58,9 @@
+ build.dir=${output.dir}/build
+ build.classes.dir=${build.dir}/classes
+ 
++# JAXP built files
++jaxp.classes.dir=${output.dir}/../jaxp/build/classes
++
+ # Distributed results
+ dist.dir=${output.dir}/dist
+ dist.lib.dir=${dist.dir}/lib
+diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
+--- openjdk-boot.orig/jaxws/build.xml	2009-10-12 15:20:51.000000000 +0100
++++ openjdk-boot/jaxws/build.xml	2009-10-12 15:19:42.000000000 +0100
+@@ -113,7 +113,8 @@
+              source="${javac.source}"
+ 	     debug="${javac.debug}"
+              target="${javac.target}"
+-             executable="${javac.executable}">
++             executable="${javac.executable}"
++	     classpath="${jaxp.classes.dir}:${build.classes.dir}">
+             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
+             <src refid="src.dir.id"/>
--- a/patches/boot/icedtea.patch	Thu Oct 08 13:19:08 2009 +0200
+++ b/patches/boot/icedtea.patch	Wed Oct 14 02:18:26 2009 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile
---- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile	2009-10-05 02:23:42.764274773 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/Makefile	2009-10-07 15:38:47.674613200 +0100
 @@ -42,7 +42,7 @@
  # the rmic iiop backend needs some classes that are part of the impl/util
  # package.  These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@
  
 diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile
 --- openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile	2009-07-14 17:47:13.000000000 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile	2009-10-07 15:38:47.675617951 +0100
 @@ -0,0 +1,38 @@
 +#
 +# Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -53,8 +53,8 @@
 +#
 +include $(BUILDDIR)/common/Classes.gmk
 diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
---- openjdk-boot.orig/corba/make/common/Defs.gmk	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs.gmk	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/corba/make/common/Defs.gmk	2009-10-05 02:23:42.789274774 +0100
++++ openjdk-boot/corba/make/common/Defs.gmk	2009-10-07 15:38:47.675617951 +0100
 @@ -53,6 +53,13 @@
  
  _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -88,8 +88,8 @@
  vpath %.java $(VPATH.java)
  vpath %.class $(CLASSBINDIR)
 diff -Nru openjdk-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
---- openjdk-boot.orig/corba/make/common/Defs-linux.gmk	2009-07-14 17:37:18.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs-linux.gmk	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/corba/make/common/Defs-linux.gmk	2009-10-07 15:24:05.904817673 +0100
++++ openjdk-boot/corba/make/common/Defs-linux.gmk	2009-10-07 15:38:47.676817980 +0100
 @@ -276,7 +276,7 @@
  		    fi; \
  		  done)
@@ -100,25 +100,24 @@
  #
  # We want to privatize JVM symbols on Solaris. This is so the user can
 diff -Nru openjdk-boot.orig/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
---- openjdk-boot.orig/corba/make/common/Rules.gmk	2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-boot/corba/make/common/Rules.gmk	2009-07-14 17:47:13.000000000 +0100
-@@ -201,8 +201,10 @@
- 	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
+--- openjdk-boot.orig/corba/make/common/Rules.gmk	2009-10-05 02:23:42.791274645 +0100
++++ openjdk-boot/corba/make/common/Rules.gmk	2009-10-07 16:12:31.682568618 +0100
+@@ -187,7 +187,10 @@
+ 	@$(MKDIR) -p $(CLASSDESTDIR)
+ 	if [ -s $(JAVA_SOURCE_LIST) ] ; then \
  	  $(CAT) $(JAVA_SOURCE_LIST); \
- 	  $(ECHO) "# Running javac:"; \
--	  $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
 -	  $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	  $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ABS_OUTPUTDIR)/corba/classes \
-+		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	  $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ABS_OUTPUTDIR)/corba/classes \
-+		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++ 	  $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ABS_OUTPUTDIR)/corba/classes \
++ 		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++ 	  $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ABS_OUTPUTDIR)/corba/classes \
++ 		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
  	fi
  	@$(java-vm-cleanup)
  
 diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk	2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk	2009-07-14 17:47:13.000000000 +0100
-@@ -120,31 +120,14 @@
+--- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk	2009-10-05 02:23:42.794274731 +0100
++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk	2009-10-07 15:38:47.679816586 +0100
+@@ -135,31 +135,14 @@
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
  # Needed for javah
@@ -157,8 +156,8 @@
  # Override of what javac to use (see deploy workspace)
  ifdef JAVAC
 diff -Nru openjdk-boot.orig/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile
---- openjdk-boot.orig/corba/make/org/omg/sources/Makefile	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/org/omg/sources/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/corba/make/org/omg/sources/Makefile	2009-10-05 02:23:42.806274729 +0100
++++ openjdk-boot/corba/make/org/omg/sources/Makefile	2009-10-07 15:38:47.680818473 +0100
 @@ -93,8 +93,6 @@
  POAHELHOLFILES =    $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
  
@@ -236,8 +235,8 @@
  pi.compile: $(PIGENERATEDFILES)
  
 diff -Nru openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile	2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile	2009-10-05 02:23:42.812274414 +0100
++++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile	2009-10-07 15:38:47.681818474 +0100
 @@ -172,7 +172,6 @@
  ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
  
@@ -254,95 +253,57 @@
  
  portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
  
-diff -Nru openjdk-boot.orig/jaxp/make/build.xml openjdk-boot/jaxp/make/build.xml
---- openjdk-boot.orig/jaxp/make/build.xml	2009-06-30 14:24:48.000000000 +0100
-+++ openjdk-boot/jaxp/make/build.xml	2009-07-14 17:47:13.000000000 +0100
-@@ -71,7 +71,10 @@
-       <mkdir dir="${build.toolclasses.dir}"/>
-       <javac srcdir="${make.tools.dir}/StripProperties"
- 		destdir="${build.toolclasses.dir}/"
--		classpath="${ant.home}/lib/ant.jar"/>
-+		classpath="${ant.home}/lib/ant.jar"
-+		fork="true"
-+		executable="${javac.executable}"
-+		source="1.5"/>
-       <taskdef name="pstrip"
- 		 classname="StripPropertiesTask"
- 		 classpath="${build.toolclasses.dir}/"/>
-@@ -87,7 +90,8 @@
+diff -Nru openjdk-boot.orig/jaxp/build.xml openjdk-boot/jaxp/build.xml
+--- openjdk-boot.orig/jaxp/build.xml	2009-10-05 02:24:21.770015267 +0100
++++ openjdk-boot/jaxp/build.xml	2009-10-07 16:39:42.444567810 +0100
+@@ -112,7 +112,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
- 	     source="${javac.source}"
+              source="${javac.source}"
+ 	     debug="${javac.debug}"
+-             target="${javac.target}">
++             target="${javac.target}"
++	     executable="${javac.executable}">
+             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
+             <src refid="src.dir.id"/>
+diff -Nru openjdk-boot.orig/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
+--- openjdk-boot.orig/jaxp/make/Makefile	2009-10-07 15:24:04.171575396 +0100
++++ openjdk-boot/jaxp/make/Makefile	2009-10-07 15:43:16.588568762 +0100
+@@ -106,6 +106,7 @@
+ ifdef ALT_LANGTOOLS_DIST
+   ifdef ALT_BOOTDIR
+     ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++    ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+   endif
+   ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
+ else
+diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
+--- openjdk-boot.orig/jaxws/build.xml	2009-10-05 02:24:35.787025014 +0100
++++ openjdk-boot/jaxws/build.xml	2009-10-07 15:46:46.606568793 +0100
+@@ -112,7 +112,8 @@
+              memoryMaximumSize="${javac.memoryMaximumSize}"
+              source="${javac.source}"
  	     debug="${javac.debug}"
 -             target="${javac.target}">
 +             target="${javac.target}"
 +             executable="${javac.executable}">
-          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
-          <compilerarg line="${javac.version.opt}"/>
-       </javac>
-diff -Nru openjdk-boot.orig/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
---- openjdk-boot.orig/jaxp/make/Makefile	2009-07-14 17:37:17.000000000 +0100
-+++ openjdk-boot/jaxp/make/Makefile	2009-07-14 17:47:13.000000000 +0100
-@@ -92,7 +92,7 @@
- endif 
- 
- ifdef ALT_BOOTDIR
--  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+  ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
- endif
- 
- ifdef ALT_OUTPUTDIR
-diff -Nru openjdk-boot.orig/jaxws/make/build.properties openjdk-boot/jaxws/make/build.properties
---- openjdk-boot.orig/jaxws/make/build.properties	2009-07-14 17:37:18.000000000 +0100
-+++ openjdk-boot/jaxws/make/build.properties	2009-07-14 17:47:13.000000000 +0100
-@@ -37,7 +37,7 @@
- # set the following to -version to verify the versions of javac being used
- javac.version.opt = 
- # in time, there should be no exceptions to -Xlint:all
--javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
-+javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
- 
- # JVM memory size
- javac.memoryInitialSize = 128m
-diff -Nru openjdk-boot.orig/jaxws/make/build.xml openjdk-boot/jaxws/make/build.xml
---- openjdk-boot.orig/jaxws/make/build.xml	2009-06-30 14:24:56.000000000 +0100
-+++ openjdk-boot/jaxws/make/build.xml	2009-07-14 17:47:13.000000000 +0100
-@@ -93,7 +93,10 @@
-       <mkdir dir="${build.toolclasses.dir}"/>
-       <javac srcdir="${make.tools.dir}/StripProperties"
- 		destdir="${build.toolclasses.dir}/"
--		classpath="${ant.home}/lib/ant.jar"/>
-+		fork="true"
-+                executable="${javac.executable}"
-+		classpath="${ant.home}/lib/ant.jar"
-+		source="1.5"/>
-       <taskdef name="pstrip"
- 		 classname="StripPropertiesTask"
- 		 classpath="${build.toolclasses.dir}/"/>
-@@ -111,6 +114,7 @@
- 	     debug="${javac.debug}"
-              target="${javac.target}"
-              excludes="com/sun/tools/internal/txw2/**">
-+ 	 <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/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}"/>
+             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
+             <src refid="src.dir.id"/>
 diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
---- openjdk-boot.orig/jaxws/make/Makefile	2009-07-14 17:37:17.000000000 +0100
-+++ openjdk-boot/jaxws/make/Makefile	2009-07-14 17:47:13.000000000 +0100
-@@ -92,8 +92,8 @@
- endif 
- 
- ifdef ALT_BOOTDIR
--  ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
--  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+  ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-+  ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
- endif
- 
- ifdef ALT_OUTPUTDIR
+--- openjdk-boot.orig/jaxws/make/Makefile	2009-10-07 15:24:04.172573022 +0100
++++ openjdk-boot/jaxws/make/Makefile	2009-10-07 15:48:24.010585640 +0100
+@@ -107,6 +107,7 @@
+   ifdef ALT_BOOTDIR
+     ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
+     ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
++    ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+   endif
+   ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
+ else
 diff -Nru openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
---- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/common/BuildToolJar.gmk	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk	2009-10-05 02:26:27.187170082 +0100
++++ openjdk-boot/jdk/make/common/BuildToolJar.gmk	2009-10-07 15:38:47.709568471 +0100
 @@ -43,7 +43,8 @@
  	@$(prep-target)
  	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -354,8 +315,8 @@
  	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
  	    $(BOOT_JAR_JFLAGS) || $(RM) $@
 diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk	2009-07-14 17:37:19.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Release.gmk	2009-07-14 17:54:01.000000000 +0100
+--- openjdk-boot.orig/jdk/make/common/Release.gmk	2009-10-07 15:24:07.006566514 +0100
++++ openjdk-boot/jdk/make/common/Release.gmk	2009-10-07 15:38:47.711568544 +0100
 @@ -650,10 +650,21 @@
  RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
  $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
@@ -417,8 +378,8 @@
  	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
  endif # !windows
 diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
---- openjdk-boot.orig/jdk/make/common/Rules.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Rules.gmk	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/common/Rules.gmk	2009-10-05 02:26:27.196170409 +0100
++++ openjdk-boot/jdk/make/common/Rules.gmk	2009-10-07 15:38:47.712568265 +0100
 @@ -237,8 +237,9 @@
  	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
  	  $(CAT) $<.filtered; \
@@ -445,8 +406,8 @@
  	@$(TOUCH) $@
  
 diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk	2009-07-14 17:37:18.000000000 +0100
-+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk	2009-10-07 15:24:05.355571407 +0100
++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2009-10-07 15:38:47.713567987 +0100
 @@ -136,33 +136,22 @@
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
@@ -483,8 +444,8 @@
  
  # Override of what javac to use (see deploy workspace)
 diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
---- openjdk-boot.orig/jdk/make/java/nio/Makefile	2009-07-14 17:37:18.000000000 +0100
-+++ openjdk-boot/jdk/make/java/nio/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/java/nio/Makefile	2009-10-07 15:24:06.305563660 +0100
++++ openjdk-boot/jdk/make/java/nio/Makefile	2009-10-07 15:38:47.713567987 +0100
 @@ -31,7 +31,7 @@
  PACKAGE = java.nio
  LIBRARY = nio
@@ -495,8 +456,8 @@
  
  NIO_SRC = $(SHARE_SRC)/classes/java/nio
 diff -Nru openjdk-boot.orig/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile
---- openjdk-boot.orig/jdk/make/java/text/Makefile	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-boot/jdk/make/java/text/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/java/text/Makefile	2009-10-05 02:26:27.255175614 +0100
++++ openjdk-boot/jdk/make/java/text/Makefile	2009-10-07 15:38:47.714571480 +0100
 @@ -81,8 +81,8 @@
  		-sourcepath $(TEXT_SRCDIR) \
  		$(TEXT_SOURCES)
@@ -509,8 +470,8 @@
  		-spec $(UNICODEDATA)/UnicodeData.txt
  	@$(java-vm-cleanup)
 diff -Nru openjdk-boot.orig/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
---- openjdk-boot.orig/jdk/make/Makefile	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-boot/jdk/make/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/Makefile	2009-10-05 02:26:27.150170023 +0100
++++ openjdk-boot/jdk/make/Makefile	2009-10-07 15:38:47.714571480 +0100
 @@ -239,7 +239,7 @@
  
  all build:: sanity-all post-sanity-all
@@ -521,8 +482,8 @@
  	$(SUBDIRS-loop)
  
 diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk	2009-10-05 02:26:27.369170078 +0100
++++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk	2009-10-07 15:38:47.714571480 +0100
 @@ -189,3 +189,5 @@
  	java/awt/dnd/DnDConstants.java \
  	sun/awt/CausedFocusEvent.java
@@ -530,8 +491,8 @@
 +EXPORTED_inner = \
 +    sun.java2d.opengl.OGLContext$$OGLContextCaps
 diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
---- openjdk-boot.orig/jdk/make/sun/awt/Makefile	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/awt/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/sun/awt/Makefile	2009-10-05 02:26:27.370170084 +0100
++++ openjdk-boot/jdk/make/sun/awt/Makefile	2009-10-07 15:38:47.715565824 +0100
 @@ -401,10 +401,9 @@
  COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
  
@@ -547,8 +508,8 @@
  
  fontconfigs.clean :
 diff -Nru openjdk-boot.orig/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
---- openjdk-boot.orig/jdk/make/sun/javazic/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/javazic/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/sun/javazic/Makefile	2009-10-05 02:26:27.397170089 +0100
++++ openjdk-boot/jdk/make/sun/javazic/Makefile	2009-10-07 15:38:47.715565824 +0100
 @@ -62,7 +62,8 @@
  $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
  	$(RM) -r $(@D)
@@ -560,8 +521,8 @@
  
  $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
 diff -Nru openjdk-boot.orig/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
---- openjdk-boot.orig/jdk/make/sun/text/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/text/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/sun/text/Makefile	2009-10-05 02:26:27.461169942 +0100
++++ openjdk-boot/jdk/make/sun/text/Makefile	2009-10-07 15:38:47.715565824 +0100
 @@ -85,8 +85,9 @@
  	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
  		-sourcepath $(TEXT_SRCDIR) \
@@ -575,8 +536,8 @@
  		-spec $(UNICODEDATA)/UnicodeData.txt \
  		-language th
 diff -Nru openjdk-boot.orig/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
---- openjdk-boot.orig/jdk/make/sun/xawt/Makefile	2009-07-14 17:37:19.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/xawt/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/sun/xawt/Makefile	2009-10-07 15:24:07.253598085 +0100
++++ openjdk-boot/jdk/make/sun/xawt/Makefile	2009-10-07 15:38:47.716565825 +0100
 @@ -294,11 +294,7 @@
  
  TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -614,8 +575,8 @@
  	done
  	$(TOUCH) $@
 diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-07-14 17:36:40.000000000 +0100
-+++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-07 15:23:51.404565029 +0100
++++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-07 15:38:47.717563312 +0100
 @@ -647,9 +647,6 @@
              throws FileNotFoundException, IOException {
          BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -635,8 +596,8 @@
                  if (plane == 0 && bLatin1 == false) {
              genCaseMapTableDeclaration(result);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java	2009-07-14 17:36:32.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java	2009-10-07 15:23:17.171575470 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java	2009-10-07 15:38:47.717563312 +0100
 @@ -76,7 +76,7 @@
       * {@code 0x1.fffffffffffffP+1023} and also equal to
       * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -665,8 +626,8 @@
      /**
       * Maximum exponent a finite {@code double} variable may have.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java	2009-07-14 17:36:32.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java	2009-10-07 15:23:17.217575862 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java	2009-10-07 15:38:47.718563663 +0100
 @@ -76,7 +76,7 @@
       * {@code 0x1.fffffeP+127f} and also equal to
       * {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -695,8 +656,8 @@
      /**
       * Maximum exponent a finite {@code float} variable may have.  It
 diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
---- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-10-05 02:26:33.493169843 +0100
++++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-10-07 15:38:47.718563663 +0100
 @@ -27,6 +27,7 @@
  #define OGLContext_h_Included
  
@@ -762,9 +723,9 @@
  /**
   * Evaluates to true if the given capability bitmask is present for the
 diff -Nru openjdk-boot.orig/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
---- openjdk-boot.orig/langtools/make/build.xml	2009-06-30 14:25:18.000000000 +0100
-+++ openjdk-boot/langtools/make/build.xml	2009-07-14 17:47:13.000000000 +0100
-@@ -516,6 +516,7 @@
+--- openjdk-boot.orig/langtools/make/build.xml	2009-10-05 02:26:48.779920205 +0100
++++ openjdk-boot/langtools/make/build.xml	2009-10-07 15:38:47.719564153 +0100
+@@ -524,6 +524,7 @@
                         includeAntRuntime="no"
                         source="@{javac.source}"
                         target="@{javac.target}">
@@ -772,17 +733,17 @@
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg line="${javac.version.opt}"/>
                      <compilerarg line="-Xlint"/>
-@@ -532,6 +533,7 @@
+@@ -540,6 +541,7 @@
                         target="@{javac.target}"
-                        debug="${javac.debug}" 
+                        debug="${javac.debug}"
                         debuglevel="${javac.debuglevel}">
 +		    <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/>
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
                      <compilerarg line="${javac.no.jdk.warnings}"/>
 diff -Nru openjdk-boot.orig/langtools/make/Makefile openjdk-boot/langtools/make/Makefile
---- openjdk-boot.orig/langtools/make/Makefile	2009-07-14 17:37:17.000000000 +0100
-+++ openjdk-boot/langtools/make/Makefile	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/langtools/make/Makefile	2009-10-07 15:24:04.172573022 +0100
++++ openjdk-boot/langtools/make/Makefile	2009-10-07 15:38:47.719564153 +0100
 @@ -130,7 +130,7 @@
  
  ifdef ALT_BOOTDIR
@@ -793,8 +754,8 @@
  
  ifdef ALT_OUTPUTDIR
 diff -Nru openjdk-boot.orig/make/jdk-rules.gmk openjdk-boot/make/jdk-rules.gmk
---- openjdk-boot.orig/make/jdk-rules.gmk	2009-07-14 17:37:18.000000000 +0100
-+++ openjdk-boot/make/jdk-rules.gmk	2009-07-14 17:47:13.000000000 +0100
+--- openjdk-boot.orig/make/jdk-rules.gmk	2009-10-07 15:24:05.158577449 +0100
++++ openjdk-boot/make/jdk-rules.gmk	2009-10-07 15:38:47.719564153 +0100
 @@ -58,7 +58,7 @@
  endif
  
--- a/patches/icedtea-alpha-fixes.patch	Thu Oct 08 13:19:08 2009 +0200
+++ b/patches/icedtea-alpha-fixes.patch	Wed Oct 14 02:18:26 2009 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk	2009-04-15 15:39:27.000000000 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk	2009-04-15 16:07:19.000000000 +0100
+--- openjdk.orig/corba/make/common/Defs-linux.gmk	2009-10-05 14:09:53.391582691 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk	2009-10-06 09:39:43.273589275 +0100
 @@ -176,7 +176,8 @@
    CXXFLAGS_DBG	+= $(CC_LOWER_OPT)
  endif
@@ -12,8 +12,8 @@
  
  ifeq ($(ARCH_DATA_MODEL), 64)
 diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile
---- openjdk.orig/hotspot/agent/src/os/linux/Makefile	2009-04-15 15:39:27.000000000 +0100
-+++ openjdk/hotspot/agent/src/os/linux/Makefile	2009-04-15 16:07:19.000000000 +0100
+--- openjdk.orig/hotspot/agent/src/os/linux/Makefile	2009-10-05 14:09:52.722332564 +0100
++++ openjdk/hotspot/agent/src/os/linux/Makefile	2009-10-06 09:39:43.274588369 +0100
 @@ -40,7 +40,7 @@
  
  LIBS     = -lthread_db
@@ -23,7 +23,7 @@
  
  LIBSA = $(ARCH)/libsaproc.so
  
-@@ -65,7 +65,7 @@
+@@ -73,7 +73,7 @@
  	$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
  
  test.o: test.c
@@ -33,9 +33,9 @@
  test: test.o
  	$(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
 diff -Nru openjdk.orig/hotspot/src/share/vm/oops/generateOopMap.cpp openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp
---- openjdk.orig/hotspot/src/share/vm/oops/generateOopMap.cpp	2009-04-14 15:55:46.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp	2009-04-15 16:07:19.000000000 +0100
-@@ -2113,7 +2113,7 @@
+--- openjdk.orig/hotspot/src/share/vm/oops/generateOopMap.cpp	2009-10-05 02:24:10.384274774 +0100
++++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp	2009-10-06 09:39:43.276589489 +0100
+@@ -2117,7 +2117,7 @@
    // We do not distinguish between different types of errors for verification
    // errors.  Let the verifier give a better message.
    const char *msg = "Illegal class file encountered. Try running with -Xverify:all";
@@ -44,32 +44,10 @@
  }
  
  //
-diff -Nru openjdk.orig/jaxp/make/build.properties openjdk/jaxp/make/build.properties
---- openjdk.orig/jaxp/make/build.properties	2009-03-20 11:55:58.000000000 +0000
-+++ openjdk/jaxp/make/build.properties	2009-04-15 16:07:19.000000000 +0100
-@@ -41,6 +41,6 @@
- 
- # JVM memory size
- javac.memoryInitialSize = 128m
--javac.memoryMaximumSize = 256m
-+javac.memoryMaximumSize = 512m
- 
- #------------------------------------------------------------
-diff -Nru openjdk.orig/jaxws/make/build.properties openjdk/jaxws/make/build.properties
---- openjdk.orig/jaxws/make/build.properties	2009-03-20 11:56:07.000000000 +0000
-+++ openjdk/jaxws/make/build.properties	2009-04-15 16:07:19.000000000 +0100
-@@ -41,6 +41,6 @@
- 
- # JVM memory size
- javac.memoryInitialSize = 128m
--javac.memoryMaximumSize = 256m
-+javac.memoryMaximumSize = 512m
- 
- #------------------------------------------------------------
 diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk	2009-04-15 15:39:27.000000000 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk	2009-04-15 16:07:19.000000000 +0100
-@@ -186,7 +186,8 @@
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk	2009-10-05 14:09:53.392583324 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk	2009-10-06 09:39:50.428589918 +0100
+@@ -194,7 +194,8 @@
    CXXFLAGS_DBG	+= $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
  endif
  
--- a/patches/icedtea-ant.patch	Thu Oct 08 13:19:08 2009 +0200
+++ b/patches/icedtea-ant.patch	Wed Oct 14 02:18:26 2009 +0100
@@ -1,8 +1,8 @@
 diff -Nru openjdk.orig/jaxp/make/Makefile openjdk/jaxp/make/Makefile
---- openjdk.orig/jaxp/make/Makefile	2008-09-25 08:40:52.000000000 +0100
-+++ openjdk/jaxp/make/Makefile	2008-09-26 20:58:44.000000000 +0100
-@@ -99,16 +99,9 @@
-   ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
+--- openjdk.orig/jaxp/make/Makefile	2009-10-05 02:24:21.771014575 +0100
++++ openjdk/jaxp/make/Makefile	2009-10-05 14:04:27.684616225 +0100
+@@ -114,16 +114,9 @@
+   endif
  endif
  
 -ifdef ANT_HOME
@@ -22,18 +22,18 @@
  
  # Default target and expected 'do everything' target
 diff -Nru openjdk.orig/jaxws/make/Makefile openjdk/jaxws/make/Makefile
---- openjdk.orig/jaxws/make/Makefile	2008-09-25 08:41:11.000000000 +0100
-+++ openjdk/jaxws/make/Makefile	2008-09-26 20:58:44.000000000 +0100
-@@ -80,6 +80,7 @@
- endif
- 
- ifdef ALT_BOOTDIR
-+  ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
-   ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
- endif
- 
-@@ -99,16 +100,9 @@
-   ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
+--- openjdk.orig/jaxws/make/Makefile	2009-10-05 02:24:35.788024740 +0100
++++ openjdk/jaxws/make/Makefile	2009-10-05 14:05:23.450332848 +0100
+@@ -106,6 +106,7 @@
+ ifdef ALT_LANGTOOLS_DIST
+   ifdef ALT_BOOTDIR
+     ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++    ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
+   endif
+   ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
+ else
+@@ -114,16 +115,9 @@
+   endif
  endif
  
 -ifdef ANT_HOME
@@ -53,9 +53,9 @@
  
  # Default target and expected 'do everything' target
 diff -Nru openjdk.orig/langtools/make/Makefile openjdk/langtools/make/Makefile
---- openjdk.orig/langtools/make/Makefile	2008-09-25 08:45:02.000000000 +0100
-+++ openjdk/langtools/make/Makefile	2008-09-26 20:58:44.000000000 +0100
-@@ -133,16 +133,9 @@
+--- openjdk.orig/langtools/make/Makefile	2009-10-05 02:26:48.776920119 +0100
++++ openjdk/langtools/make/Makefile	2009-10-05 14:04:27.687617845 +0100
+@@ -150,16 +150,9 @@
    ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
  endif