OpenJDK / amber / amber
changeset 4294:4b507ae0d54b
6900341: jaxp/jaxws ant scripts using ant runtime in classpath, needs to be explicit
Reviewed-by: tbell
| author | ohair |
|---|---|
| date | Wed, 11 Nov 2009 11:17:51 -0800 |
| parents | 09e0b33177af |
| children | d396d3706e0b |
| files | jaxp/build.properties jaxp/build.xml jaxp/make/Makefile |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jaxp/build.properties Wed Jul 05 17:03:05 2017 +0200 +++ b/jaxp/build.properties Wed Nov 11 11:17:51 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/jaxp/build.xml Wed Jul 05 17:03:05 2017 +0200 +++ b/jaxp/build.xml Wed Nov 11 11:17:51 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}" + fork="true" destdir="${build.classes.dir}" memoryInitialSize="${javac.memoryInitialSize}" memoryMaximumSize="${javac.memoryMaximumSize}"
--- a/jaxp/make/Makefile Wed Jul 05 17:03:05 2017 +0200 +++ b/jaxp/make/Makefile Wed Nov 11 11:17:51 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