comparison make/jprt.properties @ 6137:829ee34e7cbd

Merge
author kvn
date Mon, 11 Jun 2012 08:35:28 -0700
parents 4434fdad6b37 7bc2d5136f54
children f7baf26515fc
comparison
equal deleted inserted replaced
6122:063451aefde8 6137:829ee34e7cbd
52 # sparc etc. 52 # sparc etc.
53 53
54 # Define the Solaris platforms we want for the various releases 54 # Define the Solaris platforms we want for the various releases
55 jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10 55 jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
56 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10 56 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
57 jprt.my.solaris.sparc.jdk7u4=${jprt.my.solaris.sparc.jdk7} 57 jprt.my.solaris.sparc.jdk7u6=${jprt.my.solaris.sparc.jdk7}
58 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}} 58 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
59 59
60 jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10 60 jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
61 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10 61 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
62 jprt.my.solaris.sparcv9.jdk7u4=${jprt.my.solaris.sparcv9.jdk7} 62 jprt.my.solaris.sparcv9.jdk7u6=${jprt.my.solaris.sparcv9.jdk7}
63 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}} 63 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
64 64
65 jprt.my.solaris.i586.jdk8=solaris_i586_5.10 65 jprt.my.solaris.i586.jdk8=solaris_i586_5.10
66 jprt.my.solaris.i586.jdk7=solaris_i586_5.10 66 jprt.my.solaris.i586.jdk7=solaris_i586_5.10
67 jprt.my.solaris.i586.jdk7u4=${jprt.my.solaris.i586.jdk7} 67 jprt.my.solaris.i586.jdk7u6=${jprt.my.solaris.i586.jdk7}
68 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}} 68 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
69 69
70 jprt.my.solaris.x64.jdk8=solaris_x64_5.10 70 jprt.my.solaris.x64.jdk8=solaris_x64_5.10
71 jprt.my.solaris.x64.jdk7=solaris_x64_5.10 71 jprt.my.solaris.x64.jdk7=solaris_x64_5.10
72 jprt.my.solaris.x64.jdk7u4=${jprt.my.solaris.x64.jdk7} 72 jprt.my.solaris.x64.jdk7u6=${jprt.my.solaris.x64.jdk7}
73 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} 73 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
74 74
75 jprt.my.linux.i586.jdk8=linux_i586_2.6 75 jprt.my.linux.i586.jdk8=linux_i586_2.6
76 jprt.my.linux.i586.jdk7=linux_i586_2.6 76 jprt.my.linux.i586.jdk7=linux_i586_2.6
77 jprt.my.linux.i586.jdk7u4=${jprt.my.linux.i586.jdk7} 77 jprt.my.linux.i586.jdk7u6=${jprt.my.linux.i586.jdk7}
78 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}} 78 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
79 79
80 jprt.my.linux.x64.jdk8=linux_x64_2.6 80 jprt.my.linux.x64.jdk8=linux_x64_2.6
81 jprt.my.linux.x64.jdk7=linux_x64_2.6 81 jprt.my.linux.x64.jdk7=linux_x64_2.6
82 jprt.my.linux.x64.jdk7u4=${jprt.my.linux.x64.jdk7} 82 jprt.my.linux.x64.jdk7u6=${jprt.my.linux.x64.jdk7}
83 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}} 83 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
84 84
85 jprt.my.linux.ppc.jdk8=linux_ppc_2.6 85 jprt.my.linux.ppc.jdk8=linux_ppc_2.6
86 jprt.my.linux.ppc.jdk7=linux_ppc_2.6 86 jprt.my.linux.ppc.jdk7=linux_ppc_2.6
87 jprt.my.linux.ppc.jdk7u4=${jprt.my.linux.ppc.jdk7} 87 jprt.my.linux.ppc.jdk7u6=${jprt.my.linux.ppc.jdk7}
88 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}} 88 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
89 89
90 jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6 90 jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
91 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6 91 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
92 jprt.my.linux.ppcv2.jdk7u4=${jprt.my.linux.ppcv2.jdk7} 92 jprt.my.linux.ppcv2.jdk7u6=${jprt.my.linux.ppcv2.jdk7}
93 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}} 93 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
94 94
95 jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6 95 jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
96 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6 96 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
97 jprt.my.linux.ppcsflt.jdk7u4=${jprt.my.linux.ppcsflt.jdk7} 97 jprt.my.linux.ppcsflt.jdk7u6=${jprt.my.linux.ppcsflt.jdk7}
98 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}} 98 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
99 99
100 jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6 100 jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
101 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6 101 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
102 jprt.my.linux.armvfp.jdk7u4=${jprt.my.linux.armvfp.jdk7} 102 jprt.my.linux.armvfp.jdk7u6=${jprt.my.linux.armvfp.jdk7}
103 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}} 103 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
104 104
105 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6 105 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
106 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 106 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
107 jprt.my.linux.armsflt.jdk7u4=${jprt.my.linux.armsflt.jdk7} 107 jprt.my.linux.armsflt.jdk7u6=${jprt.my.linux.armsflt.jdk7}
108 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} 108 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
109 109
110 jprt.my.macosx.x64.jdk8=macosx_x64_10.7 110 jprt.my.macosx.x64.jdk8=macosx_x64_10.7
111 jprt.my.macosx.x64.jdk7=macosx_x64_10.7 111 jprt.my.macosx.x64.jdk7=macosx_x64_10.7
112 jprt.my.macosx.x64.jdk7u4=${jprt.my.macosx.x64.jdk7} 112 jprt.my.macosx.x64.jdk7u6=${jprt.my.macosx.x64.jdk7}
113 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} 113 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
114 114
115 jprt.my.windows.i586.jdk8=windows_i586_5.1 115 jprt.my.windows.i586.jdk8=windows_i586_5.1
116 jprt.my.windows.i586.jdk7=windows_i586_5.1 116 jprt.my.windows.i586.jdk7=windows_i586_5.1
117 jprt.my.windows.i586.jdk7u4=${jprt.my.windows.i586.jdk7} 117 jprt.my.windows.i586.jdk7u6=${jprt.my.windows.i586.jdk7}
118 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} 118 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
119 119
120 jprt.my.windows.x64.jdk8=windows_x64_5.2 120 jprt.my.windows.x64.jdk8=windows_x64_5.2
121 jprt.my.windows.x64.jdk7=windows_x64_5.2 121 jprt.my.windows.x64.jdk7=windows_x64_5.2
122 jprt.my.windows.x64.jdk7u4=${jprt.my.windows.x64.jdk7} 122 jprt.my.windows.x64.jdk7u6=${jprt.my.windows.x64.jdk7}
123 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}} 123 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
124 124
125 # Standard list of jprt build targets for this source tree 125 # Standard list of jprt build targets for this source tree
126 126
127 jprt.build.targets.standard= \ 127 jprt.build.targets.standard= \
152 jprt.build.targets.all=${jprt.build.targets.standard}, \ 152 jprt.build.targets.all=${jprt.build.targets.standard}, \
153 ${jprt.build.targets.embedded}, ${jprt.build.targets.open} 153 ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
154 154
155 jprt.build.targets.jdk8=${jprt.build.targets.all} 155 jprt.build.targets.jdk8=${jprt.build.targets.all}
156 jprt.build.targets.jdk7=${jprt.build.targets.all} 156 jprt.build.targets.jdk7=${jprt.build.targets.all}
157 jprt.build.targets.jdk7u4=${jprt.build.targets.all} 157 jprt.build.targets.jdk7u6=${jprt.build.targets.all}
158 jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}} 158 jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
159 159
160 # Subset lists of test targets for this source tree 160 # Subset lists of test targets for this source tree
161 161
162 jprt.my.solaris.sparc.test.targets= \ 162 jprt.my.solaris.sparc.test.targets= \
445 ${jprt.my.windows.x64.test.targets} 445 ${jprt.my.windows.x64.test.targets}
446 446
447 447
448 jprt.test.targets.jdk8=${jprt.test.targets.standard} 448 jprt.test.targets.jdk8=${jprt.test.targets.standard}
449 jprt.test.targets.jdk7=${jprt.test.targets.standard} 449 jprt.test.targets.jdk7=${jprt.test.targets.standard}
450 jprt.test.targets.jdk7u4=${jprt.test.targets.jdk7} 450 jprt.test.targets.jdk7u6=${jprt.test.targets.jdk7}
451 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}} 451 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
452 452
453 # The default test/Makefile targets that should be run 453 # The default test/Makefile targets that should be run
454 454
455 #jprt.make.rule.test.targets=*-product-*-packtest 455 #jprt.make.rule.test.targets=*-product-*-packtest
505 jprt.make.rule.test.targets.embedded = \ 505 jprt.make.rule.test.targets.embedded = \
506 ${jprt.make.rule.test.targets.standard.client} 506 ${jprt.make.rule.test.targets.standard.client}
507 507
508 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard} 508 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
509 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard} 509 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
510 jprt.make.rule.test.targets.jdk7u4=${jprt.make.rule.test.targets.jdk7} 510 jprt.make.rule.test.targets.jdk7u6=${jprt.make.rule.test.targets.jdk7}
511 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}} 511 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
512 512
513 # 7155453: Work-around to prevent popups on OSX from blocking test completion 513 # 7155453: Work-around to prevent popups on OSX from blocking test completion
514 # but the work-around is added to all platforms to be consistent 514 # but the work-around is added to all platforms to be consistent
515 jprt.jbb.options=-Djava.awt.headless=true 515 jprt.jbb.options=-Djava.awt.headless=true