Mercurial > hg > openjdk > icedtea > jdk7 > jaxp
changeset 115:3aeb520849db
Merge
author | andrew |
---|---|
date | Fri, 04 Dec 2009 15:29:13 +0000 |
parents | f137c687c3c2 (current diff) bfadab8c7b1b (diff) |
children | f0f127b93c9e |
files | .hgtags build.properties make/Makefile |
diffstat | 4 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Nov 18 18:07:36 2009 +0000 +++ b/.hgtags Fri Dec 04 15:29:13 2009 +0000 @@ -51,3 +51,4 @@ ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 +233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
--- a/build.properties Wed Nov 18 18:07:36 2009 +0000 +++ b/build.properties Fri Dec 04 15:29:13 2009 +0000 @@ -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/build.xml Wed Nov 18 18:07:36 2009 +0000 +++ b/build.xml Fri Dec 04 15:29:13 2009 +0000 @@ -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/make/Makefile Wed Nov 18 18:07:36 2009 +0000 +++ b/make/Makefile Fri Dec 04 15:29:13 2009 +0000 @@ -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