Print this page 
rev 4519 : 8014941: make jdk7u40 the default jprt release for hs24
Reviewed-by: dholmes, collins
Split Split Close
Expand all
Collapse all
          --- old/make/jprt.properties
          +++ new/make/jprt.properties
↓ open down ↓ 30 lines elided ↑ open up ↑ 
  31   31  #          bundles, then this setting would be need to be "true".
  32   32  
  33   33  jprt.need.sibling.build=false
  34   34  
  35   35  # At submit time, the release supplied will be in jprt.submit.release
  36   36  #    and will be one of the official release names defined in jprt.
  37   37  #    jprt supports property value expansion using ${property.name} syntax.
  38   38  
  39   39  # This tells jprt what default release we want to build
  40   40  
  41      -jprt.hotspot.default.release=jdk7u14
       41 +jprt.hotspot.default.release=jdk7u40
  42   42  
  43   43  jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
  44   44  
  45   45  # Disable syncing the source after builds and tests are done.
  46   46  
  47   47  jprt.sync.push=false
  48   48  
  49   49  # Note: we want both embedded releases and regular releases to build and test
  50   50  #       all platforms so that regressions are not introduced (eg. change to
  51   51  #       common code by SE breaks PPC/ARM; change to common code by SE-E breaks
  52   52  #       sparc etc.
  53   53  
  54   54  # Define the Solaris platforms we want for the various releases
  55   55  jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
  56   56  jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
  57      -jprt.my.solaris.sparc.jdk7u14=${jprt.my.solaris.sparc.jdk7}
       57 +jprt.my.solaris.sparc.jdk7u40=${jprt.my.solaris.sparc.jdk7}
  58   58  jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
  59   59  
  60   60  jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
  61   61  jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
  62      -jprt.my.solaris.sparcv9.jdk7u14=${jprt.my.solaris.sparcv9.jdk7}
       62 +jprt.my.solaris.sparcv9.jdk7u40=${jprt.my.solaris.sparcv9.jdk7}
  63   63  jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
  64   64  
  65   65  jprt.my.solaris.i586.jdk8=solaris_i586_5.10
  66   66  jprt.my.solaris.i586.jdk7=solaris_i586_5.10
  67      -jprt.my.solaris.i586.jdk7u14=${jprt.my.solaris.i586.jdk7}
       67 +jprt.my.solaris.i586.jdk7u40=${jprt.my.solaris.i586.jdk7}
  68   68  jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
  69   69  
  70   70  jprt.my.solaris.x64.jdk8=solaris_x64_5.10
  71   71  jprt.my.solaris.x64.jdk7=solaris_x64_5.10
  72      -jprt.my.solaris.x64.jdk7u14=${jprt.my.solaris.x64.jdk7}
       72 +jprt.my.solaris.x64.jdk7u40=${jprt.my.solaris.x64.jdk7}
  73   73  jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
  74   74  
  75   75  jprt.my.linux.i586.jdk8=linux_i586_2.6
  76   76  jprt.my.linux.i586.jdk7=linux_i586_2.6
  77      -jprt.my.linux.i586.jdk7u14=${jprt.my.linux.i586.jdk7}
       77 +jprt.my.linux.i586.jdk7u40=${jprt.my.linux.i586.jdk7}
  78   78  jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
  79   79  
  80   80  jprt.my.linux.x64.jdk8=linux_x64_2.6
  81   81  jprt.my.linux.x64.jdk7=linux_x64_2.6
  82      -jprt.my.linux.x64.jdk7u14=${jprt.my.linux.x64.jdk7}
       82 +jprt.my.linux.x64.jdk7u40=${jprt.my.linux.x64.jdk7}
  83   83  jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
  84   84  
  85   85  jprt.my.linux.ppc.jdk8=linux_ppc_2.6
  86   86  jprt.my.linux.ppc.jdk7=linux_ppc_2.6
  87      -jprt.my.linux.ppc.jdk7u14=${jprt.my.linux.ppc.jdk7}
       87 +jprt.my.linux.ppc.jdk7u40=${jprt.my.linux.ppc.jdk7}
  88   88  jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
  89   89  
  90   90  jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
  91   91  jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
  92      -jprt.my.linux.ppcv2.jdk7u14=${jprt.my.linux.ppcv2.jdk7}
       92 +jprt.my.linux.ppcv2.jdk7u40=${jprt.my.linux.ppcv2.jdk7}
  93   93  jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
  94   94  
  95   95  jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
  96   96  jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
  97      -jprt.my.linux.ppcsflt.jdk7u14=${jprt.my.linux.ppcsflt.jdk7}
       97 +jprt.my.linux.ppcsflt.jdk7u40=${jprt.my.linux.ppcsflt.jdk7}
  98   98  jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
  99   99  
 100  100  jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
 101  101  jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
 102      -jprt.my.linux.armvfp.jdk7u14=${jprt.my.linux.armvfp.jdk7}
      102 +jprt.my.linux.armvfp.jdk7u40=${jprt.my.linux.armvfp.jdk7}
 103  103  jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
 104  104  
 105  105  jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6
 106  106  jprt.my.linux.armvfpsflt.jdk7=linux_armvfpsflt_2.6
 107      -jprt.my.linux.armvfpsflt.jdk7u14=${jprt.my.linux.armvfpsflt.jdk7}
      107 +jprt.my.linux.armvfpsflt.jdk7u40=${jprt.my.linux.armvfpsflt.jdk7}
 108  108  jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
 109  109  
 110  110  jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6
 111  111  jprt.my.linux.armvfphflt.jdk7=linux_armvfphflt_2.6
 112      -jprt.my.linux.armvfphflt.jdk7u14=${jprt.my.linux.armvfphflt.jdk7}
      112 +jprt.my.linux.armvfphflt.jdk7u40=${jprt.my.linux.armvfphflt.jdk7}
 113  113  jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}}
 114  114  
 115  115  jprt.my.linux.armv6.jdk8=linux_armv6_2.6
 116  116  jprt.my.linux.armv6.jdk7=linux_armv6_2.6
 117      -jprt.my.linux.armv6.jdk7u14=${jprt.my.linux.armv6.jdk7}
      117 +jprt.my.linux.armv6.jdk7u40=${jprt.my.linux.armv6.jdk7}
 118  118  jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}}
 119  119  
 120  120  jprt.my.linux.armvs.jdk8=linux_armvs_2.6
 121  121  jprt.my.linux.armvs.jdk7=linux_armvs_2.6
 122      -jprt.my.linux.armvs.jdk7u14=${jprt.my.linux.armvs.jdk7}
      122 +jprt.my.linux.armvs.jdk7u40=${jprt.my.linux.armvs.jdk7}
 123  123  jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}}
 124  124  
 125  125  jprt.my.linux.armvh.jdk8=linux_armvh_2.6
 126  126  jprt.my.linux.armvh.jdk7=linux_armvh_2.6
 127      -jprt.my.linux.armvh.jdk7u14=${jprt.my.linux.armvh.jdk7}
      127 +jprt.my.linux.armvh.jdk7u40=${jprt.my.linux.armvh.jdk7}
 128  128  jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}}
 129  129  
 130  130  jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
 131  131  jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
 132      -jprt.my.linux.armsflt.jdk7u14=${jprt.my.linux.armsflt.jdk7}
      132 +jprt.my.linux.armsflt.jdk7u40=${jprt.my.linux.armsflt.jdk7}
 133  133  jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
 134  134  
 135  135  jprt.my.macosx.x64.jdk8=macosx_x64_10.7
 136  136  jprt.my.macosx.x64.jdk7=macosx_x64_10.7
 137      -jprt.my.macosx.x64.jdk7u14=${jprt.my.macosx.x64.jdk7}
      137 +jprt.my.macosx.x64.jdk7u40=${jprt.my.macosx.x64.jdk7}
 138  138  jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
 139  139  
 140  140  jprt.my.windows.i586.jdk8=windows_i586_5.1
 141  141  jprt.my.windows.i586.jdk7=windows_i586_5.1
 142      -jprt.my.windows.i586.jdk7u14=${jprt.my.windows.i586.jdk7}
      142 +jprt.my.windows.i586.jdk7u40=${jprt.my.windows.i586.jdk7}
 143  143  jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
 144  144  
 145  145  jprt.my.windows.x64.jdk8=windows_x64_5.2
 146  146  jprt.my.windows.x64.jdk7=windows_x64_5.2
 147      -jprt.my.windows.x64.jdk7u14=${jprt.my.windows.x64.jdk7}
      147 +jprt.my.windows.x64.jdk7u40=${jprt.my.windows.x64.jdk7}
 148  148  jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
 149  149  
 150  150  # Standard list of jprt build targets for this source tree
 151  151  
 152  152  jprt.build.targets.standard= \
 153  153      ${jprt.my.solaris.sparc}-{product|fastdebug|debug}, \
 154  154      ${jprt.my.solaris.sparcv9}-{product|fastdebug|debug}, \
 155  155      ${jprt.my.solaris.i586}-{product|fastdebug|debug}, \
 156  156      ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \
 157  157      ${jprt.my.linux.i586}-{product|fastdebug|debug}, \
