commit f5b83d3d0c08e5aa14ce2bfeea816840b210073e
author tbell <none@none> Sun Jun 21 23:52:12 2009 -0700
committer tbell <none@none> Sun Jun 21 23:52:12 2009 -0700
tree ddfb71a2510e07c80e7dc7f73015396af9528613
parent 5dcdbf2bf3fb02d276783605fa60b5bc2f8fdfbc
parent 4d5c6461c1ca3c39d30dc81cd142f65a2d72b4eb

Merge

make/Makefile

diff --git a/make/Makefile b/make/Makefile
index 19e293b..c366258 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -83,6 +83,14 @@
   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

make/build.properties

diff --git a/make/build.properties b/make/build.properties
index f634f26..ed59810 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

make/build.xml

diff --git a/make/build.xml b/make/build.xml
index e27bca5..24b467a 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/**">