diff options
| author | jjg <none@none> | 2009-05-20 13:45:44 -0700 |
|---|---|---|
| committer | jjg <none@none> | 2009-05-20 13:45:44 -0700 |
| commit | 458c0403e21696a3e06f0dfa6b6431216b3fb41f (patch) | |
| tree | 403bddc5f428158173894340c972c77a88ef1136 /make | |
| parent | 27ece245054fc61debbefb96b4be7b3e031f27f7 (diff) | |
| download | jdk8u_jaxp-458c0403e21696a3e06f0dfa6b6431216b3fb41f.tar.gz | |
6827026: Change javac source and target default to 7
Reviewed-by: darcy, ohair
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 10 | ||||
| -rw-r--r-- | make/build.properties | 1 | ||||
| -rw-r--r-- | make/build.xml | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/make/Makefile b/make/Makefile index e8ea334..e013055 100644 --- a/make/Makefile +++ b/make/Makefile @@ -77,7 +77,15 @@ else 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) diff --git a/make/build.properties b/make/build.properties index e022509..2cfd6b5 100644 --- a/make/build.properties +++ b/make/build.properties @@ -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 diff --git a/make/build.xml b/make/build.xml index 6aeb673..414080e 100644 --- a/make/build.xml +++ b/make/build.xml @@ -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}"/> |