stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6900341: jaxp/jaxws ant scripts using ant runtime in classpath, needs to be explicit

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Kelly O'Hair 2009-11-11 11:17:51 -08:00
parent d49120d466
commit 59ea6ab4d5
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jaxp/build.properties
View File

@ -34,6 +34,10 @@ drops.dir=${slashjava}/devtools/share/jdk7-drops
# one of the standard user build.properties files (see build.xml) # one of the standard user build.properties files (see build.xml)
javac.jar=${bootstrap.dir}/lib/javac.jar 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 # options for the <javac> tasks used to compile the tools
javac.source = 7 javac.source = 7
javac.target = 7 javac.target = 7

5
jaxp/build.xml
View File

@ -113,7 +113,10 @@
<!-- Build (compilation) of sources to class files. --> <!-- Build (compilation) of sources to class files. -->
<target name="build" <target name="build"
depends="init, -init-src-dirs, -build-prep"> depends="init, -init-src-dirs, -build-prep">
<javac fork="true" <javac
includeAntRuntime="false"
classpath="${build.classes.dir}"
fork="true"
destdir="${build.classes.dir}" destdir="${build.classes.dir}"
memoryInitialSize="${javac.memoryInitialSize}" memoryInitialSize="${javac.memoryInitialSize}"
memoryMaximumSize="${javac.memoryMaximumSize}" memoryMaximumSize="${javac.memoryMaximumSize}"

4
jaxp/make/Makefile
View File

@ -113,11 +113,13 @@ endif
ifdef ALT_LANGTOOLS_DIST ifdef ALT_LANGTOOLS_DIST
ifdef ALT_BOOTDIR ifdef ALT_BOOTDIR
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
endif endif
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
else else
ifdef ALT_JDK_IMPORT_PATH ifdef ALT_JDK_IMPORT_PATH
ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
endif endif
endif endif
@ -141,7 +143,7 @@ ANT_TARGETS = all source drop_included build dist clobber clean sanity
# Create a make target for each # Create a make target for each
$(ANT_TARGETS): $(ANT_TARGETS):
cd .. && $(ANT_JAVA_HOME) $(ANT) -version cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
# Help target # Help target