changeset 288:6fc515ab48c3

Merge
author asaha
date Tue, 14 Feb 2012 10:22:06 -0800
parents eca33f89c823 ca977d167697
children a8e76ac83b62
files
diffstat 2 files changed, 24 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 19 11:03:46 2011 -0700
+++ b/.hgtags	Tue Feb 14 10:22:06 2012 -0800
@@ -122,3 +122,14 @@
 10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145
 bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+4f0fcb812767594fe9de509f946b56942db5a2f0 jdk8-b01
+ca4d6ad55a660f0469882e85b4dacf7822d50abf jdk8-b02
+7a74371ce0c64108b857c497ae130dfe9514532c jdk8-b03
+acbcadef0b21582abf406f07f1b74d2b8f80dc01 jdk8-b04
+ff0a3d78e7a22743eabbaa71e9d17b2f094ddf62 jdk8-b05
+d7b8192e7277c49b9c702f4c4fd99bd83ba947ea jdk8-b06
+c114306576dcc1cb871a48058b41bf7d87ce882a jdk8-b07
+de4794dd69c48b08029d158a972993ff9d5627df jdk8-b08
+93554324c014282571aeeb48552ad00d3fedb089 jdk8-b09
+d21a4d5141c04bc9e88f2c0253121d449b66d667 jdk8-b10
+d1b7a4f6dd2065fdeafbcdfd9dcc0072da8c6881 jdk8-b11
--- a/make/jprt.properties	Tue Jul 19 11:03:46 2011 -0700
+++ b/make/jprt.properties	Tue Feb 14 10:22:06 2012 -0800
@@ -25,12 +25,23 @@
 
 # Properties for jprt
 
-# Use whatever release that the submitted job requests
-jprt.tools.default.release=${jprt.submit.release}
+# The release to build
+jprt.tools.default.release=jdk8
 
 # 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}, 				\
+    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