6900341: jaxp/jaxws ant scripts using ant runtime in classpath, needs to be explicit
Reviewed-by: tbell
--- a/jaxws/build.properties Wed Jul 05 17:03:05 2017 +0200
+++ b/jaxws/build.properties Wed Nov 11 11:19:10 2009 -0800
@@ -34,6 +34,10 @@
# one of the standard user build.properties files (see build.xml)
javac.jar=${bootstrap.dir}/lib/javac.jar
+# The tools.jar is needed in the classpath to compile these sources
+jdk.home=${java.home}/..
+tools.jar=${jdk.home}/lib/tools.jar
+
# options for the <javac> tasks used to compile the tools
javac.source = 7
javac.target = 7
--- a/jaxws/build.xml Wed Jul 05 17:03:05 2017 +0200
+++ b/jaxws/build.xml Wed Nov 11 11:19:10 2009 -0800
@@ -113,7 +113,10 @@
<!-- Build (compilation) of sources to class files. -->
<target name="build"
depends="init, -init-src-dirs, -build-prep">
- <javac fork="true"
+ <javac
+ includeAntRuntime="false"
+ classpath="${build.classes.dir}:${tools.jar}"
+ fork="true"
destdir="${build.classes.dir}"
memoryInitialSize="${javac.memoryInitialSize}"
memoryMaximumSize="${javac.memoryMaximumSize}"
--- a/jaxws/make/Makefile Wed Jul 05 17:03:05 2017 +0200
+++ b/jaxws/make/Makefile Wed Nov 11 11:19:10 2009 -0800
@@ -113,11 +113,13 @@
ifdef ALT_LANGTOOLS_DIST
ifdef ALT_BOOTDIR
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
+ ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
endif
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
else
ifdef ALT_JDK_IMPORT_PATH
ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
+ ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
endif
endif
@@ -141,7 +143,7 @@
# Create a make target for each
$(ANT_TARGETS):
- cd .. && $(ANT_JAVA_HOME) $(ANT) -version
+ cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
# Help target