hotspot Cdiff make/jprt.properties

make/jprt.properties

rev 4519 : 8014941: make jdk7u40 the default jprt release for hs24
Reviewed-by: dholmes, collins


*** 36,46 ****
  #    and will be one of the official release names defined in jprt.
  #    jprt supports property value expansion using ${property.name} syntax.
  
  # This tells jprt what default release we want to build
  
! jprt.hotspot.default.release=jdk7u14
  
  jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
  
  # Disable syncing the source after builds and tests are done.
  
--- 36,46 ----
  #    and will be one of the official release names defined in jprt.
  #    jprt supports property value expansion using ${property.name} syntax.
  
  # This tells jprt what default release we want to build
  
! jprt.hotspot.default.release=jdk7u40
  
  jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
  
  # Disable syncing the source after builds and tests are done.
  
*** 52,152 ****
  #       sparc etc.
  
  # Define the Solaris platforms we want for the various releases
  jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
  jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
! jprt.my.solaris.sparc.jdk7u14=${jprt.my.solaris.sparc.jdk7}
  jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
  
  jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
  jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
! jprt.my.solaris.sparcv9.jdk7u14=${jprt.my.solaris.sparcv9.jdk7}
  jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
  
  jprt.my.solaris.i586.jdk8=solaris_i586_5.10
  jprt.my.solaris.i586.jdk7=solaris_i586_5.10
! jprt.my.solaris.i586.jdk7u14=${jprt.my.solaris.i586.jdk7}
  jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
  
  jprt.my.solaris.x64.jdk8=solaris_x64_5.10
  jprt.my.solaris.x64.jdk7=solaris_x64_5.10
! jprt.my.solaris.x64.jdk7u14=${jprt.my.solaris.x64.jdk7}
  jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
  
  jprt.my.linux.i586.jdk8=linux_i586_2.6
  jprt.my.linux.i586.jdk7=linux_i586_2.6
! jprt.my.linux.i586.jdk7u14=${jprt.my.linux.i586.jdk7}
  jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
  
  jprt.my.linux.x64.jdk8=linux_x64_2.6
  jprt.my.linux.x64.jdk7=linux_x64_2.6
! jprt.my.linux.x64.jdk7u14=${jprt.my.linux.x64.jdk7}
  jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
  
  jprt.my.linux.ppc.jdk8=linux_ppc_2.6
  jprt.my.linux.ppc.jdk7=linux_ppc_2.6
! jprt.my.linux.ppc.jdk7u14=${jprt.my.linux.ppc.jdk7}
  jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
  
  jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
  jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
! jprt.my.linux.ppcv2.jdk7u14=${jprt.my.linux.ppcv2.jdk7}
  jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
  
  jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
  jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
! jprt.my.linux.ppcsflt.jdk7u14=${jprt.my.linux.ppcsflt.jdk7}
  jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
  
  jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
  jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
! jprt.my.linux.armvfp.jdk7u14=${jprt.my.linux.armvfp.jdk7}
  jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
  
  jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6
  jprt.my.linux.armvfpsflt.jdk7=linux_armvfpsflt_2.6
! jprt.my.linux.armvfpsflt.jdk7u14=${jprt.my.linux.armvfpsflt.jdk7}
  jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
  
  jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6
  jprt.my.linux.armvfphflt.jdk7=linux_armvfphflt_2.6
! jprt.my.linux.armvfphflt.jdk7u14=${jprt.my.linux.armvfphflt.jdk7}
  jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}}
  
  jprt.my.linux.armv6.jdk8=linux_armv6_2.6
  jprt.my.linux.armv6.jdk7=linux_armv6_2.6
! jprt.my.linux.armv6.jdk7u14=${jprt.my.linux.armv6.jdk7}
  jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}}
  
  jprt.my.linux.armvs.jdk8=linux_armvs_2.6
  jprt.my.linux.armvs.jdk7=linux_armvs_2.6
! jprt.my.linux.armvs.jdk7u14=${jprt.my.linux.armvs.jdk7}
  jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}}
  
  jprt.my.linux.armvh.jdk8=linux_armvh_2.6
  jprt.my.linux.armvh.jdk7=linux_armvh_2.6
