# HG changeset patch
# User lana
# Date 1328218293 28800
# Node ID 7063ebab6c9ca5968e4c92fc28259bb111322b45
# Parent  3891fe529057431278394c6341cfabaacd5061f5# Parent  163c1e712d5ed9e8f85c2ee164a174e5bbfd16bf
Merge

diff -r 3891fe529057 -r 7063ebab6c9c .hgtags
--- a/.hgtags	Fri Jan 27 08:49:30 2012 -0800
+++ b/.hgtags	Thu Feb 02 13:31:33 2012 -0800
@@ -141,10 +141,13 @@
 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12
 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13
 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21
+33a21a5872623b48391047e25c827d943a325f24 jdk7u4-b200
 8f089c74c3123495ca1337ea19e0234e024e40d6 jdk7u4-b04
 5bc0433f1611b4a810cfe78f4a8ca038cd0d9851 jdk7u4-b02
 a2800128a3ac658fc14df667375b9985db205134 jdk7u4-b05
 961f897b134d01cac6e5da004c2c84c16a4c1a34 jdk7u4-b06
+596322b0a046d115fbf2bbb922e79bf24eac72d6 jdk7u4-b225
 fc2b89be0b07158718d5ec24964018c707904a50 jdk7u4-b07
 e2bb49acbbc28b431fcc59ecd2f85ad33b6ad383 jdk7u4-b08
+2f37da2e5657f10fb4698b371d24476b1aaccf60 jdk7u4-b227
 ae59d2803a45cf35c44588530614b128130dff1a jdk7u4-b09
diff -r 3891fe529057 -r 7063ebab6c9c build.xml
--- a/build.xml	Fri Jan 27 08:49:30 2012 -0800
+++ b/build.xml	Thu Feb 02 13:31:33 2012 -0800
@@ -43,14 +43,6 @@
       Run 'make help' for help using the Makefile.
     </description>
 
-    <!-- Mac is special, need to downgrade these before build.properties. -->
-    <condition property="javac.source" value="1.5">
-        <os family="mac"/>
-    </condition>
-    <condition property="javac.target" value="1.5">
-        <os family="mac"/>
-    </condition>
-
     <!-- Project build properties. -->
     <property file="build.properties"/>
 
diff -r 3891fe529057 -r 7063ebab6c9c make/jprt.properties
--- a/make/jprt.properties	Fri Jan 27 08:49:30 2012 -0800
+++ b/make/jprt.properties	Thu Feb 02 13:31:33 2012 -0800
@@ -25,12 +25,25 @@
 
 # Properties for jprt
 
-# Use whatever release that the submitted job requests
-jprt.tools.default.release=${jprt.submit.release}
+# Locked down to jdk7
+jprt.tools.default.release=jdk7
 
 # The different build flavors we want, we override here so we just get these 2
 jprt.build.flavors=product,fastdebug
 
+# Standard list of jprt build targets for this source tree
+jprt.build.targets=                                             \
+    solaris_sparc_5.10-{product|fastdebug},                     \
+    solaris_sparcv9_5.10-{product|fastdebug},                   \
+    solaris_i586_5.10-{product|fastdebug},                      \
+    solaris_x64_5.10-{product|fastdebug},                       \
+    linux_i586_2.6-{product|fastdebug},                         \
+    linux_x64_2.6-{product|fastdebug},                          \
+    macosx_x64_10.7-{product|fastdebug},                        \
+    windows_i586_5.1-{product|fastdebug},                       \
+    windows_x64_5.2-{product|fastdebug}
+
+
 # Directories to be excluded from the source bundles
 jprt.bundle.exclude.src.dirs=build dist webrev