*** old/make/jprt.properties	Tue Apr  9 15:29:58 2013
--- new/make/jprt.properties	Tue Apr  9 15:29:57 2013

*** 131,158 ****
--- 131,158 ----
  jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
  
  # Standard list of jprt build targets for this source tree
  
  jprt.build.targets.standard= \
-     ${jprt.my.solaris.sparc}-{product|fastdebug|debug}, \
-     ${jprt.my.solaris.sparcv9}-{product|fastdebug|debug}, \
-     ${jprt.my.solaris.i586}-{product|fastdebug|debug}, \
-     ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \
-     ${jprt.my.linux.i586}-{product|fastdebug|debug}, \
      ${jprt.my.linux.x64}-{product|fastdebug}, \
-     ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \
-     ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
-     ${jprt.my.windows.x64}-{product|fastdebug|debug}, \
      ${jprt.my.linux.armvh}-{product|fastdebug}
  
  jprt.build.targets.open= \
      ${jprt.my.solaris.i586}-{productOpen}, \
      ${jprt.my.solaris.x64}-{debugOpen}, \
      ${jprt.my.linux.x64}-{productOpen}
  
  jprt.build.targets.embedded= \
-     ${jprt.my.linux.i586}-{productEmb|fastdebugEmb|debugEmb}, \
      ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \
      ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \
      ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \
      ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \
      ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}, \

*** 172,196 ****
--- 172,193 ----
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jvm98, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark, \
      ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese, \
      ${jprt.my.solaris.sparc}-fastdebug-c1-runThese_Xshare, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_default, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_SerialGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParallelGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParNewGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_CMS, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_G1, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParOldGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_default, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jbb_default_nontiered, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_SerialGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParallelGC, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_CMS, \
      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_G1, \

*** 199,223 ****
--- 196,217 ----
  jprt.my.solaris.sparcv9.test.targets= \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-scimark, \
      ${jprt.my.solaris.sparcv9}-product-c2-runThese, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_default, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_SerialGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_CMS, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_G1, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_default, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_SerialGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParallelGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParNewGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_CMS, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_G1, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParOldGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default_nontiered, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_SerialGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_ParallelGC, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_CMS, \
      ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_G1, \

*** 227,251 ****
--- 221,242 ----
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jvm98, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-scimark, \
      ${jprt.my.solaris.x64}-product-c2-runThese, \
      ${jprt.my.solaris.x64}-product-c2-runThese_Xcomp, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_default, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_G1, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_default, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_CMS, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_G1, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_SerialGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_CMS, \
      ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_G1, \

*** 256,287 ****
--- 247,274 ----
      ${jprt.my.solaris.i586}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark, \
      ${jprt.my.solaris.i586}-product-{c1|c2}-runThese_Xcomp, \
      ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xcomp, \
      ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xshare, \
      ${jprt.my.solaris.i586}-product-c1-GCBasher_default, \
      ${jprt.my.solaris.i586}-product-c1-GCBasher_SerialGC, \
      ${jprt.my.solaris.i586}-product-c1-GCBasher_ParallelGC, \
      ${jprt.my.solaris.i586}-product-c1-GCBasher_ParNewGC, \
      ${jprt.my.solaris.i586}-product-c1-GCBasher_CMS, \
      ${jprt.my.solaris.i586}-product-c1-GCBasher_G1, \
      ${jprt.my.solaris.i586}-product-c1-GCBasher_ParOldGC, \
      ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_default, \
      ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_SerialGC, \
      ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParallelGC, \
      ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParNewGC, \
      ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_CMS, \
      ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_G1, \
      ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParOldGC, \
      ${jprt.my.solaris.i586}-product-c1-GCOld_default, \
      ${jprt.my.solaris.i586}-product-c1-GCOld_SerialGC, \
      ${jprt.my.solaris.i586}-product-c1-GCOld_ParallelGC, \
      ${jprt.my.solaris.i586}-product-c1-GCOld_ParNewGC, \
      ${jprt.my.solaris.i586}-product-c1-GCOld_CMS, \
      ${jprt.my.solaris.i586}-product-c1-GCOld_G1, \
      ${jprt.my.solaris.i586}-product-c1-GCOld_ParOldGC, \
      ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default, \
      ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default_nontiered, \
      ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParallelGC, \
      ${jprt.my.solaris.i586}-fastdebug-c2-jbb_CMS, \
      ${jprt.my.solaris.i586}-fastdebug-c2-jbb_G1, \
      ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParOldGC

*** 291,364 ****
--- 278,343 ----
      ${jprt.my.linux.i586}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \
      ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \
      ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \
      ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \
      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
      ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \
      ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \
      ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \
      ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \
      ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \
      ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_G1, \
      ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParOldGC, \
!     ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \
!     ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_SerialGC, \
      ${jprt.my.linux.i586}-{product|fastdebug}-c2-jbb_default_nontiered, \
      ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \
      ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \
      ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_G1, \
      ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParOldGC
  
  jprt.my.linux.x64.test.targets = \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-scimark, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_default, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_G1, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_default, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_CMS, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_G1, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_G1, \
      ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParOldGC
  
  jprt.my.macosx.x64.test.targets = \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-scimark, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_default, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_G1, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_default, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
      ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC
  

*** 367,384 ****
--- 346,361 ----
      ${jprt.my.windows.i586}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-scimark, \
      ${jprt.my.windows.i586}-product-{c1|c2}-runThese, \
      ${jprt.my.windows.i586}-product-{c1|c2}-runThese_Xcomp, \
      ${jprt.my.windows.i586}-fastdebug-c1-runThese_Xshare, \
      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
      ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
      ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_default, \
      ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_SerialGC, \
      ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParallelGC, \
      ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParNewGC, \
      ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_CMS, \
      ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_G1, \

*** 394,411 ****
--- 371,386 ----
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-jvm98, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-jvm98_nontiered, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-scimark, \
      ${jprt.my.windows.x64}-product-c2-runThese, \
      ${jprt.my.windows.x64}-product-c2-runThese_Xcomp, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_default, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_G1, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_default, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_CMS, \
      ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_G1, \

*** 417,427 ****
--- 392,402 ----
      ${jprt.my.windows.x64}-product-c2-jbb_G1, \
      ${jprt.my.windows.x64}-product-c2-jbb_ParOldGC
  
  # Some basic "smoke" tests for OpenJDK builds
  jprt.test.targets.open = \
-     ${jprt.my.solaris.x64}-{productOpen|debugOpen|fastdebugOpen}-c2-jvm98, \
      ${jprt.my.solaris.i586}-{productOpen|fastdebugOpen}-c2-jvm98, \
      ${jprt.my.linux.x64}-{productOpen|fastdebugOpen}-c2-jvm98
  
  # Testing for actual embedded builds is different to standard
  jprt.my.linux.i586.test.targets.embedded = \