1.1 --- a/make/jprt.properties Fri Jun 08 09:49:49 2012 -0700
1.2 +++ b/make/jprt.properties Mon Jun 11 08:35:28 2012 -0700
1.3 @@ -54,72 +54,72 @@
1.4 # Define the Solaris platforms we want for the various releases
1.5 jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
1.6 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
1.7 -jprt.my.solaris.sparc.jdk7u4=${jprt.my.solaris.sparc.jdk7}
1.8 +jprt.my.solaris.sparc.jdk7u6=${jprt.my.solaris.sparc.jdk7}
1.9 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
1.10
1.11 jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
1.12 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
1.13 -jprt.my.solaris.sparcv9.jdk7u4=${jprt.my.solaris.sparcv9.jdk7}
1.14 +jprt.my.solaris.sparcv9.jdk7u6=${jprt.my.solaris.sparcv9.jdk7}
1.15 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
1.16
1.17 jprt.my.solaris.i586.jdk8=solaris_i586_5.10
1.18 jprt.my.solaris.i586.jdk7=solaris_i586_5.10
1.19 -jprt.my.solaris.i586.jdk7u4=${jprt.my.solaris.i586.jdk7}
1.20 +jprt.my.solaris.i586.jdk7u6=${jprt.my.solaris.i586.jdk7}
1.21 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
1.22
1.23 jprt.my.solaris.x64.jdk8=solaris_x64_5.10
1.24 jprt.my.solaris.x64.jdk7=solaris_x64_5.10
1.25 -jprt.my.solaris.x64.jdk7u4=${jprt.my.solaris.x64.jdk7}
1.26 +jprt.my.solaris.x64.jdk7u6=${jprt.my.solaris.x64.jdk7}
1.27 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
1.28
1.29 jprt.my.linux.i586.jdk8=linux_i586_2.6
1.30 jprt.my.linux.i586.jdk7=linux_i586_2.6
1.31 -jprt.my.linux.i586.jdk7u4=${jprt.my.linux.i586.jdk7}
1.32 +jprt.my.linux.i586.jdk7u6=${jprt.my.linux.i586.jdk7}
1.33 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
1.34
1.35 jprt.my.linux.x64.jdk8=linux_x64_2.6
1.36 jprt.my.linux.x64.jdk7=linux_x64_2.6
1.37 -jprt.my.linux.x64.jdk7u4=${jprt.my.linux.x64.jdk7}
1.38 +jprt.my.linux.x64.jdk7u6=${jprt.my.linux.x64.jdk7}
1.39 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
1.40
1.41 jprt.my.linux.ppc.jdk8=linux_ppc_2.6
1.42 jprt.my.linux.ppc.jdk7=linux_ppc_2.6
1.43 -jprt.my.linux.ppc.jdk7u4=${jprt.my.linux.ppc.jdk7}
1.44 +jprt.my.linux.ppc.jdk7u6=${jprt.my.linux.ppc.jdk7}
1.45 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
1.46
1.47 jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
1.48 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
1.49 -jprt.my.linux.ppcv2.jdk7u4=${jprt.my.linux.ppcv2.jdk7}
1.50 +jprt.my.linux.ppcv2.jdk7u6=${jprt.my.linux.ppcv2.jdk7}
1.51 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
1.52
1.53 jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
1.54 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
1.55 -jprt.my.linux.ppcsflt.jdk7u4=${jprt.my.linux.ppcsflt.jdk7}
1.56 +jprt.my.linux.ppcsflt.jdk7u6=${jprt.my.linux.ppcsflt.jdk7}
1.57 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
1.58
1.59 jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
1.60 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
1.61 -jprt.my.linux.armvfp.jdk7u4=${jprt.my.linux.armvfp.jdk7}
1.62 +jprt.my.linux.armvfp.jdk7u6=${jprt.my.linux.armvfp.jdk7}
1.63 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
1.64
1.65 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
1.66 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
1.67 -jprt.my.linux.armsflt.jdk7u4=${jprt.my.linux.armsflt.jdk7}
1.68 +jprt.my.linux.armsflt.jdk7u6=${jprt.my.linux.armsflt.jdk7}
1.69 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
1.70
1.71 jprt.my.macosx.x64.jdk8=macosx_x64_10.7
1.72 jprt.my.macosx.x64.jdk7=macosx_x64_10.7
1.73 -jprt.my.macosx.x64.jdk7u4=${jprt.my.macosx.x64.jdk7}
1.74 +jprt.my.macosx.x64.jdk7u6=${jprt.my.macosx.x64.jdk7}
1.75 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
1.76
1.77 jprt.my.windows.i586.jdk8=windows_i586_5.1
1.78 jprt.my.windows.i586.jdk7=windows_i586_5.1
1.79 -jprt.my.windows.i586.jdk7u4=${jprt.my.windows.i586.jdk7}
1.80 +jprt.my.windows.i586.jdk7u6=${jprt.my.windows.i586.jdk7}
1.81 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
1.82
1.83 jprt.my.windows.x64.jdk8=windows_x64_5.2
1.84 jprt.my.windows.x64.jdk7=windows_x64_5.2
1.85 -jprt.my.windows.x64.jdk7u4=${jprt.my.windows.x64.jdk7}
1.86 +jprt.my.windows.x64.jdk7u6=${jprt.my.windows.x64.jdk7}
1.87 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
1.88
1.89 # Standard list of jprt build targets for this source tree
1.90 @@ -154,7 +154,7 @@
1.91
1.92 jprt.build.targets.jdk8=${jprt.build.targets.all}
1.93 jprt.build.targets.jdk7=${jprt.build.targets.all}
1.94 -jprt.build.targets.jdk7u4=${jprt.build.targets.all}
1.95 +jprt.build.targets.jdk7u6=${jprt.build.targets.all}
1.96 jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
1.97
1.98 # Subset lists of test targets for this source tree
1.99 @@ -447,7 +447,7 @@
1.100
1.101 jprt.test.targets.jdk8=${jprt.test.targets.standard}
1.102 jprt.test.targets.jdk7=${jprt.test.targets.standard}
1.103 -jprt.test.targets.jdk7u4=${jprt.test.targets.jdk7}
1.104 +jprt.test.targets.jdk7u6=${jprt.test.targets.jdk7}
1.105 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
1.106
1.107 # The default test/Makefile targets that should be run
1.108 @@ -507,7 +507,7 @@
1.109
1.110 jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
1.111 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
1.112 -jprt.make.rule.test.targets.jdk7u4=${jprt.make.rule.test.targets.jdk7}
1.113 +jprt.make.rule.test.targets.jdk7u6=${jprt.make.rule.test.targets.jdk7}
1.114 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
1.115
1.116 # 7155453: Work-around to prevent popups on OSX from blocking test completion
