changeset 80:62811c1f87ce

. Merge in changes from main OpenJDK repository.
author glewis@misty.eyesbeyond.com
date Sun, 28 Jun 2009 18:35:29 -0700
parents 69389522839a b8a6e883c0a6
children 8fea38c00922
files
diffstat 4 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Jun 07 03:35:49 2009 -0700
+++ b/.hgtags	Sun Jun 28 18:35:29 2009 -0700
@@ -34,3 +34,6 @@
 68257a5eb19afc11aee7eb19f7250f9b9eec7c05 jdk7-b57
 5fb4fbea81c3609916da00417fdd15dbd9e39e97 jdk7-b58
 f64566bf4c2bc92e65ab2b9fab51b119f0d493d1 jdk7-b59
+3b054db3e277ca224fe6576c59ed6f4ab5ed0bb5 jdk7-b60
+aeabf802f2a1ca72b87d7397c5ece58058e000a9 jdk7-b61
+75c801c13ea1ddebc58b1a8c8da9318d72750e62 jdk7-b62
--- a/make/Makefile	Sun Jun 07 03:35:49 2009 -0700
+++ b/make/Makefile	Sun Jun 28 18:35:29 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
--- a/make/build.properties	Sun Jun 07 03:35:49 2009 -0700
+++ b/make/build.properties	Sun Jun 28 18:35:29 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:49 2009 -0700
+++ b/make/build.xml	Sun Jun 28 18:35:29 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/**">