Mercurial > hg > release > icedtea7-forest-2.2 > langtools
changeset 1183:a22181f71ac3
Merge
author | michaelm |
---|---|
date | Mon, 16 Jan 2012 14:26:52 +0000 |
parents | f05c7e7ceea6 (diff) 13ee9a9a3abb (current diff) |
children | 05bb743c223d |
files | |
diffstat | 2 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jan 12 08:06:50 2012 -0800 +++ b/.hgtags Mon Jan 16 14:26:52 2012 +0000 @@ -141,6 +141,8 @@ f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21 +8851e7f3721f8f756cc9f5731600a152506542db jdk7u4-b200 358c42289352a2288084039e7c9d3f134c9c29e9 jdk7u4-b04 8556ecc20a5b32ae7f336ecf3c420d7feb88d323 jdk7u4-b02 62ee502a464924d68d398899570c1ad27fbe6cc4 jdk7u4-b05 +c864786394dc3d78c1d155d8cd62faf3385a7bc0 jdk7u4-b225
--- a/make/jprt.properties Thu Jan 12 08:06:50 2012 -0800 +++ b/make/jprt.properties Mon Jan 16 14:26:52 2012 +0000 @@ -25,12 +25,24 @@ # Properties for jprt -# Use whatever release that the submitted job requests -jprt.tools.default.release=${jprt.submit.release} +# Locked down to jdk7 +jprt.tools.default.release=jdk7 # 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}, \ + macosx_x64_10.7-{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