! jprt.my.linux.armvh.jdk7u14=${jprt.my.linux.armvh.jdk7}
  jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}}
  
  jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
  jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
! jprt.my.linux.armsflt.jdk7u14=${jprt.my.linux.armsflt.jdk7}
  jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
  
  jprt.my.macosx.x64.jdk8=macosx_x64_10.7
  jprt.my.macosx.x64.jdk7=macosx_x64_10.7
! jprt.my.macosx.x64.jdk7u14=${jprt.my.macosx.x64.jdk7}
  jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
  
  jprt.my.windows.i586.jdk8=windows_i586_5.1
  jprt.my.windows.i586.jdk7=windows_i586_5.1
! jprt.my.windows.i586.jdk7u14=${jprt.my.windows.i586.jdk7}
  jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
  
  jprt.my.windows.x64.jdk8=windows_x64_5.2
  jprt.my.windows.x64.jdk7=windows_x64_5.2
! jprt.my.windows.x64.jdk7u14=${jprt.my.windows.x64.jdk7}
  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= \
--- 52,152 ----
  #       sparc etc.
  
  # Define the Solaris platforms we want for the various releases
  jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
  jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
! jprt.my.solaris.sparc.jdk7u40=${jprt.my.solaris.sparc.jdk7}
  jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
  
  jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
  jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
! jprt.my.solaris.sparcv9.jdk7u40=${jprt.my.solaris.sparcv9.jdk7}
  jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
  
  jprt.my.solaris.i586.jdk8=solaris_i586_5.10
  jprt.my.solaris.i586.jdk7=solaris_i586_5.10
! jprt.my.solaris.i586.jdk7u40=${jprt.my.solaris.i586.jdk7}
  jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
  
  jprt.my.solaris.x64.jdk8=solaris_x64_5.10
  jprt.my.solaris.x64.jdk7=solaris_x64_5.10
! jprt.my.solaris.x64.jdk7u40=${jprt.my.solaris.x64.jdk7}
  jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
  
  jprt.my.linux.i586.jdk8=linux_i586_2.6
  jprt.my.linux.i586.jdk7=linux_i586_2.6
! jprt.my.linux.i586.jdk7u40=${jprt.my.linux.i586.jdk7}
  jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
  
  jprt.my.linux.x64.jdk8=linux_x64_2.6
  jprt.my.linux.x64.jdk7=linux_x64_2.6
! jprt.my.linux.x64.jdk7u40=${jprt.my.linux.x64.jdk7}
  jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
  
  jprt.my.linux.ppc.jdk8=linux_ppc_2.6
  jprt.my.linux.ppc.jdk7=linux_ppc_2.6
! jprt.my.linux.ppc.jdk7u40=${jprt.my.linux.ppc.jdk7}
  jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
  
  jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
  jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
! jprt.my.linux.ppcv2.jdk7u40=${jprt.my.linux.ppcv2.jdk7}
  jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
  
  jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
  jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
! jprt.my.linux.ppcsflt.jdk7u40=${jprt.my.linux.ppcsflt.jdk7}
  jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
  
  jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
  jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
! jprt.my.linux.armvfp.jdk7u40=${jprt.my.linux.armvfp.jdk7}
  jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
  
  jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6
  jprt.my.linux.armvfpsflt.jdk7=linux_armvfpsflt_2.6
! jprt.my.linux.armvfpsflt.jdk7u40=${jprt.my.linux.armvfpsflt.jdk7}
  jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
  
  jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6
  jprt.my.linux.armvfphflt.jdk7=linux_armvfphflt_2.6
! jprt.my.linux.armvfphflt.jdk7u40=${jprt.my.linux.armvfphflt.jdk7}
  jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}}
  
  jprt.my.linux.armv6.jdk8=linux_armv6_2.6
  jprt.my.linux.armv6.jdk7=linux_armv6_2.6
! jprt.my.linux.armv6.jdk7u40=${jprt.my.linux.armv6.jdk7}
  jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}}
  
  jprt.my.linux.armvs.jdk8=linux_armvs_2.6
  jprt.my.linux.armvs.jdk7=linux_armvs_2.6
