Thu, 11 Jun 2009 21:30:49 -0700
Merge
make/Makefile | file | annotate | diff | comparison | revisions | |
make/build.properties | file | annotate | diff | comparison | revisions | |
make/build.xml | file | annotate | diff | comparison | revisions |
1.1 --- a/make/Makefile Thu Jun 11 10:54:15 2009 -0700 1.2 +++ b/make/Makefile Thu Jun 11 21:30:49 2009 -0700 1.3 @@ -83,6 +83,14 @@ 1.4 endif 1.5 endif 1.6 1.7 +ifdef SOURCE_LANGUAGE_VERSION 1.8 + ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION) 1.9 +else 1.10 + ifdef JAVAC_SOURCE_ARG 1.11 + ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG) 1.12 + endif 1.13 +endif 1.14 + 1.15 ifdef ALT_BOOTDIR 1.16 ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) 1.17 endif
2.1 --- a/make/build.properties Thu Jun 11 10:54:15 2009 -0700 2.2 +++ b/make/build.properties Thu Jun 11 21:30:49 2009 -0700 2.3 @@ -30,6 +30,7 @@ 2.4 # one of the standard user build.properties files (see build.xml) 2.5 2.6 # options for the <javac> tasks used to compile the tools 2.7 +javac.source = 5 2.8 javac.target = 5 2.9 javac.debug = true 2.10 javac.no.jdk.warnings = -XDignore.symbol.file=true
3.1 --- a/make/build.xml Thu Jun 11 10:54:15 2009 -0700 3.2 +++ b/make/build.xml Thu Jun 11 21:30:49 2009 -0700 3.3 @@ -107,6 +107,7 @@ 3.4 destdir="${build.classes.dir}" 3.5 memoryInitialSize="${javac.memoryInitialSize}" 3.6 memoryMaximumSize="${javac.memoryMaximumSize}" 3.7 + source="${javac.source}" 3.8 debug="${javac.debug}" 3.9 target="${javac.target}" 3.10 excludes="com/sun/tools/internal/txw2/**">