↓ open down ↓ 18 lines elided ↑ open up ↑ 
 176  176      ${jprt.my.linux.armvfp}-{productEmb|fastdebugEmb}, \
 177  177      ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}, \
 178  178      ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \
 179  179      ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}
 180  180  
 181  181  jprt.build.targets.all=${jprt.build.targets.standard}, \
 182  182      ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
 183  183  
 184  184  jprt.build.targets.jdk8=${jprt.build.targets.all}
 185  185  jprt.build.targets.jdk7=${jprt.build.targets.all}
 186      -jprt.build.targets.jdk7u14=${jprt.build.targets.all}
      186 +jprt.build.targets.jdk7u40=${jprt.build.targets.all}
 187  187  jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
 188  188  
 189  189  # Subset lists of test targets for this source tree
 190  190  
 191  191  jprt.my.solaris.sparc.test.targets= \
 192  192      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jvm98, \
 193  193      ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jvm98_nontiered, \
 194  194      ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark, \
 195  195      ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese, \
 196  196      ${jprt.my.solaris.sparc}-fastdebug-c1-runThese_Xshare, \
↓ open down ↓ 272 lines elided ↑ open up ↑ 
 469  469    ${jprt.my.solaris.sparcv9.test.targets}, \
 470  470    ${jprt.my.solaris.i586.test.targets}, \
 471  471    ${jprt.my.solaris.x64.test.targets}, \
 472  472    ${jprt.my.linux.x64.test.targets}, \
 473  473    ${jprt.my.windows.i586.test.targets}, \
 474  474    ${jprt.my.windows.x64.test.targets}
 475  475  
 476  476  
 477  477  jprt.test.targets.jdk8=${jprt.test.targets.standard}
 478  478  jprt.test.targets.jdk7=${jprt.test.targets.standard}
 479      -jprt.test.targets.jdk7u14=${jprt.test.targets.jdk7}
      479 +jprt.test.targets.jdk7u40=${jprt.test.targets.jdk7}
 480  480  jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
 481  481  
 482  482  # The default test/Makefile targets that should be run
 483  483  
 484  484  #jprt.make.rule.test.targets=*-product-*-packtest
 485  485  
 486  486  jprt.make.rule.test.targets.standard.client = \
 487  487    ${jprt.my.solaris.sparc}-*-c1-clienttest, \
 488  488    ${jprt.my.solaris.i586}-*-c1-clienttest, \
 489  489    ${jprt.my.linux.i586}-*-c1-clienttest, \
↓ open down ↓ 39 lines elided ↑ open up ↑ 
 529  529    ${jprt.make.rule.test.targets.standard.client}, \
 530  530    ${jprt.make.rule.test.targets.standard.server}, \
 531  531    ${jprt.make.rule.test.targets.standard.internalvmtests}, \
 532  532    ${jprt.make.rule.test.targets.standard.wbapi}
 533  533  
 534  534  jprt.make.rule.test.targets.embedded = \
 535  535    ${jprt.make.rule.test.targets.standard.client}
 536  536  
 537  537  jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
 538  538  jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
 539      -jprt.make.rule.test.targets.jdk7u14=${jprt.make.rule.test.targets.jdk7}
      539 +jprt.make.rule.test.targets.jdk7u40=${jprt.make.rule.test.targets.jdk7}
 540  540  jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
 541  541  
 542  542  # 7155453: Work-around to prevent popups on OSX from blocking test completion
 543  543  # but the work-around is added to all platforms to be consistent 
 544  544  jprt.jbb.options=-Djava.awt.headless=true
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX