Merge

Tue, 14 Feb 2012 10:21:54 -0800

author
asaha
date
Tue, 14 Feb 2012 10:21:54 -0800
changeset 335
c4afff3939d8
parent 334
66c7161ee588
parent 304
31d70911b712
child 336
695408e22b29

Merge

     1.1 --- a/.hgtags	Thu Nov 17 10:51:17 2011 -0800
     1.2 +++ b/.hgtags	Tue Feb 14 10:21:54 2012 -0800
     1.3 @@ -122,3 +122,14 @@
     1.4  77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
     1.5  770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
     1.6  73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
     1.7 +949fb60ca830364571e7c4c9964e6b351ca929ec jdk8-b01
     1.8 +ed8d94519a87b4adac270c3eec9134ff1f62bff5 jdk8-b02
     1.9 +cd0da00694fbce642db9be936d3e4909a71d911d jdk8-b03
    1.10 +60a68d688e24473cf84dedd1e60901a61ab82555 jdk8-b04
    1.11 +cc1b599b986a37cb57de4584c5e58169766ca535 jdk8-b05
    1.12 +45c43dde7ba7f176333a51a98f086275478836fa jdk8-b06
    1.13 +3d61f0856f349e2163bf98146465dab3b7437f63 jdk8-b07
    1.14 +0d52b1c87aa8fdea7fdc9c4126ea58f95ca6b351 jdk8-b08
    1.15 +a891732c1a83082177ff7a4cf1506068d9cc0a47 jdk8-b09
    1.16 +cda87f7fefcee3b89742a57ce5ad9b03a54c210d jdk8-b10
    1.17 +0199e4fef5cc2bd234c65b93220459ef7a3bb3b1 jdk8-b11
     2.1 --- a/make/jprt.properties	Thu Nov 17 10:51:17 2011 -0800
     2.2 +++ b/make/jprt.properties	Tue Feb 14 10:21:54 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