Mercurial > hg > release > icedtea7-forest-2.2 > jaxp
changeset 345:98759b436636 jdk7u4-b200
Merge
author | michaelm |
---|---|
date | Thu, 15 Dec 2011 12:38:43 -0800 |
parents | 4b70b697ff17 (diff) 26f5422f16af (current diff) |
children | ced0ff2f2bd3 |
files | |
diffstat | 2 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/build.xml Tue Dec 13 17:21:59 2011 -0800 +++ b/build.xml Thu Dec 15 12:38:43 2011 -0800 @@ -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 Tue Dec 13 17:21:59 2011 -0800 +++ b/make/jprt.properties Thu Dec 15 12:38:43 2011 -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