comparison make/jprt.properties @ 3812:0cc8a70952c3 hs22-b01 jdk8-b01

7070061: Adjust Hotspot make/jprt.properties for new JDK8 settings Summary: Fix so the JPRT can build with -release jdk8 now Reviewed-by: ohair
author trims
date Fri, 22 Jul 2011 23:42:46 -0700
parents 03b943e6c025
children 6fd81579526f 97825a4f7369
comparison
equal deleted inserted replaced
3811:8e5d4aa73a8c 3812:0cc8a70952c3
48 # all platforms so that regressions are not introduced (eg. change to 48 # all platforms so that regressions are not introduced (eg. change to
49 # common code by SE breaks PPC/ARM; change to common code by SE-E breaks 49 # common code by SE breaks PPC/ARM; change to common code by SE-E breaks
50 # sparc etc. 50 # sparc etc.
51 51
52 # Define the Solaris platforms we want for the various releases 52 # Define the Solaris platforms we want for the various releases
53 53 jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
54 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10 54 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
55 jprt.my.solaris.sparc.jdk7b107=solaris_sparc_5.10 55 jprt.my.solaris.sparc.jdk7b107=solaris_sparc_5.10
56 jprt.my.solaris.sparc.jdk7temp=solaris_sparc_5.10 56 jprt.my.solaris.sparc.jdk7temp=solaris_sparc_5.10
57 jprt.my.solaris.sparc.jdk6=solaris_sparc_5.8 57 jprt.my.solaris.sparc.jdk6=solaris_sparc_5.8
58 jprt.my.solaris.sparc.jdk6perf=solaris_sparc_5.8 58 jprt.my.solaris.sparc.jdk6perf=solaris_sparc_5.8
62 jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8 62 jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8
63 jprt.my.solaris.sparc.ejdk7=${jprt.my.solaris.sparc.jdk7} 63 jprt.my.solaris.sparc.ejdk7=${jprt.my.solaris.sparc.jdk7}
64 jprt.my.solaris.sparc.ejdk6=${jprt.my.solaris.sparc.jdk6} 64 jprt.my.solaris.sparc.ejdk6=${jprt.my.solaris.sparc.jdk6}
65 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}} 65 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
66 66
67 jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
67 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10 68 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
68 jprt.my.solaris.sparcv9.jdk7b107=solaris_sparcv9_5.10 69 jprt.my.solaris.sparcv9.jdk7b107=solaris_sparcv9_5.10
69 jprt.my.solaris.sparcv9.jdk7temp=solaris_sparcv9_5.10 70 jprt.my.solaris.sparcv9.jdk7temp=solaris_sparcv9_5.10
70 jprt.my.solaris.sparcv9.jdk6=solaris_sparcv9_5.8 71 jprt.my.solaris.sparcv9.jdk6=solaris_sparcv9_5.8
71 jprt.my.solaris.sparcv9.jdk6perf=solaris_sparcv9_5.8 72 jprt.my.solaris.sparcv9.jdk6perf=solaris_sparcv9_5.8
75 jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8 76 jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8
76 jprt.my.solaris.sparcv9.ejdk7=${jprt.my.solaris.sparcv9.jdk7} 77 jprt.my.solaris.sparcv9.ejdk7=${jprt.my.solaris.sparcv9.jdk7}
77 jprt.my.solaris.sparcv9.ejdk6=${jprt.my.solaris.sparcv9.jdk6} 78 jprt.my.solaris.sparcv9.ejdk6=${jprt.my.solaris.sparcv9.jdk6}
78 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}} 79 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
79 80
81 jprt.my.solaris.i586.jdk8=solaris_i586_5.10
80 jprt.my.solaris.i586.jdk7=solaris_i586_5.10 82 jprt.my.solaris.i586.jdk7=solaris_i586_5.10
81 jprt.my.solaris.i586.jdk7b107=solaris_i586_5.10 83 jprt.my.solaris.i586.jdk7b107=solaris_i586_5.10
82 jprt.my.solaris.i586.jdk7temp=solaris_i586_5.10 84 jprt.my.solaris.i586.jdk7temp=solaris_i586_5.10
83 jprt.my.solaris.i586.jdk6=solaris_i586_5.8 85 jprt.my.solaris.i586.jdk6=solaris_i586_5.8
84 jprt.my.solaris.i586.jdk6perf=solaris_i586_5.8 86 jprt.my.solaris.i586.jdk6perf=solaris_i586_5.8
88 jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8 90 jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8
89 jprt.my.solaris.i586.ejdk7=${jprt.my.solaris.i586.jdk7} 91 jprt.my.solaris.i586.ejdk7=${jprt.my.solaris.i586.jdk7}
90 jprt.my.solaris.i586.ejdk6=${jprt.my.solaris.i586.jdk6} 92 jprt.my.solaris.i586.ejdk6=${jprt.my.solaris.i586.jdk6}
91 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}} 93 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
92 94
95 jprt.my.solaris.x64.jdk8=solaris_x64_5.10
93 jprt.my.solaris.x64.jdk7=solaris_x64_5.10 96 jprt.my.solaris.x64.jdk7=solaris_x64_5.10
94 jprt.my.solaris.x64.jdk7b107=solaris_x64_5.10 97 jprt.my.solaris.x64.jdk7b107=solaris_x64_5.10
95 jprt.my.solaris.x64.jdk7temp=solaris_x64_5.10 98 jprt.my.solaris.x64.jdk7temp=solaris_x64_5.10
96 jprt.my.solaris.x64.jdk6=solaris_x64_5.10 99 jprt.my.solaris.x64.jdk6=solaris_x64_5.10
97 jprt.my.solaris.x64.jdk6perf=solaris_x64_5.10 100 jprt.my.solaris.x64.jdk6perf=solaris_x64_5.10
101 jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10 104 jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10
102 jprt.my.solaris.x64.ejdk7=${jprt.my.solaris.x64.jdk7} 105 jprt.my.solaris.x64.ejdk7=${jprt.my.solaris.x64.jdk7}
103 jprt.my.solaris.x64.ejdk6=${jprt.my.solaris.x64.jdk6} 106 jprt.my.solaris.x64.ejdk6=${jprt.my.solaris.x64.jdk6}
104 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} 107 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
105 108
109 jprt.my.linux.i586.jdk8=linux_i586_2.6
106 jprt.my.linux.i586.jdk7=linux_i586_2.6 110 jprt.my.linux.i586.jdk7=linux_i586_2.6
107 jprt.my.linux.i586.jdk7b107=linux_i586_2.6 111 jprt.my.linux.i586.jdk7b107=linux_i586_2.6
108 jprt.my.linux.i586.jdk7temp=linux_i586_2.6 112 jprt.my.linux.i586.jdk7temp=linux_i586_2.6
109 jprt.my.linux.i586.jdk6=linux_i586_2.4 113 jprt.my.linux.i586.jdk6=linux_i586_2.4
110 jprt.my.linux.i586.jdk6perf=linux_i586_2.4 114 jprt.my.linux.i586.jdk6perf=linux_i586_2.4
114 jprt.my.linux.i586.jdk6u20=linux_i586_2.4 118 jprt.my.linux.i586.jdk6u20=linux_i586_2.4
115 jprt.my.linux.i586.ejdk7=linux_i586_2.6 119 jprt.my.linux.i586.ejdk7=linux_i586_2.6
116 jprt.my.linux.i586.ejdk6=linux_i586_2.6 120 jprt.my.linux.i586.ejdk6=linux_i586_2.6
117 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}} 121 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
118 122
123 jprt.my.linux.x64.jdk8=linux_x64_2.6
119 jprt.my.linux.x64.jdk7=linux_x64_2.6 124 jprt.my.linux.x64.jdk7=linux_x64_2.6
120 jprt.my.linux.x64.jdk7b107=linux_x64_2.6 125 jprt.my.linux.x64.jdk7b107=linux_x64_2.6
121 jprt.my.linux.x64.jdk7temp=linux_x64_2.6 126 jprt.my.linux.x64.jdk7temp=linux_x64_2.6
122 jprt.my.linux.x64.jdk6=linux_x64_2.4 127 jprt.my.linux.x64.jdk6=linux_x64_2.4
123 jprt.my.linux.x64.jdk6perf=linux_x64_2.4 128 jprt.my.linux.x64.jdk6perf=linux_x64_2.4
127 jprt.my.linux.x64.jdk6u20=linux_x64_2.4 132 jprt.my.linux.x64.jdk6u20=linux_x64_2.4
128 jprt.my.linux.x64.ejdk7=${jprt.my.linux.x64.jdk7} 133 jprt.my.linux.x64.ejdk7=${jprt.my.linux.x64.jdk7}
129 jprt.my.linux.x64.ejdk6=${jprt.my.linux.x64.jdk6} 134 jprt.my.linux.x64.ejdk6=${jprt.my.linux.x64.jdk6}
130 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}} 135 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
131 136
137 jprt.my.linux.ppc.jdk8=linux_ppc_2.6
132 jprt.my.linux.ppc.jdk7=linux_ppc_2.6 138 jprt.my.linux.ppc.jdk7=linux_ppc_2.6
133 jprt.my.linux.ppc.jdk7b107=linux_ppc_2.6 139 jprt.my.linux.ppc.jdk7b107=linux_ppc_2.6
134 jprt.my.linux.ppc.jdk7temp=linux_ppc_2.6 140 jprt.my.linux.ppc.jdk7temp=linux_ppc_2.6
135 jprt.my.linux.ppc.ejdk6=linux_ppc_2.6 141 jprt.my.linux.ppc.ejdk6=linux_ppc_2.6
136 jprt.my.linux.ppc.ejdk7=linux_ppc_2.6 142 jprt.my.linux.ppc.ejdk7=linux_ppc_2.6
137 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}} 143 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
138 144
145 jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
139 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6 146 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
140 jprt.my.linux.ppcv2.jdk7b107=linux_ppcv2_2.6 147 jprt.my.linux.ppcv2.jdk7b107=linux_ppcv2_2.6
141 jprt.my.linux.ppcv2.jdk7temp=linux_ppcv2_2.6 148 jprt.my.linux.ppcv2.jdk7temp=linux_ppcv2_2.6
142 jprt.my.linux.ppcv2.ejdk6=linux_ppcv2_2.6 149 jprt.my.linux.ppcv2.ejdk6=linux_ppcv2_2.6
143 jprt.my.linux.ppcv2.ejdk7=linux_ppcv2_2.6 150 jprt.my.linux.ppcv2.ejdk7=linux_ppcv2_2.6
144 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}} 151 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
145 152
153 jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
146 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6 154 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
147 jprt.my.linux.ppcsflt.jdk7b107=linux_ppcsflt_2.6 155 jprt.my.linux.ppcsflt.jdk7b107=linux_ppcsflt_2.6
148 jprt.my.linux.ppcsflt.jdk7temp=linux_ppcsflt_2.6 156 jprt.my.linux.ppcsflt.jdk7temp=linux_ppcsflt_2.6
149 jprt.my.linux.ppcsflt.ejdk6=linux_ppcsflt_2.6 157 jprt.my.linux.ppcsflt.ejdk6=linux_ppcsflt_2.6
150 jprt.my.linux.ppcsflt.ejdk7=linux_ppcsflt_2.6 158 jprt.my.linux.ppcsflt.ejdk7=linux_ppcsflt_2.6
151 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}} 159 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
152 160
161 jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
153 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6 162 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
154 jprt.my.linux.armvfp.jdk7b107=linux_armvfp_2.6 163 jprt.my.linux.armvfp.jdk7b107=linux_armvfp_2.6
155 jprt.my.linux.armvfp.jdk7temp=linux_armvfp_2.6 164 jprt.my.linux.armvfp.jdk7temp=linux_armvfp_2.6
156 jprt.my.linux.armvfp.ejdk6=linux_armvfp_2.6 165 jprt.my.linux.armvfp.ejdk6=linux_armvfp_2.6
157 jprt.my.linux.armvfp.ejdk7=linux_armvfp_2.6 166 jprt.my.linux.armvfp.ejdk7=linux_armvfp_2.6
158 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}} 167 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
159 168
169 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
160 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 170 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
161 jprt.my.linux.armsflt.jdk7b107=linux_armsflt_2.6 171 jprt.my.linux.armsflt.jdk7b107=linux_armsflt_2.6
162 jprt.my.linux.armsflt.jdk7temp=linux_armsflt_2.6 172 jprt.my.linux.armsflt.jdk7temp=linux_armsflt_2.6
163 jprt.my.linux.armsflt.ejdk6=linux_armsflt_2.6 173 jprt.my.linux.armsflt.ejdk6=linux_armsflt_2.6
164 jprt.my.linux.armsflt.ejdk7=linux_armsflt_2.6 174 jprt.my.linux.armsflt.ejdk7=linux_armsflt_2.6
165 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} 175 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
166 176
177 jprt.my.windows.i586.jdk8=windows_i586_5.1
167 jprt.my.windows.i586.jdk7=windows_i586_5.1 178 jprt.my.windows.i586.jdk7=windows_i586_5.1
168 jprt.my.windows.i586.jdk7b107=windows_i586_5.0 179 jprt.my.windows.i586.jdk7b107=windows_i586_5.0
169 jprt.my.windows.i586.jdk7temp=windows_i586_5.0 180 jprt.my.windows.i586.jdk7temp=windows_i586_5.0
170 jprt.my.windows.i586.jdk6=windows_i586_5.0 181 jprt.my.windows.i586.jdk6=windows_i586_5.0
171 jprt.my.windows.i586.jdk6perf=windows_i586_5.0 182 jprt.my.windows.i586.jdk6perf=windows_i586_5.0
175 jprt.my.windows.i586.jdk6u20=windows_i586_5.0 186 jprt.my.windows.i586.jdk6u20=windows_i586_5.0
176 jprt.my.windows.i586.ejdk7=${jprt.my.windows.i586.jdk7} 187 jprt.my.windows.i586.ejdk7=${jprt.my.windows.i586.jdk7}
177 jprt.my.windows.i586.ejdk6=${jprt.my.windows.i586.jdk6} 188 jprt.my.windows.i586.ejdk6=${jprt.my.windows.i586.jdk6}
178 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} 189 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
179 190
191 jprt.my.windows.x64.jdk8=windows_x64_5.2
180 jprt.my.windows.x64.jdk7=windows_x64_5.2 192 jprt.my.windows.x64.jdk7=windows_x64_5.2
181 jprt.my.windows.x64.jdk7b107=windows_x64_5.2 193 jprt.my.windows.x64.jdk7b107=windows_x64_5.2
182 jprt.my.windows.x64.jdk7temp=windows_x64_5.2 194 jprt.my.windows.x64.jdk7temp=windows_x64_5.2
183 jprt.my.windows.x64.jdk6=windows_x64_5.2 195 jprt.my.windows.x64.jdk6=windows_x64_5.2
184 jprt.my.windows.x64.jdk6perf=windows_x64_5.2 196 jprt.my.windows.x64.jdk6perf=windows_x64_5.2
216 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb} 228 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}
217 229
218 jprt.build.targets.all=${jprt.build.targets.standard}, \ 230 jprt.build.targets.all=${jprt.build.targets.standard}, \
219 ${jprt.build.targets.embedded}, ${jprt.build.targets.open} 231 ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
220 232
233 jprt.build.targets.jdk8=${jprt.build.targets.all}
221 jprt.build.targets.jdk7=${jprt.build.targets.all} 234 jprt.build.targets.jdk7=${jprt.build.targets.all}
222 jprt.build.targets.jdk7temp=${jprt.build.targets.all} 235 jprt.build.targets.jdk7temp=${jprt.build.targets.all}
223 jprt.build.targets.jdk7b107=${jprt.build.targets.all} 236 jprt.build.targets.jdk7b107=${jprt.build.targets.all}
224 jprt.build.targets.jdk6=${jprt.build.targets.standard} 237 jprt.build.targets.jdk6=${jprt.build.targets.standard}
225 jprt.build.targets.jdk6perf=${jprt.build.targets.standard} 238 jprt.build.targets.jdk6perf=${jprt.build.targets.standard}
492 ${jprt.my.linux.x64.test.targets}, \ 505 ${jprt.my.linux.x64.test.targets}, \
493 ${jprt.my.windows.i586.test.targets}, \ 506 ${jprt.my.windows.i586.test.targets}, \
494 ${jprt.my.windows.x64.test.targets} 507 ${jprt.my.windows.x64.test.targets}
495 508
496 509
510 jprt.test.targets.jdk8=${jprt.test.targets.standard}
497 jprt.test.targets.jdk7=${jprt.test.targets.standard} 511 jprt.test.targets.jdk7=${jprt.test.targets.standard}
498 jprt.test.targets.jdk7temp=${jprt.test.targets.standard} 512 jprt.test.targets.jdk7temp=${jprt.test.targets.standard}
499 jprt.test.targets.jdk7b105=${jprt.test.targets.standard} 513 jprt.test.targets.jdk7b105=${jprt.test.targets.standard}
500 jprt.test.targets.jdk6=${jprt.test.targets.standard} 514 jprt.test.targets.jdk6=${jprt.test.targets.standard}
501 jprt.test.targets.jdk6perf=${jprt.test.targets.standard} 515 jprt.test.targets.jdk6perf=${jprt.test.targets.standard}
532 ${jprt.make.rule.test.targets.standard.server} 546 ${jprt.make.rule.test.targets.standard.server}
533 547
534 jprt.make.rule.test.targets.embedded = \ 548 jprt.make.rule.test.targets.embedded = \
535 ${jprt.make.rule.test.targets.standard.client} 549 ${jprt.make.rule.test.targets.standard.client}
536 550
551 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
537 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard} 552 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
538 jprt.make.rule.test.targets.jdk7temp=${jprt.make.rule.test.targets.standard} 553 jprt.make.rule.test.targets.jdk7temp=${jprt.make.rule.test.targets.standard}
539 jprt.make.rule.test.targets.jdk7b107=${jprt.make.rule.test.targets.standard} 554 jprt.make.rule.test.targets.jdk7b107=${jprt.make.rule.test.targets.standard}
540 jprt.make.rule.test.targets.jdk6=${jprt.make.rule.test.targets.standard} 555 jprt.make.rule.test.targets.jdk6=${jprt.make.rule.test.targets.standard}
541 jprt.make.rule.test.targets.jdk6perf=${jprt.make.rule.test.targets.standard} 556 jprt.make.rule.test.targets.jdk6perf=${jprt.make.rule.test.targets.standard}