1.1 --- a/make/jprt.properties Thu Aug 26 16:16:39 2010 -0700
1.2 +++ b/make/jprt.properties Tue Sep 07 15:13:58 2010 -0700
1.3 @@ -24,32 +24,12 @@
1.4 #
1.5
1.6 # Properties for jprt
1.7 -jprt.tools.default.release=jdk1.7.0
1.8
1.9 -# Specific platform list
1.10 -jprt.build.platforms= \
1.11 - solaris_sparc_5.10, \
1.12 - solaris_sparcv9_5.10, \
1.13 - solaris_i586_5.10, \
1.14 - solaris_x64_5.10, \
1.15 - linux_i586_2.6, \
1.16 - linux_x64_2.6, \
1.17 - windows_i586_5.0, \
1.18 - windows_x64_5.2
1.19 +# Use whatever release that the submitted job requests
1.20 +jprt.tools.default.release=${jprt.submit.release}
1.21
1.22 -# The different build flavors we want
1.23 +# The different build flavors we want, we override here so we just get these 2
1.24 jprt.build.flavors=product,fastdebug
1.25 -jprt.run.flavors=c1,c2
1.26 -jprt.solaris_sparcv9.run.flavors=c2
1.27 -jprt.solaris_x64.run.flavors=c2
1.28 -jprt.windows_x64.run.flavors=c2
1.29 -jprt.linux_x64.run.flavors=c2
1.30 -jprt.run.flavor.c1.option=-client
1.31 -jprt.run.flavor.c2.option=-server
1.32 -
1.33 -# Explicitly designate what the 32bit match is for the 64bit build
1.34 -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
1.35 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10
1.36
1.37 # Shortened list of vm tests
1.38 jprt.test.targets= \
1.39 @@ -89,6 +69,7 @@
1.40 # *-product-*-jdk_rmi
1.41 # *-product-*-jdk_swing
1.42
1.43 -# Directories to be excluded from source bundles
1.44 +# Directories to be excluded from the source bundles
1.45 jprt.bundle.exclude.src.dirs=build dist webrev
1.46
1.47 +
