Mercurial > hg > icedtea9-forest > jdk
changeset 2832:9a1549d682ce
Merge
author | yhuang |
---|---|
date | Thu, 09 Sep 2010 23:30:59 -0700 |
parents | 448387146bb8 (current diff) 3937dd29f45a (diff) |
children | 4aaac9fb2293 |
files | |
diffstat | 2 files changed, 8 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Sep 09 23:01:43 2010 -0700 +++ b/.hgtags Thu Sep 09 23:30:59 2010 -0700 @@ -82,3 +82,5 @@ 3b0abcb512807bb6f6d27755bc50103211bde6ee jdk7-b105 b91ef6b60f4e19bf4592c6dd594c9bac62487519 jdk7-b106 882103f334bb23745d3fd70fb7928c347478b0f4 jdk7-b107 +17a5d84b75610255a3527e8ede1da19c91ba7a7e jdk7-b108 +ab0d3f54a63f2aadfcdd2e14b81f79362ce454e2 jdk7-b109
--- a/make/jprt.properties Thu Sep 09 23:01:43 2010 -0700 +++ b/make/jprt.properties Thu Sep 09 23:30:59 2010 -0700 @@ -24,32 +24,12 @@ # # Properties for jprt -jprt.tools.default.release=jdk1.7.0 - -# Specific platform list -jprt.build.platforms=\ -solaris_sparc_5.10,\ -solaris_sparcv9_5.10,\ -solaris_i586_5.10,\ -solaris_x64_5.10,\ -linux_i586_2.6,\ -linux_x64_2.6,\ -windows_i586_5.0,\ -windows_x64_5.2 -# The different build flavors we want +# Use whatever release that the submitted job requests +jprt.tools.default.release=${jprt.submit.release} + +# The different build flavors we want, we override here so we just get these 2 jprt.build.flavors=product,fastdebug -jprt.run.flavors=c1,c2 -jprt.solaris_sparcv9.run.flavors=c2 -jprt.solaris_x64.run.flavors=c2 -jprt.windows_x64.run.flavors=c2 -jprt.linux_x64.run.flavors=c2 -jprt.run.flavor.c1.option=-client -jprt.run.flavor.c2.option=-server - -# Explicitly designate what the 32bit match is for the 64bit build -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 # Standard test target for everybody jprt.test.targets=*-*-*-jvm98 @@ -83,6 +63,6 @@ *-product-*-jdk_rmi, \ *-product-*-jdk_swing, \ -# Directories needed to build -jprt.bundle.exclude.src.dirs=build +# Directories to be excluded from the source bundles +jprt.bundle.exclude.src.dirs=build dist webrev