diff options
| author | tbell <none@none> | 2009-06-11 21:30:49 -0700 |
|---|---|---|
| committer | tbell <none@none> | 2009-06-11 21:30:49 -0700 |
| commit | 5dcdbf2bf3fb02d276783605fa60b5bc2f8fdfbc (patch) | |
| tree | 501712209099a10117c68fd6c26b5388669776bc /make | |
| parent | fe9a4677c877e8af13cb7eb22c89ea6b8d4830dc (diff) | |
| parent | dc6cabff9c93d511fde70411734163a409d0b9b9 (diff) | |
| download | jdk8u_jaxws-5dcdbf2bf3fb02d276783605fa60b5bc2f8fdfbc.tar.gz | |
Merge
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 19e293b5..c366258d 100644 --- a/make/Makefile +++ b/make/Makefile @@ -83,6 +83,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 f634f268..ed598102 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.no.jdk.warnings = -XDignore.symbol.file=true diff --git a/make/build.xml b/make/build.xml index e27bca54..24b467a6 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}" debug="${javac.debug}" target="${javac.target}" excludes="com/sun/tools/internal/txw2/**"> |