Mercurial > hg > release > icedtea7-forest-2.2 > jaxp
changeset 352:013b8473c684
Merge
author | michaelm |
---|---|
date | Wed, 01 Feb 2012 11:35:53 -0800 |
parents | 4a61ac055189 (current diff) 3d9734845366 (diff) |
children | 723995d0ef7f |
files | |
diffstat | 2 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jan 31 20:20:58 2012 -0800 +++ b/.hgtags Wed Feb 01 11:35:53 2012 -0800 @@ -141,8 +141,11 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +98759b436636acf39d07cbc206737fcd831efab0 jdk7u4-b200 26f5422f16af5f4a64157e90b61402ae979e6ffd jdk7u4-b04 c09b58cfa2c61a945614886b82fd284389785770 jdk7u4-b02 f98a23328572f0c586640af1a171d2ccbdfed046 jdk7u4-b05 4ec17260df0f5447c01c57fbc184d97f1e71a029 jdk7u4-b06 +a7da5cf6decbc391fe598d7eae89535e90866c01 jdk7u4-b225 4b20a76b4f0f0bf3d43b065e50570d2cc6676610 jdk7u4-b07 +d3b2c77daf2cdb0aa1c50d93e49317727e2eae95 jdk7u4-b227
--- a/make/jprt.properties Tue Jan 31 20:20:58 2012 -0800 +++ b/make/jprt.properties Wed Feb 01 11:35:53 2012 -0800 @@ -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