--- a/make/jprt.properties Fri Sep 03 12:49:47 2010 -0700
+++ b/make/jprt.properties Wed Sep 08 14:04:13 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
# Shortened list of vm tests
jprt.test.targets= \
@@ -89,6 +69,7 @@
# *-product-*-jdk_rmi
# *-product-*-jdk_swing
-# Directories to be excluded from source bundles
+# Directories to be excluded from the source bundles
jprt.bundle.exclude.src.dirs=build dist webrev
+