diff options
| author | jjg <none@none> | 2009-05-20 13:50:44 -0700 |
|---|---|---|
| committer | jjg <none@none> | 2009-05-20 13:50:44 -0700 |
| commit | dc6cabff9c93d511fde70411734163a409d0b9b9 (patch) | |
| tree | 831dc42782b4cce27c7a1cd8e6ab2bb1f0a772d9 /make | |
| parent | a03465a970f145a1005714062dd7c87dd5a3f91d (diff) | |
| download | jdk8u_jaxws-dc6cabff9c93d511fde70411734163a409d0b9b9.tar.gz | |
6827026: Change javac source and target default to 7
Reviewed-by: darcy, ohair
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 8 | ||||
| -rw-r--r-- | make/build.properties | 1 | ||||
| -rw-r--r-- | make/build.xml | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/make/Makefile b/make/Makefile index 3dc17bfa..6ceef886 100644 --- a/make/Makefile +++ b/make/Makefile @@ -79,6 +79,14 @@ else 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 diff --git a/make/build.properties b/make/build.properties index e0225090..2cfd6b57 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 5b83e558..78e1be92 100644 --- a/make/build.xml +++ b/make/build.xml @@ -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"/> |