# HG changeset patch
# User tbell
# Date 1244781049 25200
# Node ID 2ec98e99e4ea9598107228da7890a4f7d8031d71
# Parent  aeabf802f2a1ca72b87d7397c5ece58058e000a9# Parent  605e1cdeba4846bd7352bb3bb0311ff909eea427
Merge

diff -r aeabf802f2a1 -r 2ec98e99e4ea make/Makefile
--- a/make/Makefile	Thu Jun 11 10:54:15 2009 -0700
+++ b/make/Makefile	Thu Jun 11 21:30:49 2009 -0700
@@ -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
diff -r aeabf802f2a1 -r 2ec98e99e4ea make/build.properties
--- a/make/build.properties	Thu Jun 11 10:54:15 2009 -0700
+++ b/make/build.properties	Thu Jun 11 21:30:49 2009 -0700
@@ -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 -r aeabf802f2a1 -r 2ec98e99e4ea make/build.xml
--- a/make/build.xml	Thu Jun 11 10:54:15 2009 -0700
+++ b/make/build.xml	Thu Jun 11 21:30:49 2009 -0700
@@ -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/**">