changeset 74:9e36a42735f8

Merge.
author andrew
date Tue, 30 Jun 2009 14:25:00 +0100
parents 55ffcbca5f46 75c801c13ea1
children 5b9e8315aab2
files
diffstat 4 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 15 14:57:29 2009 +0100
+++ b/.hgtags	Tue Jun 30 14:25:00 2009 +0100
@@ -35,3 +35,4 @@
 5fb4fbea81c3609916da00417fdd15dbd9e39e97 jdk7-b58
 f64566bf4c2bc92e65ab2b9fab51b119f0d493d1 jdk7-b59
 3b054db3e277ca224fe6576c59ed6f4ab5ed0bb5 jdk7-b60
+aeabf802f2a1ca72b87d7397c5ece58058e000a9 jdk7-b61
--- a/make/Makefile	Mon Jun 15 14:57:29 2009 +0100
+++ b/make/Makefile	Tue Jun 30 14:25:00 2009 +0100
@@ -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	Mon Jun 15 14:57:29 2009 +0100
+++ b/make/build.properties	Tue Jun 30 14:25:00 2009 +0100
@@ -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	Mon Jun 15 14:57:29 2009 +0100
+++ b/make/build.xml	Tue Jun 30 14:25:00 2009 +0100
@@ -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/**">