Mercurial > hg > release > icedtea7-forest-2.2 > jaxws
changeset 356:9ae185bd7ff2
Merge
author | andrew |
---|---|
date | Wed, 15 Feb 2012 17:08:44 +0000 |
parents | 9d6ac592aa24 (current diff) 2df5cd83fab9 (diff) |
children | 1854d8e2547c |
files | .hgtags |
diffstat | 3 files changed, 26 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Feb 13 16:33:04 2012 +0000 +++ b/.hgtags Wed Feb 15 17:08:44 2012 +0000 @@ -146,3 +146,14 @@ 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint +33a21a5872623b48391047e25c827d943a325f24 jdk7u4-b200 +8f089c74c3123495ca1337ea19e0234e024e40d6 jdk7u4-b04 +5bc0433f1611b4a810cfe78f4a8ca038cd0d9851 jdk7u4-b02 +a2800128a3ac658fc14df667375b9985db205134 jdk7u4-b05 +961f897b134d01cac6e5da004c2c84c16a4c1a34 jdk7u4-b06 +596322b0a046d115fbf2bbb922e79bf24eac72d6 jdk7u4-b225 +fc2b89be0b07158718d5ec24964018c707904a50 jdk7u4-b07 +e2bb49acbbc28b431fcc59ecd2f85ad33b6ad383 jdk7u4-b08 +2f37da2e5657f10fb4698b371d24476b1aaccf60 jdk7u4-b227 +ae59d2803a45cf35c44588530614b128130dff1a jdk7u4-b09 +3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10
--- a/build.xml Mon Feb 13 16:33:04 2012 +0000 +++ b/build.xml Wed Feb 15 17:08:44 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 Mon Feb 13 16:33:04 2012 +0000 +++ b/make/jprt.properties Wed Feb 15 17:08:44 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