Merge
authorduke
Wed, 05 Jul 2017 17:21:06 +0200
changeset 6283 1730d0ec1d4b
parent 6282 59327a28f6c0 (current diff)
parent 6244 bca3b1e3474c (diff)
child 6329 36f3abe18454
Merge
--- a/.hgtags-top-repo	Thu Sep 09 14:27:59 2010 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 17:21:06 2017 +0200
@@ -82,3 +82,4 @@
 9f96a4269d7727dad68864eaab795eafce270311 jdk7-b105
 43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106
 7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
+140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
--- a/make/jprt.properties	Thu Sep 09 14:27:59 2010 -0700
+++ b/make/jprt.properties	Wed Jul 05 17:21:06 2017 +0200
@@ -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
 
+