! jprt.my.linux.armvs.jdk7u40=${jprt.my.linux.armvs.jdk7}
  jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}}
  
  jprt.my.linux.armvh.jdk8=linux_armvh_2.6
  jprt.my.linux.armvh.jdk7=linux_armvh_2.6
! jprt.my.linux.armvh.jdk7u40=${jprt.my.linux.armvh.jdk7}
  jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}}
  
  jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
  jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
! jprt.my.linux.armsflt.jdk7u40=${jprt.my.linux.armsflt.jdk7}
  jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
  
  jprt.my.macosx.x64.jdk8=macosx_x64_10.7
  jprt.my.macosx.x64.jdk7=macosx_x64_10.7
! jprt.my.macosx.x64.jdk7u40=${jprt.my.macosx.x64.jdk7}
  jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
  
  jprt.my.windows.i586.jdk8=windows_i586_5.1
  jprt.my.windows.i586.jdk7=windows_i586_5.1
! jprt.my.windows.i586.jdk7u40=${jprt.my.windows.i586.jdk7}
  jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
  
  jprt.my.windows.x64.jdk8=windows_x64_5.2
  jprt.my.windows.x64.jdk7=windows_x64_5.2
! jprt.my.windows.x64.jdk7u40=${jprt.my.windows.x64.jdk7}
  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= \
*** 181,191 ****
  jprt.build.targets.all=${jprt.build.targets.standard}, \
      ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
  
  jprt.build.targets.jdk8=${jprt.build.targets.all}
  jprt.build.targets.jdk7=${jprt.build.targets.all}
! jprt.build.targets.jdk7u14=${jprt.build.targets.all}
  jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
  
  # Subset lists of test targets for this source tree
  
  jprt.my.solaris.sparc.test.targets= \
--- 181,191 ----
  jprt.build.targets.all=${jprt.build.targets.standard}, \
      ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
  
  jprt.build.targets.jdk8=${jprt.build.targets.all}
  jprt.build.targets.jdk7=${jprt.build.targets.all}
! jprt.build.targets.jdk7u40=${jprt.build.targets.all}
  jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
  
  # Subset lists of test targets for this source tree
  
  jprt.my.solaris.sparc.test.targets= \
*** 474,484 ****
    ${jprt.my.windows.x64.test.targets}
  
  
  jprt.test.targets.jdk8=${jprt.test.targets.standard}
  jprt.test.targets.jdk7=${jprt.test.targets.standard}
! jprt.test.targets.jdk7u14=${jprt.test.targets.jdk7}
  jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
  
  # The default test/Makefile targets that should be run
  
  #jprt.make.rule.test.targets=*-product-*-packtest
--- 474,484 ----
    ${jprt.my.windows.x64.test.targets}
  
  
  jprt.test.targets.jdk8=${jprt.test.targets.standard}
  jprt.test.targets.jdk7=${jprt.test.targets.standard}
! jprt.test.targets.jdk7u40=${jprt.test.targets.jdk7}
  jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
  
  # The default test/Makefile targets that should be run
  
  #jprt.make.rule.test.targets=*-product-*-packtest
*** 534,544 ****
  jprt.make.rule.test.targets.embedded = \
    ${jprt.make.rule.test.targets.standard.client}
  
  jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
  jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
! jprt.make.rule.test.targets.jdk7u14=${jprt.make.rule.test.targets.jdk7}
  jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
  
  # 7155453: Work-around to prevent popups on OSX from blocking test completion
  # but the work-around is added to all platforms to be consistent 
  jprt.jbb.options=-Djava.awt.headless=true
--- 534,544 ----
  jprt.make.rule.test.targets.embedded = \
    ${jprt.make.rule.test.targets.standard.client}
  
  jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
  jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
! jprt.make.rule.test.targets.jdk7u40=${jprt.make.rule.test.targets.jdk7}
  jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
  
  # 7155453: Work-around to prevent popups on OSX from blocking test completion
  # but the work-around is added to all platforms to be consistent 
  jprt.jbb.options=-Djava.awt.headless=true