changeset 280:4289a81ba085

Merge
author asaha
date Tue, 14 Feb 2012 10:22:15 -0800
parents 9e82b46cd4fa e6eed2ff5d5f
children 456621c5d797
files
diffstat 2 files changed, 24 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 25 11:38:25 2011 -0700
+++ b/.hgtags	Tue Feb 14 10:22:15 2012 -0800
@@ -122,3 +122,14 @@
 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145
 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
+64df57a1edeca74388bd62f0a87d056db981fbdf jdk8-b01
+1034127ed402e9d0f1ed1477238ef594e9cc8da6 jdk8-b02
+7dcb0307508f408507d878cd7c2048c102b15158 jdk8-b03
+3f6f08163331ed75b30a6de1246670ce655645c8 jdk8-b04
+7d5d91fddbceb1fc3ae7ff409e732ae4a0391b34 jdk8-b05
+acffff22a9465005e8eb206224fae9f2ea4fd469 jdk8-b06
+134b0debf7b04fe6e317394b04b8e7a4a0181b1b jdk8-b07
+1c9d4f59acf8f71477473c170239b43b2c9dee24 jdk8-b08
+70172e57cf29efe271b068987eefb601c2a77780 jdk8-b09
+8e7fdc8e3c758644ca6d0fd70bb255e9d2e64cda jdk8-b10
+a12ab897a249feb7859a6e6cd84b49411f4c06ac jdk8-b11
--- a/make/jprt.properties	Mon Jul 25 11:38:25 2011 -0700
+++ b/make/jprt.properties	Tue Feb 14 10:22:15 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