Mercurial > hg > openjdk > aarch64-port > jaxp
changeset 59:bdaf6acaf6e3
6827026: Change javac source and target default to 7
Reviewed-by: darcy, ohair
| author | jjg |
|---|---|
| date | Wed, 20 May 2009 13:45:44 -0700 |
| parents | 748976d69503 |
| children | 97344798aaf7 |
| 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 May 14 10:58:01 2009 -0700 +++ b/make/Makefile Wed May 20 13:45:44 2009 -0700 @@ -77,7 +77,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 May 14 10:58:01 2009 -0700 +++ b/make/build.properties Wed May 20 13:45: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:01 2009 -0700 +++ b/make/build.xml Wed May 20 13:45:44 2009 -0700 @@ -85,6 +85,7 @@ destdir="${build.classes.dir}" memoryInitialSize="${javac.memoryInitialSize}" memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" target="${javac.target}"> <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> <compilerarg line="${javac.version.opt}"/>