1.1 --- a/make/jprt.properties Mon Jan 23 17:45:32 2012 -0800 1.2 +++ b/make/jprt.properties Tue Jan 24 14:07:03 2012 -0500 1.3 @@ -174,6 +174,10 @@ 1.4 jprt.my.linux.armsflt.ejdk7=linux_armsflt_2.6 1.5 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} 1.6 1.7 +jprt.my.macosx.x64.jdk8=macosx_x64_10.7 1.8 +jprt.my.macosx.x64.jdk7=macosx_x64_10.7 1.9 +jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} 1.10 + 1.11 jprt.my.windows.i586.jdk8=windows_i586_5.1 1.12 jprt.my.windows.i586.jdk7=windows_i586_5.1 1.13 jprt.my.windows.i586.jdk7b107=windows_i586_5.0 1.14 @@ -211,6 +215,7 @@ 1.15 ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \ 1.16 ${jprt.my.linux.i586}-{product|fastdebug|debug}, \ 1.17 ${jprt.my.linux.x64}-{product|fastdebug}, \ 1.18 + ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \ 1.19 ${jprt.my.windows.i586}-{product|fastdebug|debug}, \ 1.20 ${jprt.my.windows.x64}-{product|fastdebug|debug} 1.21 1.22 @@ -416,6 +421,30 @@ 1.23 ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_G1, \ 1.24 ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParOldGC 1.25 1.26 +jprt.my.macosx.x64.test.targets = \ 1.27 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98, \ 1.28 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98_nontiered, \ 1.29 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-scimark, \ 1.30 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_default, \ 1.31 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \ 1.32 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \ 1.33 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \ 1.34 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_CMS, \ 1.35 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_G1, \ 1.36 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \ 1.37 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_default, \ 1.38 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \ 1.39 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \ 1.40 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \ 1.41 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \ 1.42 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \ 1.43 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC \ 1.44 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \ 1.45 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_tiered, \ 1.46 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \ 1.47 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \ 1.48 + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC 1.49 + 1.50 jprt.my.windows.i586.test.targets = \ 1.51 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ 1.52 ${jprt.my.windows.i586}-{product|fastdebug}-c2-jvm98_nontiered, \ 1.53 @@ -492,6 +521,7 @@ 1.54 ${jprt.my.solaris.x64.test.targets}, \ 1.55 ${jprt.my.linux.i586.test.targets}, \ 1.56 ${jprt.my.linux.x64.test.targets}, \ 1.57 + ${jprt.my.macosx.x64.test.targets}, \ 1.58 ${jprt.my.windows.i586.test.targets}, \ 1.59 ${jprt.my.windows.x64.test.targets}, \ 1.60 ${jprt.test.targets.open} 1.61 @@ -538,6 +568,7 @@ 1.62 ${jprt.my.solaris.x64}-*-c2-servertest, \ 1.63 ${jprt.my.linux.i586}-*-c2-servertest, \ 1.64 ${jprt.my.linux.x64}-*-c2-servertest, \ 1.65 + ${jprt.my.macosx.x64}-*-c2-servertest, \ 1.66 ${jprt.my.windows.i586}-*-c2-servertest, \ 1.67 ${jprt.my.windows.x64}-*-c2-servertest 1.68 1.69 @@ -548,6 +579,7 @@ 1.70 ${jprt.my.solaris.x64}-fastdebug-c2-internalvmtests, \ 1.71 ${jprt.my.linux.i586}-fastdebug-c2-internalvmtests, \ 1.72 ${jprt.my.linux.x64}-fastdebug-c2-internalvmtests, \ 1.73 + ${jprt.my.macosx.x64}-fastdebug-c2-internalvmtests, \ 1.74 ${jprt.my.windows.i586}-fastdebug-c2-internalvmtests, \ 1.75 ${jprt.my.windows.x64}-fastdebug-c2-internalvmtests 1.76