# HG changeset patch
# User jjg
# Date 1242852644 25200
# Node ID 605e1cdeba4846bd7352bb3bb0311ff909eea427
# Parent  4fa7398559d0a1244e929e1a2b57ffc91fbd562c
6827026: Change javac source and target default to 7
Reviewed-by: darcy, ohair

diff -r 4fa7398559d0 -r 605e1cdeba48 make/Makefile
--- a/make/Makefile	Thu May 14 10:58:02 2009 -0700
+++ b/make/Makefile	Wed May 20 13:50:44 2009 -0700
@@ -79,6 +79,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 4fa7398559d0 -r 605e1cdeba48 make/build.properties
--- a/make/build.properties	Thu May 14 10:58:02 2009 -0700
+++ b/make/build.properties	Wed May 20 13:50:44 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.debuglevel = source,lines
diff -r 4fa7398559d0 -r 605e1cdeba48 make/build.xml
--- a/make/build.xml	Thu May 14 10:58:02 2009 -0700
+++ b/make/build.xml	Wed May 20 13:50:44 2009 -0700
@@ -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"/>