Mercurial > hg > openjdk > jigsaw > jaxws
changeset 63:2ec98e99e4ea
Merge
author | tbell |
---|---|
date | Thu, 11 Jun 2009 21:30:49 -0700 |
parents | aeabf802f2a1 (current diff) 605e1cdeba48 (diff) |
children | 75c801c13ea1 |
files | make/Makefile make/build.properties make/build.xml |
diffstat | 3 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Thu Jun 11 10:54:15 2009 -0700 +++ b/make/Makefile Thu Jun 11 21:30:49 2009 -0700 @@ -83,6 +83,14 @@ 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) endif
--- a/make/build.properties Thu Jun 11 10:54:15 2009 -0700 +++ b/make/build.properties Thu Jun 11 21:30:49 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:15 2009 -0700 +++ b/make/build.xml Thu Jun 11 21:30:49 2009 -0700 @@ -107,6 +107,7 @@ destdir="${build.classes.dir}" memoryInitialSize="${javac.memoryInitialSize}" memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" debug="${javac.debug}" target="${javac.target}" excludes="com/sun/tools/internal/txw2/**">