1.1 --- a/make/jprt.properties Mon Feb 13 06:24:44 2012 -0800
1.2 +++ b/make/jprt.properties Mon Feb 13 14:03:12 2012 -0500
1.3 @@ -38,7 +38,9 @@
1.4
1.5 # This tells jprt what default release we want to build
1.6
1.7 -jprt.tools.default.release=${jprt.submit.release}
1.8 +jprt.hotspot.default.release=jdk7
1.9 +
1.10 +jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
1.11
1.12 # Disable syncing the source after builds and tests are done.
1.13
1.14 @@ -52,126 +54,46 @@
1.15 # Define the Solaris platforms we want for the various releases
1.16 jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
1.17 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
1.18 -jprt.my.solaris.sparc.jdk7b107=solaris_sparc_5.10
1.19 -jprt.my.solaris.sparc.jdk7temp=solaris_sparc_5.10
1.20 -jprt.my.solaris.sparc.jdk6=solaris_sparc_5.8
1.21 -jprt.my.solaris.sparc.jdk6perf=solaris_sparc_5.8
1.22 -jprt.my.solaris.sparc.jdk6u10=solaris_sparc_5.8
1.23 -jprt.my.solaris.sparc.jdk6u14=solaris_sparc_5.8
1.24 -jprt.my.solaris.sparc.jdk6u18=solaris_sparc_5.8
1.25 -jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8
1.26 -jprt.my.solaris.sparc.ejdk7=${jprt.my.solaris.sparc.jdk7}
1.27 -jprt.my.solaris.sparc.ejdk6=${jprt.my.solaris.sparc.jdk6}
1.28 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
1.29
1.30 jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
1.31 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
1.32 -jprt.my.solaris.sparcv9.jdk7b107=solaris_sparcv9_5.10
1.33 -jprt.my.solaris.sparcv9.jdk7temp=solaris_sparcv9_5.10
1.34 -jprt.my.solaris.sparcv9.jdk6=solaris_sparcv9_5.8
1.35 -jprt.my.solaris.sparcv9.jdk6perf=solaris_sparcv9_5.8
1.36 -jprt.my.solaris.sparcv9.jdk6u10=solaris_sparcv9_5.8
1.37 -jprt.my.solaris.sparcv9.jdk6u14=solaris_sparcv9_5.8
1.38 -jprt.my.solaris.sparcv9.jdk6u18=solaris_sparcv9_5.8
1.39 -jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8
1.40 -jprt.my.solaris.sparcv9.ejdk7=${jprt.my.solaris.sparcv9.jdk7}
1.41 -jprt.my.solaris.sparcv9.ejdk6=${jprt.my.solaris.sparcv9.jdk6}
1.42 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
1.43
1.44 jprt.my.solaris.i586.jdk8=solaris_i586_5.10
1.45 jprt.my.solaris.i586.jdk7=solaris_i586_5.10
1.46 -jprt.my.solaris.i586.jdk7b107=solaris_i586_5.10
1.47 -jprt.my.solaris.i586.jdk7temp=solaris_i586_5.10
1.48 -jprt.my.solaris.i586.jdk6=solaris_i586_5.8
1.49 -jprt.my.solaris.i586.jdk6perf=solaris_i586_5.8
1.50 -jprt.my.solaris.i586.jdk6u10=solaris_i586_5.8
1.51 -jprt.my.solaris.i586.jdk6u14=solaris_i586_5.8
1.52 -jprt.my.solaris.i586.jdk6u18=solaris_i586_5.8
1.53 -jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8
1.54 -jprt.my.solaris.i586.ejdk7=${jprt.my.solaris.i586.jdk7}
1.55 -jprt.my.solaris.i586.ejdk6=${jprt.my.solaris.i586.jdk6}
1.56 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
1.57
1.58 jprt.my.solaris.x64.jdk8=solaris_x64_5.10
1.59 jprt.my.solaris.x64.jdk7=solaris_x64_5.10
1.60 -jprt.my.solaris.x64.jdk7b107=solaris_x64_5.10
1.61 -jprt.my.solaris.x64.jdk7temp=solaris_x64_5.10
1.62 -jprt.my.solaris.x64.jdk6=solaris_x64_5.10
1.63 -jprt.my.solaris.x64.jdk6perf=solaris_x64_5.10
1.64 -jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10
1.65 -jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10
1.66 -jprt.my.solaris.x64.jdk6u18=solaris_x64_5.10
1.67 -jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10
1.68 -jprt.my.solaris.x64.ejdk7=${jprt.my.solaris.x64.jdk7}
1.69 -jprt.my.solaris.x64.ejdk6=${jprt.my.solaris.x64.jdk6}
1.70 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
1.71
1.72 jprt.my.linux.i586.jdk8=linux_i586_2.6
1.73 jprt.my.linux.i586.jdk7=linux_i586_2.6
1.74 -jprt.my.linux.i586.jdk7b107=linux_i586_2.6
1.75 -jprt.my.linux.i586.jdk7temp=linux_i586_2.6
1.76 -jprt.my.linux.i586.jdk6=linux_i586_2.4
1.77 -jprt.my.linux.i586.jdk6perf=linux_i586_2.4
1.78 -jprt.my.linux.i586.jdk6u10=linux_i586_2.4
1.79 -jprt.my.linux.i586.jdk6u14=linux_i586_2.4
1.80 -jprt.my.linux.i586.jdk6u18=linux_i586_2.4
1.81 -jprt.my.linux.i586.jdk6u20=linux_i586_2.4
1.82 -jprt.my.linux.i586.ejdk7=linux_i586_2.6
1.83 -jprt.my.linux.i586.ejdk6=linux_i586_2.6
1.84 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
1.85
1.86 jprt.my.linux.x64.jdk8=linux_x64_2.6
1.87 jprt.my.linux.x64.jdk7=linux_x64_2.6
1.88 -jprt.my.linux.x64.jdk7b107=linux_x64_2.6
1.89 -jprt.my.linux.x64.jdk7temp=linux_x64_2.6
1.90 -jprt.my.linux.x64.jdk6=linux_x64_2.4
1.91 -jprt.my.linux.x64.jdk6perf=linux_x64_2.4
1.92 -jprt.my.linux.x64.jdk6u10=linux_x64_2.4
1.93 -jprt.my.linux.x64.jdk6u14=linux_x64_2.4
1.94 -jprt.my.linux.x64.jdk6u18=linux_x64_2.4
1.95 -jprt.my.linux.x64.jdk6u20=linux_x64_2.4
1.96 -jprt.my.linux.x64.ejdk7=${jprt.my.linux.x64.jdk7}
1.97 -jprt.my.linux.x64.ejdk6=${jprt.my.linux.x64.jdk6}
1.98 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
1.99
1.100 jprt.my.linux.ppc.jdk8=linux_ppc_2.6
1.101 jprt.my.linux.ppc.jdk7=linux_ppc_2.6
1.102 -jprt.my.linux.ppc.jdk7b107=linux_ppc_2.6
1.103 -jprt.my.linux.ppc.jdk7temp=linux_ppc_2.6
1.104 -jprt.my.linux.ppc.ejdk6=linux_ppc_2.6
1.105 -jprt.my.linux.ppc.ejdk7=linux_ppc_2.6
1.106 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
1.107
1.108 jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
1.109 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
1.110 -jprt.my.linux.ppcv2.jdk7b107=linux_ppcv2_2.6
1.111 -jprt.my.linux.ppcv2.jdk7temp=linux_ppcv2_2.6
1.112 -jprt.my.linux.ppcv2.ejdk6=linux_ppcv2_2.6
1.113 -jprt.my.linux.ppcv2.ejdk7=linux_ppcv2_2.6
1.114 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
1.115
1.116 jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
1.117 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
1.118 -jprt.my.linux.ppcsflt.jdk7b107=linux_ppcsflt_2.6
1.119 -jprt.my.linux.ppcsflt.jdk7temp=linux_ppcsflt_2.6
1.120 -jprt.my.linux.ppcsflt.ejdk6=linux_ppcsflt_2.6
1.121 -jprt.my.linux.ppcsflt.ejdk7=linux_ppcsflt_2.6
1.122 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
1.123
1.124 jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
1.125 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
1.126 -jprt.my.linux.armvfp.jdk7b107=linux_armvfp_2.6
1.127 -jprt.my.linux.armvfp.jdk7temp=linux_armvfp_2.6
1.128 -jprt.my.linux.armvfp.ejdk6=linux_armvfp_2.6
1.129 -jprt.my.linux.armvfp.ejdk7=linux_armvfp_2.6
1.130 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
1.131
1.132 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
1.133 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
1.134 -jprt.my.linux.armsflt.jdk7b107=linux_armsflt_2.6
1.135 -jprt.my.linux.armsflt.jdk7temp=linux_armsflt_2.6
1.136 -jprt.my.linux.armsflt.ejdk6=linux_armsflt_2.6
1.137 -jprt.my.linux.armsflt.ejdk7=linux_armsflt_2.6
1.138 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
1.139
1.140 jprt.my.macosx.x64.jdk8=macosx_x64_10.7
1.141 @@ -180,30 +102,10 @@
1.142
1.143 jprt.my.windows.i586.jdk8=windows_i586_5.1
1.144 jprt.my.windows.i586.jdk7=windows_i586_5.1
1.145 -jprt.my.windows.i586.jdk7b107=windows_i586_5.0
1.146 -jprt.my.windows.i586.jdk7temp=windows_i586_5.0
1.147 -jprt.my.windows.i586.jdk6=windows_i586_5.0
1.148 -jprt.my.windows.i586.jdk6perf=windows_i586_5.0
1.149 -jprt.my.windows.i586.jdk6u10=windows_i586_5.0
1.150 -jprt.my.windows.i586.jdk6u14=windows_i586_5.0
1.151 -jprt.my.windows.i586.jdk6u18=windows_i586_5.0
1.152 -jprt.my.windows.i586.jdk6u20=windows_i586_5.0
1.153 -jprt.my.windows.i586.ejdk7=${jprt.my.windows.i586.jdk7}
1.154 -jprt.my.windows.i586.ejdk6=${jprt.my.windows.i586.jdk6}
1.155 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
1.156
1.157 jprt.my.windows.x64.jdk8=windows_x64_5.2
1.158 jprt.my.windows.x64.jdk7=windows_x64_5.2
1.159 -jprt.my.windows.x64.jdk7b107=windows_x64_5.2
1.160 -jprt.my.windows.x64.jdk7temp=windows_x64_5.2
1.161 -jprt.my.windows.x64.jdk6=windows_x64_5.2
1.162 -jprt.my.windows.x64.jdk6perf=windows_x64_5.2
1.163 -jprt.my.windows.x64.jdk6u10=windows_x64_5.2
1.164 -jprt.my.windows.x64.jdk6u14=windows_x64_5.2
1.165 -jprt.my.windows.x64.jdk6u18=windows_x64_5.2
1.166 -jprt.my.windows.x64.jdk6u20=windows_x64_5.2
1.167 -jprt.my.windows.x64.ejdk7=${jprt.my.windows.x64.jdk7}
1.168 -jprt.my.windows.x64.ejdk6=${jprt.my.windows.x64.jdk6}
1.169 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
1.170
1.171 # Standard list of jprt build targets for this source tree
1.172 @@ -539,16 +441,6 @@
1.173
1.174 jprt.test.targets.jdk8=${jprt.test.targets.standard}
1.175 jprt.test.targets.jdk7=${jprt.test.targets.standard}
1.176 -jprt.test.targets.jdk7temp=${jprt.test.targets.standard}
1.177 -jprt.test.targets.jdk7b105=${jprt.test.targets.standard}
1.178 -jprt.test.targets.jdk6=${jprt.test.targets.standard}
1.179 -jprt.test.targets.jdk6perf=${jprt.test.targets.standard}
1.180 -jprt.test.targets.jdk6u10=${jprt.test.targets.standard}
1.181 -jprt.test.targets.jdk6u14=${jprt.test.targets.standard}
1.182 -jprt.test.targets.jdk6u18=${jprt.test.targets.standard}
1.183 -jprt.test.targets.jdk6u20=${jprt.test.targets.standard}
1.184 -jprt.test.targets.ejdk6=${jprt.test.targets.embedded}
1.185 -jprt.test.targets.ejdk7=${jprt.test.targets.embedded}
1.186 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
1.187
1.188 # The default test/Makefile targets that should be run
1.189 @@ -593,15 +485,5 @@
1.190
1.191 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
1.192 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
1.193 -jprt.make.rule.test.targets.jdk7temp=${jprt.make.rule.test.targets.standard}
1.194 -jprt.make.rule.test.targets.jdk7b107=${jprt.make.rule.test.targets.standard}
1.195 -jprt.make.rule.test.targets.jdk6=${jprt.make.rule.test.targets.standard}
1.196 -jprt.make.rule.test.targets.jdk6perf=${jprt.make.rule.test.targets.standard}
1.197 -jprt.make.rule.test.targets.jdk6u10=${jprt.make.rule.test.targets.standard}
1.198 -jprt.make.rule.test.targets.jdk6u14=${jprt.make.rule.test.targets.standard}
1.199 -jprt.make.rule.test.targets.jdk6u18=${jprt.make.rule.test.targets.standard}
1.200 -jprt.make.rule.test.targets.jdk6u20=${jprt.make.rule.test.targets.standard}
1.201 -jprt.make.rule.test.targets.ejdk6=${jprt.make.rule.test.targets.embedded}
1.202 -jprt.make.rule.test.targets.ejdk7=${jprt.make.rule.test.targets.embedded}
1.203 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
1.204
