Merge

Tue, 14 Feb 2012 10:22:15 -0800

author
asaha
date
Tue, 14 Feb 2012 10:22:15 -0800
changeset 281
4289a81ba085
parent 250
9e82b46cd4fa
parent 244
e6eed2ff5d5f
child 282
456621c5d797

Merge

     1.1 --- a/.hgtags	Mon Jul 25 11:38:25 2011 -0700
     1.2 +++ b/.hgtags	Tue Feb 14 10:22:15 2012 -0800
     1.3 @@ -122,3 +122,14 @@
     1.4  42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145
     1.5  05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
     1.6  d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
     1.7 +64df57a1edeca74388bd62f0a87d056db981fbdf jdk8-b01
     1.8 +1034127ed402e9d0f1ed1477238ef594e9cc8da6 jdk8-b02
     1.9 +7dcb0307508f408507d878cd7c2048c102b15158 jdk8-b03
    1.10 +3f6f08163331ed75b30a6de1246670ce655645c8 jdk8-b04
    1.11 +7d5d91fddbceb1fc3ae7ff409e732ae4a0391b34 jdk8-b05
    1.12 +acffff22a9465005e8eb206224fae9f2ea4fd469 jdk8-b06
    1.13 +134b0debf7b04fe6e317394b04b8e7a4a0181b1b jdk8-b07
    1.14 +1c9d4f59acf8f71477473c170239b43b2c9dee24 jdk8-b08
    1.15 +70172e57cf29efe271b068987eefb601c2a77780 jdk8-b09
    1.16 +8e7fdc8e3c758644ca6d0fd70bb255e9d2e64cda jdk8-b10
    1.17 +a12ab897a249feb7859a6e6cd84b49411f4c06ac jdk8-b11
     2.1 --- a/make/jprt.properties	Mon Jul 25 11:38:25 2011 -0700
     2.2 +++ b/make/jprt.properties	Tue Feb 14 10:22:15 2012 -0800
     2.3 @@ -25,12 +25,23 @@
     2.4  
     2.5  # Properties for jprt
     2.6  
     2.7 -# Use whatever release that the submitted job requests
     2.8 -jprt.tools.default.release=${jprt.submit.release}
     2.9 +# The release to build
    2.10 +jprt.tools.default.release=jdk8
    2.11  
    2.12  # The different build flavors we want, we override here so we just get these 2
    2.13  jprt.build.flavors=product,fastdebug
    2.14  
    2.15 +# Standard list of jprt build targets for this source tree
    2.16 +jprt.build.targets= 						\
    2.17 +    solaris_sparc_5.10-{product|fastdebug}, 			\
    2.18 +    solaris_sparcv9_5.10-{product|fastdebug}, 			\
    2.19 +    solaris_i586_5.10-{product|fastdebug}, 			\
    2.20 +    solaris_x64_5.10-{product|fastdebug}, 			\
    2.21 +    linux_i586_2.6-{product|fastdebug}, 			\
    2.22 +    linux_x64_2.6-{product|fastdebug}, 				\
    2.23 +    windows_i586_5.1-{product|fastdebug}, 			\
    2.24 +    windows_x64_5.2-{product|fastdebug}
    2.25 +
    2.26  # Directories to be excluded from the source bundles
    2.27  jprt.bundle.exclude.src.dirs=build dist webrev
    2.28  

mercurial