Mercurial > hg > release > icedtea7-forest-2.2 > jaxws
changeset 350:596322b0a046 jdk7u4-b225
Merge
author | michaelm |
---|---|
date | Thu, 05 Jan 2012 09:26:59 +0000 |
parents | 5922b1989efa (diff) 961f897b134d (current diff) |
children | ad0ae0931945 |
files | .hgtags |
diffstat | 3 files changed, 17 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Dec 21 20:03:01 2011 -0800 +++ b/.hgtags Thu Jan 05 09:26:59 2012 +0000 @@ -141,6 +141,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +33a21a5872623b48391047e25c827d943a325f24 jdk7u4-b200 8f089c74c3123495ca1337ea19e0234e024e40d6 jdk7u4-b04 5bc0433f1611b4a810cfe78f4a8ca038cd0d9851 jdk7u4-b02 -a2800128a3ac658fc14df667375b9985db205134 jdk7u4-b05 +a2800128a3ac658fc14df667375b9985db205134 jdk7u4-b05 \ No newline at end of file
--- a/build.xml Wed Dec 21 20:03:01 2011 -0800 +++ b/build.xml Thu Jan 05 09:26:59 2012 +0000 @@ -43,14 +43,6 @@ Run 'make help' for help using the Makefile. </description> - <!-- Mac is special, need to downgrade these before build.properties. --> - <condition property="javac.source" value="1.5"> - <os family="mac"/> - </condition> - <condition property="javac.target" value="1.5"> - <os family="mac"/> - </condition> - <!-- Project build properties. --> <property file="build.properties"/>
--- a/make/jprt.properties Wed Dec 21 20:03:01 2011 -0800 +++ b/make/jprt.properties Thu Jan 05 09:26:59 2012 +0000 @@ -25,12 +25,25 @@ # 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