comparison make/jprt.properties @ 17842:3ef5c627634a

8039392: Make jdk8u20 the default jprt release for hs25.20 Reviewed-by: kvn, dholmes
author amurillo
date Mon, 07 Apr 2014 22:13:55 -0700
parents 23262dd70c13
children cb1b723cbca8
comparison
equal deleted inserted replaced
17841:14bd75c9dbfa 17842:3ef5c627634a
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.ppcsflt.jdk8u20=linux_ppcsflt_2.6
81 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6 81 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
82 jprt.my.linux.ppcsflt.jdk7u8=${jprt.my.linux.ppcsflt.jdk7} 82 jprt.my.linux.ppcsflt.jdk7u8=${jprt.my.linux.ppcsflt.jdk7}
83 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}} 83 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
84 84
85 jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6 85 jprt.my.linux.armvfpsflt.jdk8u20=linux_armvfpsflt_2.6
86 jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}} 86 jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
87 87
88 jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6 88 jprt.my.linux.armvfphflt.jdk8u20=linux_armvfphflt_2.6
89 jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}} 89 jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}}
90 90
91 # The ARM GP vfp-sflt build is not currently supported 91 # The ARM GP vfp-sflt build is not currently supported
92 #jprt.my.linux.armvs.jdk8=linux_armvs_2.6 92 #jprt.my.linux.armvs.jdk8u20=linux_armvs_2.6
93 #jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}} 93 #jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}}
94 94
95 jprt.my.linux.armvh.jdk8=linux_armvh_2.6 95 jprt.my.linux.armvh.jdk8u20=linux_armvh_2.6
96 jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}} 96 jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}}
97 97
98 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6 98 jprt.my.linux.armsflt.jdk8u20=linux_armsflt_2.6
99 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 99 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
100 jprt.my.linux.armsflt.jdk7u8=${jprt.my.linux.armsflt.jdk7} 100 jprt.my.linux.armsflt.jdk7u8=${jprt.my.linux.armsflt.jdk7}
101 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} 101 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
102 102
103 jprt.my.macosx.x64.jdk8=macosx_x64_10.7 103 jprt.my.macosx.x64.jdk8u20=macosx_x64_10.7
104 jprt.my.macosx.x64.jdk7=macosx_x64_10.7 104 jprt.my.macosx.x64.jdk7=macosx_x64_10.7
105 jprt.my.macosx.x64.jdk7u8=${jprt.my.macosx.x64.jdk7} 105 jprt.my.macosx.x64.jdk7u8=${jprt.my.macosx.x64.jdk7}
106 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} 106 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
107 107
108 jprt.my.windows.i586.jdk8=windows_i586_6.1 108 jprt.my.windows.i586.jdk8u20=windows_i586_6.1
109 jprt.my.windows.i586.jdk7=windows_i586_6.1 109 jprt.my.windows.i586.jdk7=windows_i586_6.1
110 jprt.my.windows.i586.jdk7u8=${jprt.my.windows.i586.jdk7} 110 jprt.my.windows.i586.jdk7u8=${jprt.my.windows.i586.jdk7}
111 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} 111 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
112 112
113 jprt.my.windows.x64.jdk8=windows_x64_6.1 113 jprt.my.windows.x64.jdk8u20=windows_x64_6.1
114 jprt.my.windows.x64.jdk7=windows_x64_6.1 114 jprt.my.windows.x64.jdk7=windows_x64_6.1
115 jprt.my.windows.x64.jdk7u8=${jprt.my.windows.x64.jdk7} 115 jprt.my.windows.x64.jdk7u8=${jprt.my.windows.x64.jdk7}
116 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}} 116 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
117 117
118 # Standard list of jprt build targets for this source tree 118 # Standard list of jprt build targets for this source tree
141 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb} 141 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}
142 142
143 jprt.build.targets.all=${jprt.build.targets.standard}, \ 143 jprt.build.targets.all=${jprt.build.targets.standard}, \
144 ${jprt.build.targets.embedded}, ${jprt.build.targets.open} 144 ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
145 145
146 jprt.build.targets.jdk8=${jprt.build.targets.all} 146 jprt.build.targets.jdk8u20=${jprt.build.targets.all}
147 jprt.build.targets.jdk7=${jprt.build.targets.all} 147 jprt.build.targets.jdk7=${jprt.build.targets.all}
148 jprt.build.targets.jdk7u8=${jprt.build.targets.all} 148 jprt.build.targets.jdk7u8=${jprt.build.targets.all}
149 jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}} 149 jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
150 150
151 # Subset lists of test targets for this source tree 151 # Subset lists of test targets for this source tree
347 ${jprt.my.solaris.x64.test.targets}, \ 347 ${jprt.my.solaris.x64.test.targets}, \
348 ${jprt.my.linux.x64.test.targets}, \ 348 ${jprt.my.linux.x64.test.targets}, \
349 ${jprt.my.windows.i586.test.targets}, \ 349 ${jprt.my.windows.i586.test.targets}, \
350 ${jprt.my.windows.x64.test.targets} 350 ${jprt.my.windows.x64.test.targets}
351 351
352 jprt.test.targets.jdk8=${jprt.test.targets.standard} 352 jprt.test.targets.jdk8u20=${jprt.test.targets.standard}
353 jprt.test.targets.jdk7=${jprt.test.targets.standard} 353 jprt.test.targets.jdk7=${jprt.test.targets.standard}
354 jprt.test.targets.jdk7u8=${jprt.test.targets.jdk7} 354 jprt.test.targets.jdk7u8=${jprt.test.targets.jdk7}
355 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}} 355 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
356 356
357 # The default test/Makefile targets that should be run 357 # The default test/Makefile targets that should be run
397 ${jprt.make.rule.test.targets.standard.wbapi} 397 ${jprt.make.rule.test.targets.standard.wbapi}
398 398
399 jprt.make.rule.test.targets.embedded = \ 399 jprt.make.rule.test.targets.embedded = \
400 ${jprt.make.rule.test.targets.standard.client} 400 ${jprt.make.rule.test.targets.standard.client}
401 401
402 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard} 402 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} 403 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} 404 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}} 405 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
406 406
407 # 7155453: Work-around to prevent popups on OSX from blocking test completion 407 # 7155453: Work-around to prevent popups on OSX from blocking test completion