/hg/icedtea: Explicitly set the path to the javac executable.

[andrew at icedtea.classpath.org]

changeset 4ba5f5be5a37 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4ba5f5be5a37
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Dec 14 23:42:58 2009 +0000

	Explicitly set the path to the javac executable.

	2009-12-14 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add Ant patch to explicitly set the
	javac executable.
		* patches/boot/ant-javac.patch: New patch (revised from old
	boot/icedtea.patch version).
		* HACKING: Updated.


diffstat:

4 files changed, 39 insertions(+), 1 deletion(-)
ChangeLog                    |   10 ++++++++++
HACKING                      |    1 +
Makefile.am                  |    3 ++-
patches/boot/ant-javac.patch |   26 ++++++++++++++++++++++++++

diffs (71 lines):

diff -r c431444e42b9 -r 4ba5f5be5a37 ChangeLog
--- a/ChangeLog	Mon Dec 14 16:00:31 2009 -0500
+++ b/ChangeLog	Mon Dec 14 23:42:58 2009 +0000
@@ -1,3 +1,13 @@ 2009-12-14  Man Lung Wong  <mwong at redhat
+2009-12-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add Ant patch to explicitly set the
+	javac executable.
+	* patches/boot/ant-javac.patch:
+	New patch (revised from old boot/icedtea.patch
+	version).
+	* HACKING: Updated.
+	
 2009-12-14  Man Lung Wong  <mwong at redhat.com>
 
 	* netx/net/sourceforge/jnlp/Launcher.java
diff -r c431444e42b9 -r 4ba5f5be5a37 HACKING
--- a/HACKING	Mon Dec 14 16:00:31 2009 -0500
+++ b/HACKING	Mon Dec 14 23:42:58 2009 +0000
@@ -124,6 +124,7 @@ The following patches are only applied t
 
 The following patches are only applied to the icedtea-boot bootstrap tree in IcedTea7:
 
+* ant-javac.patch: Explicitly set the patch to the javac executable.
 * corba-defs.patch: Add LANGTOOLS_DIST, remove GENSRCDIR, remove PLATFORMSRC from VPATH0.java.
 * corba-idlj.patch: Turn off calls to idlj.
 * corba-libgcj.patch: Link against libgcj instead of libjava.
diff -r c431444e42b9 -r 4ba5f5be5a37 Makefile.am
--- a/Makefile.am	Mon Dec 14 16:00:31 2009 -0500
+++ b/Makefile.am	Mon Dec 14 23:42:58 2009 +0000
@@ -362,7 +362,8 @@ ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHE
 
 # Bootstrapping patches
 
-ICEDTEA_BOOT_PATCHES = patches/boot/corba-defs.patch \
+ICEDTEA_BOOT_PATCHES = patches/boot/ant-javac.patch \
+	patches/boot/corba-defs.patch \
 	patches/boot/corba-idlj.patch \
 	patches/boot/corba-libgcj.patch \
 	patches/boot/corba-no-gen.patch \
diff -r c431444e42b9 -r 4ba5f5be5a37 patches/boot/ant-javac.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/ant-javac.patch	Mon Dec 14 23:42:58 2009 +0000
@@ -0,0 +1,26 @@
+diff -Nru openjdk-boot.orig/jaxp/build.xml openjdk-boot/jaxp/build.xml
+--- openjdk-boot.orig/jaxp/build.xml	2009-12-04 15:29:13.000000000 +0000
++++ openjdk-boot/jaxp/build.xml	2009-12-14 22:57:23.000000000 +0000
+@@ -122,7 +122,8 @@
+              memoryMaximumSize="${javac.memoryMaximumSize}"
+              source="${javac.source}"
+ 	     debug="${javac.debug}"
+-             target="${javac.target}">
++             target="${javac.target}"
++	     executable="${jdk.home}/bin/javac">
+             <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/build.xml openjdk-boot/jaxws/build.xml
+--- openjdk-boot.orig/jaxws/build.xml	2009-12-04 15:35:01.000000000 +0000
++++ openjdk-boot/jaxws/build.xml	2009-12-14 22:57:41.000000000 +0000
+@@ -122,7 +122,8 @@
+              memoryMaximumSize="${javac.memoryMaximumSize}"
+              source="${javac.source}"
+ 	     debug="${javac.debug}"
+-             target="${javac.target}">
++             target="${javac.target}"
++             executable="${jdk.home}/bin/javac">
+             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
+             <src refid="src.dir.id"/>