Mercurial > hg > icedtea7-forest-aarch64 > jaxws
changeset 71:605e1cdeba48
6827026: Change javac source and target default to 7
Reviewed-by: darcy, ohair
author | jjg |
---|---|
date | Wed, 20 May 2009 13:50:44 -0700 |
parents | 4fa7398559d0 |
children | 2ec98e99e4ea |
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 May 14 10:58:02 2009 -0700 +++ b/make/Makefile Wed May 20 13:50:44 2009 -0700 @@ -79,6 +79,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 May 14 10:58:02 2009 -0700 +++ b/make/build.properties Wed May 20 13:50:44 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.debuglevel = source,lines
--- a/make/build.xml Thu May 14 10:58:02 2009 -0700 +++ b/make/build.xml Wed May 20 13:50:44 2009 -0700 @@ -107,6 +107,7 @@ destdir="${build.classes.dir}" memoryInitialSize="${javac.memoryInitialSize}" memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" target="${javac.target}" excludes="com/sun/tools/internal/txw2/**"> <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>