changeset 77:071822c49aa8

. Merge in changes from main OpenJDK repository.
author glewis@misty.eyesbeyond.com
date Sun, 28 Jun 2009 18:35:01 -0700
parents eb6ce434761c ae449e9c04c1
children 3e9709375d8e
files
diffstat 4 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Jun 07 03:35:48 2009 -0700
+++ b/.hgtags	Sun Jun 28 18:35:01 2009 -0700
@@ -34,3 +34,6 @@
 e4851e9f7be26fc52a628be06ffa8aaea0919bd7 jdk7-b57
 13bf67d8c6341b841d268985cabaf747f2652bc8 jdk7-b58
 75113d7ce083048e7576b9d0d60a4e80db6b181f jdk7-b59
+259aef5045a155eb6a2f8dd0e2429c6dbe0f652f jdk7-b60
+f1ac756616eaaad795f77f7f5e7f7c7bfdc9c1de jdk7-b61
+a97dd57a62604c35c79bc2fa77a612ed547f6135 jdk7-b62
--- a/make/Makefile	Sun Jun 07 03:35:48 2009 -0700
+++ b/make/Makefile	Sun Jun 28 18:35:01 2009 -0700
@@ -81,7 +81,15 @@
   ifdef JAVAC_TARGET_ARG
     ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
   endif
-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)
--- a/make/build.properties	Sun Jun 07 03:35:48 2009 -0700
+++ b/make/build.properties	Sun Jun 28 18:35:01 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
--- a/make/build.xml	Sun Jun 07 03:35:48 2009 -0700
+++ b/make/build.xml	Sun Jun 28 18:35:01 2009 -0700
@@ -85,6 +85,7 @@
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
              memoryMaximumSize="${javac.memoryMaximumSize}"
+	     source="${javac.source}"
 	     debug="${javac.debug}"
              target="${javac.target}">
          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>