Mercurial > hg > openjdk > jigsaw > corba
changeset 362:c4afff3939d8
Merge
author | asaha |
---|---|
date | Tue, 14 Feb 2012 10:21:54 -0800 |
parents | 66c7161ee588 (current diff) 31d70911b712 (diff) |
children | 695408e22b29 |
files | |
diffstat | 2 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Nov 17 10:51:17 2011 -0800 +++ b/.hgtags Tue Feb 14 10:21:54 2012 -0800 @@ -122,3 +122,14 @@ 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +949fb60ca830364571e7c4c9964e6b351ca929ec jdk8-b01 +ed8d94519a87b4adac270c3eec9134ff1f62bff5 jdk8-b02 +cd0da00694fbce642db9be936d3e4909a71d911d jdk8-b03 +60a68d688e24473cf84dedd1e60901a61ab82555 jdk8-b04 +cc1b599b986a37cb57de4584c5e58169766ca535 jdk8-b05 +45c43dde7ba7f176333a51a98f086275478836fa jdk8-b06 +3d61f0856f349e2163bf98146465dab3b7437f63 jdk8-b07 +0d52b1c87aa8fdea7fdc9c4126ea58f95ca6b351 jdk8-b08 +a891732c1a83082177ff7a4cf1506068d9cc0a47 jdk8-b09 +cda87f7fefcee3b89742a57ce5ad9b03a54c210d jdk8-b10 +0199e4fef5cc2bd234c65b93220459ef7a3bb3b1 jdk8-b11
--- a/make/jprt.properties Thu Nov 17 10:51:17 2011 -0800 +++ b/make/jprt.properties Tue Feb 14 10:21:54 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