comparison make/jprt.properties @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents cb1b723cbca8
children 43aa571c1131
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
31 # and will be one of the official release names defined in jprt. 31 # and will be one of the official release names defined in jprt.
32 # jprt supports property value expansion using ${property.name} syntax. 32 # jprt supports property value expansion using ${property.name} syntax.
33 33
34 # This tells jprt what default release we want to build 34 # This tells jprt what default release we want to build
35 35
36 jprt.hotspot.default.release=jdk8 36 jprt.hotspot.default.release=jdk8u20
37 37
38 jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}} 38 jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
39 39
40 # Disable syncing the source after builds and tests are done. 40 # Disable syncing the source after builds and tests are done.
41 41
45 # all platforms so that regressions are not introduced (eg. change to 45 # all platforms so that regressions are not introduced (eg. change to
46 # common code by SE breaks PPC/ARM; change to common code by SE-E breaks 46 # common code by SE breaks PPC/ARM; change to common code by SE-E breaks
47 # sparc etc. 47 # sparc etc.
48 48
49 # Define the Solaris platforms we want for the various releases 49 # Define the Solaris platforms we want for the various releases
50 jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10 50 jprt.my.solaris.sparcv9.jdk8u20=solaris_sparcv9_5.10
51 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10 51 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
52 jprt.my.solaris.sparcv9.jdk7u8=${jprt.my.solaris.sparcv9.jdk7} 52 jprt.my.solaris.sparcv9.jdk7u8=${jprt.my.solaris.sparcv9.jdk7}
53 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}} 53 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
54 54
55 jprt.my.solaris.x64.jdk8=solaris_x64_5.10 55 jprt.my.solaris.x64.jdk8u20=solaris_x64_5.10
56 jprt.my.solaris.x64.jdk7=solaris_x64_5.10 56 jprt.my.solaris.x64.jdk7=solaris_x64_5.10
57 jprt.my.solaris.x64.jdk7u8=${jprt.my.solaris.x64.jdk7} 57 jprt.my.solaris.x64.jdk7u8=${jprt.my.solaris.x64.jdk7}
58 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} 58 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
59 59
60 jprt.my.linux.i586.jdk8=linux_i586_2.6 60 jprt.my.linux.i586.jdk8u20=linux_i586_2.6
61 jprt.my.linux.i586.jdk7=linux_i586_2.6 61 jprt.my.linux.i586.jdk7=linux_i586_2.6
62 jprt.my.linux.i586.jdk7u8=${jprt.my.linux.i586.jdk7} 62 jprt.my.linux.i586.jdk7u8=${jprt.my.linux.i586.jdk7}
63 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}} 63 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
64 64
65 jprt.my.linux.x64.jdk8=linux_x64_2.6 65 jprt.my.linux.x64.jdk8u20=linux_x64_2.6
66 jprt.my.linux.x64.jdk7=linux_x64_2.6 66 jprt.my.linux.x64.jdk7=linux_x64_2.6
67 jprt.my.linux.x64.jdk7u8=${jprt.my.linux.x64.jdk7} 67 jprt.my.linux.x64.jdk7u8=${jprt.my.linux.x64.jdk7}
68 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}} 68 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
69 69
70 jprt.my.linux.ppc.jdk8=linux_ppc_2.6 70 jprt.my.linux.ppc.jdk8u20=linux_ppc_2.6
71 jprt.my.linux.ppc.jdk7=linux_ppc_2.6 71 jprt.my.linux.ppc.jdk7=linux_ppc_2.6
72 jprt.my.linux.ppc.jdk7u8=${jprt.my.linux.ppc.jdk7} 72 jprt.my.linux.ppc.jdk7u8=${jprt.my.linux.ppc.jdk7}
73 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}} 73 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
74 74
75 jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6 75 jprt.my.linux.ppcv2.jdk8u20=linux_ppcv2_2.6
76 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6 76 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
77 jprt.my.linux.ppcv2.jdk7u8=${jprt.my.linux.ppcv2.jdk7} 77 jprt.my.linux.ppcv2.jdk7u8=${jprt.my.linux.ppcv2.jdk7}
78 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}} 78 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
79 79
80 jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6 80 jprt.my.linux.armvfpsflt.jdk8u20=linux_armvfpsflt_2.6
81 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
82 jprt.my.linux.ppcsflt.jdk7u8=${jprt.my.linux.ppcsflt.jdk7}
83 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
84
85 jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6
86 jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}} 81 jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
87 82
88 jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6 83 jprt.my.linux.armvfphflt.jdk8u20=linux_armvfphflt_2.6
89 jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}} 84 jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}}
90 85
91 # The ARM GP vfp-sflt build is not currently supported 86 # The ARM GP vfp-sflt build is not currently supported
92 #jprt.my.linux.armvs.jdk8=linux_armvs_2.6 87 #jprt.my.linux.armvs.jdk8u20=linux_armvs_2.6
93 #jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}} 88 #jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}}
94 89
95 jprt.my.linux.armvh.jdk8=linux_armvh_2.6 90 jprt.my.linux.armvh.jdk8u20=linux_armvh_2.6
96 jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}} 91 jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}}
97 92
98 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6 93 jprt.my.linux.armsflt.jdk8u20=linux_armsflt_2.6
99 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 94 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
100 jprt.my.linux.armsflt.jdk7u8=${jprt.my.linux.armsflt.jdk7} 95 jprt.my.linux.armsflt.jdk7u8=${jprt.my.linux.armsflt.jdk7}
101 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} 96 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
102 97
103 jprt.my.macosx.x64.jdk8=macosx_x64_10.7 98 jprt.my.macosx.x64.jdk8u20=macosx_x64_10.7
104 jprt.my.macosx.x64.jdk7=macosx_x64_10.7 99 jprt.my.macosx.x64.jdk7=macosx_x64_10.7
105 jprt.my.macosx.x64.jdk7u8=${jprt.my.macosx.x64.jdk7} 100 jprt.my.macosx.x64.jdk7u8=${jprt.my.macosx.x64.jdk7}
106 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} 101 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
107 102
108 jprt.my.windows.i586.jdk8=windows_i586_6.1 103 jprt.my.windows.i586.jdk8u20=windows_i586_6.1
109 jprt.my.windows.i586.jdk7=windows_i586_6.1 104 jprt.my.windows.i586.jdk7=windows_i586_6.1
110 jprt.my.windows.i586.jdk7u8=${jprt.my.windows.i586.jdk7} 105 jprt.my.windows.i586.jdk7u8=${jprt.my.windows.i586.jdk7}
111 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} 106 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
112 107
113 jprt.my.windows.x64.jdk8=windows_x64_6.1 108 jprt.my.windows.x64.jdk8u20=windows_x64_6.1
114 jprt.my.windows.x64.jdk7=windows_x64_6.1 109 jprt.my.windows.x64.jdk7=windows_x64_6.1
115 jprt.my.windows.x64.jdk7u8=${jprt.my.windows.x64.jdk7} 110 jprt.my.windows.x64.jdk7u8=${jprt.my.windows.x64.jdk7}
116 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}} 111 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
117 112
118 # Standard list of jprt build targets for this source tree 113 # Standard list of jprt build targets for this source tree
133 128
134 jprt.build.targets.embedded= \ 129 jprt.build.targets.embedded= \
135 ${jprt.my.linux.i586}-{productEmb|fastdebugEmb}, \ 130 ${jprt.my.linux.i586}-{productEmb|fastdebugEmb}, \
136 ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \ 131 ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \
137 ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \ 132 ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \
138 ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \
139 ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \ 133 ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \
140 ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}, \ 134 ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}, \
141 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb} 135 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}
142 136
143 jprt.build.targets.all=${jprt.build.targets.standard}, \ 137 jprt.build.targets.all=${jprt.build.targets.standard}, \
144 ${jprt.build.targets.embedded}, ${jprt.build.targets.open} 138 ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
145 139
146 jprt.build.targets.jdk8=${jprt.build.targets.all} 140 jprt.build.targets.jdk8u20=${jprt.build.targets.all}
147 jprt.build.targets.jdk7=${jprt.build.targets.all} 141 jprt.build.targets.jdk7=${jprt.build.targets.all}
148 jprt.build.targets.jdk7u8=${jprt.build.targets.all} 142 jprt.build.targets.jdk7u8=${jprt.build.targets.all}
149 jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}} 143 jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
150 144
151 # Subset lists of test targets for this source tree 145 # Subset lists of test targets for this source tree
347 ${jprt.my.solaris.x64.test.targets}, \ 341 ${jprt.my.solaris.x64.test.targets}, \
348 ${jprt.my.linux.x64.test.targets}, \ 342 ${jprt.my.linux.x64.test.targets}, \
349 ${jprt.my.windows.i586.test.targets}, \ 343 ${jprt.my.windows.i586.test.targets}, \
350 ${jprt.my.windows.x64.test.targets} 344 ${jprt.my.windows.x64.test.targets}
351 345
352 jprt.test.targets.jdk8=${jprt.test.targets.standard} 346 jprt.test.targets.jdk8u20=${jprt.test.targets.standard}
353 jprt.test.targets.jdk7=${jprt.test.targets.standard} 347 jprt.test.targets.jdk7=${jprt.test.targets.standard}
354 jprt.test.targets.jdk7u8=${jprt.test.targets.jdk7} 348 jprt.test.targets.jdk7u8=${jprt.test.targets.jdk7}
355 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}} 349 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
356 350
357 # The default test/Makefile targets that should be run 351 # The default test/Makefile targets that should be run
397 ${jprt.make.rule.test.targets.standard.wbapi} 391 ${jprt.make.rule.test.targets.standard.wbapi}
398 392
399 jprt.make.rule.test.targets.embedded = \ 393 jprt.make.rule.test.targets.embedded = \
400 ${jprt.make.rule.test.targets.standard.client} 394 ${jprt.make.rule.test.targets.standard.client}
401 395
402 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard} 396 jprt.make.rule.test.targets.jdk8u20=${jprt.make.rule.test.targets.standard}
403 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard} 397 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
404 jprt.make.rule.test.targets.jdk7u8=${jprt.make.rule.test.targets.jdk7} 398 jprt.make.rule.test.targets.jdk7u8=${jprt.make.rule.test.targets.jdk7}
405 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}} 399 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
406 400
407 # 7155453: Work-around to prevent popups on OSX from blocking test completion 401 # 7155453: Work-around to prevent popups on OSX from blocking test completion