1.1 --- a/make/jprt.properties Thu Apr 03 16:20:16 2014 +0200
1.2 +++ b/make/jprt.properties Mon Apr 07 22:13:55 2014 -0700
1.3 @@ -33,7 +33,7 @@
1.4
1.5 # This tells jprt what default release we want to build
1.6
1.7 -jprt.hotspot.default.release=jdk8
1.8 +jprt.hotspot.default.release=jdk8u20
1.9
1.10 jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
1.11
1.12 @@ -47,70 +47,70 @@
1.13 # sparc etc.
1.14
1.15 # Define the Solaris platforms we want for the various releases
1.16 -jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
1.17 +jprt.my.solaris.sparcv9.jdk8u20=solaris_sparcv9_5.10
1.18 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
1.19 jprt.my.solaris.sparcv9.jdk7u8=${jprt.my.solaris.sparcv9.jdk7}
1.20 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
1.21
1.22 -jprt.my.solaris.x64.jdk8=solaris_x64_5.10
1.23 +jprt.my.solaris.x64.jdk8u20=solaris_x64_5.10
1.24 jprt.my.solaris.x64.jdk7=solaris_x64_5.10
1.25 jprt.my.solaris.x64.jdk7u8=${jprt.my.solaris.x64.jdk7}
1.26 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
1.27
1.28 -jprt.my.linux.i586.jdk8=linux_i586_2.6
1.29 +jprt.my.linux.i586.jdk8u20=linux_i586_2.6
1.30 jprt.my.linux.i586.jdk7=linux_i586_2.6
1.31 jprt.my.linux.i586.jdk7u8=${jprt.my.linux.i586.jdk7}
1.32 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
1.33
1.34 -jprt.my.linux.x64.jdk8=linux_x64_2.6
1.35 +jprt.my.linux.x64.jdk8u20=linux_x64_2.6
1.36 jprt.my.linux.x64.jdk7=linux_x64_2.6
1.37 jprt.my.linux.x64.jdk7u8=${jprt.my.linux.x64.jdk7}
1.38 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
1.39
1.40 -jprt.my.linux.ppc.jdk8=linux_ppc_2.6
1.41 +jprt.my.linux.ppc.jdk8u20=linux_ppc_2.6
1.42 jprt.my.linux.ppc.jdk7=linux_ppc_2.6
1.43 jprt.my.linux.ppc.jdk7u8=${jprt.my.linux.ppc.jdk7}
1.44 jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
1.45
1.46 -jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
1.47 +jprt.my.linux.ppcv2.jdk8u20=linux_ppcv2_2.6
1.48 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
1.49 jprt.my.linux.ppcv2.jdk7u8=${jprt.my.linux.ppcv2.jdk7}
1.50 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
1.51
1.52 -jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
1.53 +jprt.my.linux.ppcsflt.jdk8u20=linux_ppcsflt_2.6
1.54 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
1.55 jprt.my.linux.ppcsflt.jdk7u8=${jprt.my.linux.ppcsflt.jdk7}
1.56 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
1.57
1.58 -jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6
1.59 +jprt.my.linux.armvfpsflt.jdk8u20=linux_armvfpsflt_2.6
1.60 jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
1.61
1.62 -jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6
1.63 +jprt.my.linux.armvfphflt.jdk8u20=linux_armvfphflt_2.6
1.64 jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}}
1.65
1.66 # The ARM GP vfp-sflt build is not currently supported
1.67 -#jprt.my.linux.armvs.jdk8=linux_armvs_2.6
1.68 +#jprt.my.linux.armvs.jdk8u20=linux_armvs_2.6
1.69 #jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}}
1.70
1.71 -jprt.my.linux.armvh.jdk8=linux_armvh_2.6
1.72 +jprt.my.linux.armvh.jdk8u20=linux_armvh_2.6
1.73 jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}}
1.74
1.75 -jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
1.76 +jprt.my.linux.armsflt.jdk8u20=linux_armsflt_2.6
1.77 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
1.78 jprt.my.linux.armsflt.jdk7u8=${jprt.my.linux.armsflt.jdk7}
1.79 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
1.80
1.81 -jprt.my.macosx.x64.jdk8=macosx_x64_10.7
1.82 +jprt.my.macosx.x64.jdk8u20=macosx_x64_10.7
1.83 jprt.my.macosx.x64.jdk7=macosx_x64_10.7
1.84 jprt.my.macosx.x64.jdk7u8=${jprt.my.macosx.x64.jdk7}
1.85 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
1.86
1.87 -jprt.my.windows.i586.jdk8=windows_i586_6.1
1.88 +jprt.my.windows.i586.jdk8u20=windows_i586_6.1
1.89 jprt.my.windows.i586.jdk7=windows_i586_6.1
1.90 jprt.my.windows.i586.jdk7u8=${jprt.my.windows.i586.jdk7}
1.91 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
1.92
1.93 -jprt.my.windows.x64.jdk8=windows_x64_6.1
1.94 +jprt.my.windows.x64.jdk8u20=windows_x64_6.1
1.95 jprt.my.windows.x64.jdk7=windows_x64_6.1
1.96 jprt.my.windows.x64.jdk7u8=${jprt.my.windows.x64.jdk7}
1.97 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
1.98 @@ -143,7 +143,7 @@
1.99 jprt.build.targets.all=${jprt.build.targets.standard}, \
1.100 ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
1.101
1.102 -jprt.build.targets.jdk8=${jprt.build.targets.all}
1.103 +jprt.build.targets.jdk8u20=${jprt.build.targets.all}
1.104 jprt.build.targets.jdk7=${jprt.build.targets.all}
1.105 jprt.build.targets.jdk7u8=${jprt.build.targets.all}
1.106 jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
1.107 @@ -349,7 +349,7 @@
1.108 ${jprt.my.windows.i586.test.targets}, \
1.109 ${jprt.my.windows.x64.test.targets}
1.110
1.111 -jprt.test.targets.jdk8=${jprt.test.targets.standard}
1.112 +jprt.test.targets.jdk8u20=${jprt.test.targets.standard}
1.113 jprt.test.targets.jdk7=${jprt.test.targets.standard}
1.114 jprt.test.targets.jdk7u8=${jprt.test.targets.jdk7}
1.115 jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
1.116 @@ -399,7 +399,7 @@
1.117 jprt.make.rule.test.targets.embedded = \
1.118 ${jprt.make.rule.test.targets.standard.client}
1.119
1.120 -jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
1.121 +jprt.make.rule.test.targets.jdk8u20=${jprt.make.rule.test.targets.standard}
1.122 jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
1.123 jprt.make.rule.test.targets.jdk7u8=${jprt.make.rule.test.targets.jdk7}
1.124 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
