Mercurial > hg > release > icedtea7-forest-2.2 > jaxp

changeset 347:a7da5cf6decb jdk7u4-b225

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author michaelm
date Thu, 05 Jan 2012 09:26:52 +0000
parents ced0ff2f2bd3 (diff) 4ec17260df0f (current diff)
children 7ef24eef3d3b
files .hgtags
diffstat 3 files changed, 16 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Dec 21 20:02:59 2011 -0800
+++ b/.hgtags	Thu Jan 05 09:26:52 2012 +0000
@@ -141,6 +141,7 @@
 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
+98759b436636acf39d07cbc206737fcd831efab0 jdk7u4-b200
 26f5422f16af5f4a64157e90b61402ae979e6ffd jdk7u4-b04
 c09b58cfa2c61a945614886b82fd284389785770 jdk7u4-b02
-f98a23328572f0c586640af1a171d2ccbdfed046 jdk7u4-b05
+f98a23328572f0c586640af1a171d2ccbdfed046 jdk7u4-b05
\ No newline at end of file
--- a/build.xml	Wed Dec 21 20:02:59 2011 -0800
+++ b/build.xml	Thu Jan 05 09:26:52 2012 +0000
@@ -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"/>
 
--- a/make/jprt.properties	Wed Dec 21 20:02:59 2011 -0800
+++ b/make/jprt.properties	Thu Jan 05 09:26:52 2012 +0000
@@ -25,12 +25,24 @@
 
 # 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