Merge jdk7-b109

Wed, 08 Sep 2010 14:04:18 -0700

author
cl
date
Wed, 08 Sep 2010 14:04:18 -0700
changeset 140
4f626e0d70bd
parent 138
ef7838f988c5
parent 139
06c51671c84b
child 141
95ecac35fb11

Merge

     1.1 --- a/make/jprt.properties	Fri Sep 03 12:49:59 2010 -0700
     1.2 +++ b/make/jprt.properties	Wed Sep 08 14:04:18 2010 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -24,31 +24,13 @@
    1.11  #
    1.12  
    1.13  # Properties for jprt
    1.14 -jprt.tools.default.release=jdk1.7.0
    1.15  
    1.16 -# Specific platform list
    1.17 -jprt.build.platforms=\
    1.18 -solaris_sparc_5.10,\
    1.19 -solaris_sparcv9_5.10,\
    1.20 -solaris_i586_5.10,\
    1.21 -solaris_x64_5.10,\
    1.22 -linux_i586_2.6,\
    1.23 -linux_x64_2.6,\
    1.24 -windows_i586_5.0,\
    1.25 -windows_x64_5.2
    1.26 +# Use whatever release that the submitted job requests
    1.27 +jprt.tools.default.release=${jprt.submit.release}
    1.28  
    1.29 -# The different build flavors we want
    1.30 +# The different build flavors we want, we override here so we just get these 2
    1.31  jprt.build.flavors=product,fastdebug
    1.32  
    1.33 -# Explicitly designate what the 32bit match is for the 64bit build
    1.34 -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
    1.35 -jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.10
    1.36 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10
    1.37 -jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.10
    1.38 +# Directories to be excluded from the source bundles
    1.39 +jprt.bundle.exclude.src.dirs=build dist webrev
    1.40  
    1.41 -# Standard list of jprt test targets for this workspace
    1.42 -jprt.test.targets=
    1.43 -
    1.44 -# Directories needing to exclude from source bundles
    1.45 -jprt.bundle.exclude.src.dirs=build dist
    1.46 -

mercurial