1.1 --- a/make/jprt.properties Mon Jun 27 14:10:07 2011 -0700
1.2 +++ b/make/jprt.properties Fri Jul 22 17:35:54 2011 -0700
1.3 @@ -25,22 +25,12 @@
1.4
1.5 # Properties for jprt
1.6
1.7 -# At submit time, the release supplied will be in jprt.submit.release
1.8 -# and will be one of the official release names defined in jprt.
1.9 -# jprt supports property value expansion using ${property.name} syntax.
1.10 -
1.11 -# This tells jprt what default release we want to build
1.12 -jprt.tools.default.release=${jprt.submit.release}
1.13 +# Release to build
1.14 +jprt.tools.default.release=jdk8
1.15
1.16 # The different build flavors we want, we override here so we just get these 2
1.17 jprt.build.flavors=product,fastdebug
1.18
1.19 -# Define the Windows we want (temporary)
1.20 -jprt.my.windows.i586.jdk7b107=windows_i586_5.0
1.21 -jprt.my.windows.i586.jdk7temp=windows_i586_5.0
1.22 -jprt.my.windows.i586.jdk7=windows_i586_5.1
1.23 -jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
1.24 -
1.25 # Standard list of jprt build targets for this source tree
1.26 jprt.build.targets= \
1.27 solaris_sparc_5.10-{product|fastdebug}, \
1.28 @@ -49,7 +39,7 @@
1.29 solaris_x64_5.10-{product|fastdebug}, \
1.30 linux_i586_2.6-{product|fastdebug}, \
1.31 linux_x64_2.6-{product|fastdebug}, \
1.32 - ${jprt.my.windows.i586}-{product|fastdebug}, \
1.33 + windows_i586_5.1-{product|fastdebug}, \
1.34 windows_x64_5.2-{product|fastdebug}
1.35
1.36 # User can select the test set with jprt submit "-testset name" option
1.37 @@ -64,7 +54,7 @@
1.38 solaris_x64_5.10-product-c2-jvm98, \
1.39 linux_i586_2.6-product-{c1|c2}-jvm98, \
1.40 linux_x64_2.6-product-c2-jvm98, \
1.41 - ${jprt.my.windows.i586}-product-c1-jvm98, \
1.42 + windows_i586_5.1-product-c1-jvm98, \
1.43 windows_x64_5.2-product-c2-jvm98, \
1.44 \
1.45 solaris_sparc_5.10-product-c1-scimark, \
1.46 @@ -73,7 +63,7 @@
1.47 solaris_x64_5.10-product-c2-scimark, \
1.48 linux_i586_2.6-product-{c1|c2}-scimark, \
1.49 linux_x64_2.6-product-c2-scimark, \
1.50 - ${jprt.my.windows.i586}-product-c1-scimark, \
1.51 + windows_i586_5.1-product-c1-scimark, \
1.52 windows_x64_5.2-product-c2-scimark
1.53
1.54 # Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing)
1.55 @@ -85,7 +75,7 @@
1.56 solaris_x64_5.10-product-c2-langtools_jtreg, \
1.57 linux_i586_2.6-product-{c1|c2}-langtools_jtreg, \
1.58 linux_x64_2.6-product-c2-langtools_jtreg, \
1.59 - ${jprt.my.windows.i586}-product-c1-langtools_jtreg, \
1.60 + windows_i586_5.1-product-c1-langtools_jtreg, \
1.61 windows_x64_5.2-product-c2-langtools_jtreg, \
1.62 \
1.63 solaris_sparc_5.10-product-c1-jdk_beans1, \
1.64 @@ -94,7 +84,7 @@
1.65 solaris_x64_5.10-product-c2-jdk_beans1, \
1.66 linux_i586_2.6-product-{c1|c2}-jdk_beans1, \
1.67 linux_x64_2.6-product-c2-jdk_beans1, \
1.68 - ${jprt.my.windows.i586}-product-c1-jdk_beans1, \
1.69 + windows_i586_5.1-product-c1-jdk_beans1, \
1.70 windows_x64_5.2-product-c2-jdk_beans1, \
1.71 \
1.72 solaris_sparc_5.10-product-c1-jdk_io, \
1.73 @@ -103,7 +93,7 @@
1.74 solaris_x64_5.10-product-c2-jdk_io, \
1.75 linux_i586_2.6-product-{c1|c2}-jdk_io, \
1.76 linux_x64_2.6-product-c2-jdk_io, \
1.77 - ${jprt.my.windows.i586}-product-c1-jdk_io, \
1.78 + windows_i586_5.1-product-c1-jdk_io, \
1.79 windows_x64_5.2-product-c2-jdk_io, \
1.80 \
1.81 solaris_sparc_5.10-product-c1-jdk_lang, \
1.82 @@ -112,7 +102,7 @@
1.83 solaris_x64_5.10-product-c2-jdk_lang, \
1.84 linux_i586_2.6-product-{c1|c2}-jdk_lang, \
1.85 linux_x64_2.6-product-c2-jdk_lang, \
1.86 - ${jprt.my.windows.i586}-product-c1-jdk_lang, \
1.87 + windows_i586_5.1-product-c1-jdk_lang, \
1.88 windows_x64_5.2-product-c2-jdk_lang, \
1.89 \
1.90 solaris_sparc_5.10-product-c1-jdk_math, \
1.91 @@ -121,7 +111,7 @@
1.92 solaris_x64_5.10-product-c2-jdk_math, \
1.93 linux_i586_2.6-product-{c1|c2}-jdk_math, \
1.94 linux_x64_2.6-product-c2-jdk_math, \
1.95 - ${jprt.my.windows.i586}-product-c1-jdk_math, \
1.96 + windows_i586_5.1-product-c1-jdk_math, \
1.97 windows_x64_5.2-product-c2-jdk_math, \
1.98 \
1.99 solaris_sparc_5.10-product-c1-jdk_misc, \
1.100 @@ -130,7 +120,7 @@
1.101 solaris_x64_5.10-product-c2-jdk_misc, \
1.102 linux_i586_2.6-product-{c1|c2}-jdk_misc, \
1.103 linux_x64_2.6-product-c2-jdk_misc, \
1.104 - ${jprt.my.windows.i586}-product-c1-jdk_misc, \
1.105 + windows_i586_5.1-product-c1-jdk_misc, \
1.106 windows_x64_5.2-product-c2-jdk_misc, \
1.107 \
1.108 solaris_sparc_5.10-product-c1-jdk_net, \
1.109 @@ -139,7 +129,7 @@
1.110 solaris_x64_5.10-product-c2-jdk_net, \
1.111 linux_i586_2.6-product-{c1|c2}-jdk_net, \
1.112 linux_x64_2.6-product-c2-jdk_net, \
1.113 - ${jprt.my.windows.i586}-product-c1-jdk_net, \
1.114 + windows_i586_5.1-product-c1-jdk_net, \
1.115 windows_x64_5.2-product-c2-jdk_net, \
1.116 \
1.117 solaris_sparc_5.10-product-c1-jdk_nio1, \
1.118 @@ -148,7 +138,7 @@
1.119 solaris_x64_5.10-product-c2-jdk_nio1, \
1.120 linux_i586_2.6-product-{c1|c2}-jdk_nio1, \
1.121 linux_x64_2.6-product-c2-jdk_nio1, \
1.122 - ${jprt.my.windows.i586}-product-c1-jdk_nio1, \
1.123 + windows_i586_5.1-product-c1-jdk_nio1, \
1.124 windows_x64_5.2-product-c2-jdk_nio1, \
1.125 \
1.126 solaris_sparc_5.10-product-c1-jdk_nio2, \
1.127 @@ -157,7 +147,7 @@
1.128 solaris_x64_5.10-product-c2-jdk_nio2, \
1.129 linux_i586_2.6-product-{c1|c2}-jdk_nio2, \
1.130 linux_x64_2.6-product-c2-jdk_nio2, \
1.131 - ${jprt.my.windows.i586}-product-c1-jdk_nio2, \
1.132 + windows_i586_5.1-product-c1-jdk_nio2, \
1.133 windows_x64_5.2-product-c2-jdk_nio2, \
1.134 \
1.135 solaris_sparc_5.10-product-c1-jdk_nio3, \
1.136 @@ -166,7 +156,7 @@
1.137 solaris_x64_5.10-product-c2-jdk_nio3, \
1.138 linux_i586_2.6-product-{c1|c2}-jdk_nio3, \
1.139 linux_x64_2.6-product-c2-jdk_nio3, \
1.140 - ${jprt.my.windows.i586}-product-c1-jdk_nio3, \
1.141 + windows_i586_5.1-product-c1-jdk_nio3, \
1.142 windows_x64_5.2-product-c2-jdk_nio3, \
1.143 \
1.144 solaris_sparc_5.10-product-c1-jdk_security1, \
1.145 @@ -175,7 +165,7 @@
1.146 solaris_x64_5.10-product-c2-jdk_security1, \
1.147 linux_i586_2.6-product-{c1|c2}-jdk_security1, \
1.148 linux_x64_2.6-product-c2-jdk_security1, \
1.149 - ${jprt.my.windows.i586}-product-c1-jdk_security1, \
1.150 + windows_i586_5.1-product-c1-jdk_security1, \
1.151 windows_x64_5.2-product-c2-jdk_security1, \
1.152 \
1.153 solaris_sparc_5.10-product-c1-jdk_text, \
1.154 @@ -184,7 +174,7 @@
1.155 solaris_x64_5.10-product-c2-jdk_text, \
1.156 linux_i586_2.6-product-{c1|c2}-jdk_text, \
1.157 linux_x64_2.6-product-c2-jdk_text, \
1.158 - ${jprt.my.windows.i586}-product-c1-jdk_text, \
1.159 + windows_i586_5.1-product-c1-jdk_text, \
1.160 windows_x64_5.2-product-c2-jdk_text, \
1.161 \
1.162 solaris_sparc_5.10-product-c1-jdk_tools1, \
1.163 @@ -193,7 +183,7 @@
1.164 solaris_x64_5.10-product-c2-jdk_tools1, \
1.165 linux_i586_2.6-product-{c1|c2}-jdk_tools1, \
1.166 linux_x64_2.6-product-c2-jdk_tools1, \
1.167 - ${jprt.my.windows.i586}-product-c1-jdk_tools1, \
1.168 + windows_i586_5.1-product-c1-jdk_tools1, \
1.169 windows_x64_5.2-product-c2-jdk_tools1, \
1.170 \
1.171 solaris_sparc_5.10-product-c1-jdk_util, \
1.172 @@ -202,7 +192,7 @@
1.173 solaris_x64_5.10-product-c2-jdk_util, \
1.174 linux_i586_2.6-product-{c1|c2}-jdk_util, \
1.175 linux_x64_2.6-product-c2-jdk_util, \
1.176 - ${jprt.my.windows.i586}-product-c1-jdk_util, \
1.177 + windows_i586_5.1-product-c1-jdk_util, \
1.178 windows_x64_5.2-product-c2-jdk_util
1.179
1.180 # All vm test targets (but still no fastdebug & limited c2 testing)
1.181 @@ -216,7 +206,7 @@
1.182 solaris_x64_5.10-product-c2-runThese, \
1.183 linux_i586_2.6-product-{c1|c2}-runThese, \
1.184 linux_x64_2.6-product-c2-runThese, \
1.185 - ${jprt.my.windows.i586}-product-c1-runThese, \
1.186 + windows_i586_5.1-product-c1-runThese, \
1.187 windows_x64_5.2-product-c2-runThese, \
1.188 \
1.189 solaris_sparc_5.10-product-c1-jbb_default, \
1.190 @@ -225,7 +215,7 @@
1.191 solaris_x64_5.10-product-c2-jbb_default, \
1.192 linux_i586_2.6-product-{c1|c2}-jbb_default, \
1.193 linux_x64_2.6-product-c2-jbb_default, \
1.194 - ${jprt.my.windows.i586}-product-c1-jbb_default, \
1.195 + windows_i586_5.1-product-c1-jbb_default, \
1.196 windows_x64_5.2-product-c2-jbb_default
1.197
1.198 # All jdk test targets (but still no fastdebug & limited c2 testing)
1.199 @@ -239,7 +229,7 @@
1.200 solaris_x64_5.10-product-c2-jdk_awt, \
1.201 linux_i586_2.6-product-{c1|c2}-jdk_awt, \
1.202 linux_x64_2.6-product-c2-jdk_awt, \
1.203 - ${jprt.my.windows.i586}-product-c1-jdk_awt, \
1.204 + windows_i586_5.1-product-c1-jdk_awt, \
1.205 windows_x64_5.2-product-c2-jdk_awt, \
1.206 \
1.207 solaris_sparc_5.10-product-c1-jdk_beans2, \
1.208 @@ -248,7 +238,7 @@
1.209 solaris_x64_5.10-product-c2-jdk_beans2, \
1.210 linux_i586_2.6-product-{c1|c2}-jdk_beans2, \
1.211 linux_x64_2.6-product-c2-jdk_beans2, \
1.212 - ${jprt.my.windows.i586}-product-c1-jdk_beans2, \
1.213 + windows_i586_5.1-product-c1-jdk_beans2, \
1.214 windows_x64_5.2-product-c2-jdk_beans2, \
1.215 \
1.216 solaris_sparc_5.10-product-c1-jdk_beans3, \
1.217 @@ -257,7 +247,7 @@
1.218 solaris_x64_5.10-product-c2-jdk_beans3, \
1.219 linux_i586_2.6-product-{c1|c2}-jdk_beans3, \
1.220 linux_x64_2.6-product-c2-jdk_beans3, \
1.221 - ${jprt.my.windows.i586}-product-c1-jdk_beans3, \
1.222 + windows_i586_5.1-product-c1-jdk_beans3, \
1.223 windows_x64_5.2-product-c2-jdk_beans3, \
1.224 \
1.225 solaris_sparc_5.10-product-c1-jdk_management1, \
1.226 @@ -266,7 +256,7 @@
1.227 solaris_x64_5.10-product-c2-jdk_management1, \
1.228 linux_i586_2.6-product-{c1|c2}-jdk_management1, \
1.229 linux_x64_2.6-product-c2-jdk_management1, \
1.230 - ${jprt.my.windows.i586}-product-c1-jdk_management1, \
1.231 + windows_i586_5.1-product-c1-jdk_management1, \
1.232 windows_x64_5.2-product-c2-jdk_management1, \
1.233 \
1.234 solaris_sparc_5.10-product-c1-jdk_management2, \
1.235 @@ -275,7 +265,7 @@
1.236 solaris_x64_5.10-product-c2-jdk_management2, \
1.237 linux_i586_2.6-product-{c1|c2}-jdk_management2, \
1.238 linux_x64_2.6-product-c2-jdk_management2, \
1.239 - ${jprt.my.windows.i586}-product-c1-jdk_management2, \
1.240 + windows_i586_5.1-product-c1-jdk_management2, \
1.241 windows_x64_5.2-product-c2-jdk_management2, \
1.242 \
1.243 solaris_sparc_5.10-product-c1-jdk_rmi, \
1.244 @@ -284,7 +274,7 @@
1.245 solaris_x64_5.10-product-c2-jdk_rmi, \
1.246 linux_i586_2.6-product-{c1|c2}-jdk_rmi, \
1.247 linux_x64_2.6-product-c2-jdk_rmi, \
1.248 - ${jprt.my.windows.i586}-product-c1-jdk_rmi, \
1.249 + windows_i586_5.1-product-c1-jdk_rmi, \
1.250 windows_x64_5.2-product-c2-jdk_rmi, \
1.251 \
1.252 solaris_sparc_5.10-product-c1-jdk_security2, \
1.253 @@ -293,7 +283,7 @@
1.254 solaris_x64_5.10-product-c2-jdk_security2, \
1.255 linux_i586_2.6-product-{c1|c2}-jdk_security2, \
1.256 linux_x64_2.6-product-c2-jdk_security2, \
1.257 - ${jprt.my.windows.i586}-product-c1-jdk_security2, \
1.258 + windows_i586_5.1-product-c1-jdk_security2, \
1.259 windows_x64_5.2-product-c2-jdk_security2, \
1.260 \
1.261 solaris_sparc_5.10-product-c1-jdk_security3, \
1.262 @@ -302,7 +292,7 @@
1.263 solaris_x64_5.10-product-c2-jdk_security3, \
1.264 linux_i586_2.6-product-{c1|c2}-jdk_security3, \
1.265 linux_x64_2.6-product-c2-jdk_security3, \
1.266 - ${jprt.my.windows.i586}-product-c1-jdk_security3, \
1.267 + windows_i586_5.1-product-c1-jdk_security3, \
1.268 windows_x64_5.2-product-c2-jdk_security3, \
1.269 \
1.270 solaris_sparc_5.10-product-c1-jdk_swing, \
1.271 @@ -311,7 +301,7 @@
1.272 solaris_x64_5.10-product-c2-jdk_swing, \
1.273 linux_i586_2.6-product-{c1|c2}-jdk_swing, \
1.274 linux_x64_2.6-product-c2-jdk_swing, \
1.275 - ${jprt.my.windows.i586}-product-c1-jdk_swing, \
1.276 + windows_i586_5.1-product-c1-jdk_swing, \
1.277 windows_x64_5.2-product-c2-jdk_swing, \
1.278 \
1.279 solaris_sparc_5.10-product-c1-jdk_tools2, \
1.280 @@ -320,7 +310,7 @@
1.281 solaris_x64_5.10-product-c2-jdk_tools2, \
1.282 linux_i586_2.6-product-{c1|c2}-jdk_tools2, \
1.283 linux_x64_2.6-product-c2-jdk_tools2, \
1.284 - ${jprt.my.windows.i586}-product-c1-jdk_tools2, \
1.285 + windows_i586_5.1-product-c1-jdk_tools2, \
1.286 windows_x64_5.2-product-c2-jdk_tools2
1.287
1.288 # JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
