Mercurial > hg > icedtea9-forest > jaxp
changeset 60:97344798aaf7
Merge
| author | tbell |
|---|---|
| date | Thu, 11 Jun 2009 21:26:25 -0700 |
| parents | f1ac756616ea (current diff) bdaf6acaf6e3 (diff) |
| children | a97dd57a6260 1687f5192ce7 |
| files | make/Makefile make/build.properties make/build.xml |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Thu Jun 11 10:54:14 2009 -0700 +++ b/make/Makefile Thu Jun 11 21:26:25 2009 -0700 @@ -81,7 +81,15 @@ ifdef JAVAC_TARGET_ARG ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG) endif -endif +endif + +ifdef SOURCE_LANGUAGE_VERSION + ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION) +else + ifdef JAVAC_SOURCE_ARG + ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG) + endif +endif ifdef ALT_BOOTDIR ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
--- a/make/build.properties Thu Jun 11 10:54:14 2009 -0700 +++ b/make/build.properties Thu Jun 11 21:26:25 2009 -0700 @@ -30,6 +30,7 @@ # one of the standard user build.properties files (see build.xml) # options for the <javac> tasks used to compile the tools +javac.source = 5 javac.target = 5 javac.debug = true javac.no.jdk.warnings = -XDignore.symbol.file=true
--- a/make/build.xml Thu Jun 11 10:54:14 2009 -0700 +++ b/make/build.xml Thu Jun 11 21:26:25 2009 -0700 @@ -85,6 +85,7 @@ destdir="${build.classes.dir}" memoryInitialSize="${javac.memoryInitialSize}" memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" debug="${javac.debug}" target="${javac.target}"> <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>