Merge jdk8-b19

Fri, 23 Dec 2011 16:36:35 -0800

author
lana
date
Fri, 23 Dec 2011 16:36:35 -0800
changeset 265
b73b733214aa
parent 261
72d410c3bab1
parent 264
b2e4ab8b5fa3
child 266
2b2818e3386f

Merge

     1.1 --- a/build.xml	Thu Dec 22 19:00:27 2011 -0800
     1.2 +++ b/build.xml	Fri Dec 23 16:36:35 2011 -0800
     1.3 @@ -43,14 +43,6 @@
     1.4        Run 'make help' for help using the Makefile.
     1.5      </description>
     1.6  
     1.7 -    <!-- Mac is special, need to downgrade these before build.properties. -->
     1.8 -    <condition property="javac.source" value="1.5">
     1.9 -        <os family="mac"/>
    1.10 -    </condition>
    1.11 -    <condition property="javac.target" value="1.5">
    1.12 -        <os family="mac"/>
    1.13 -    </condition>
    1.14 -
    1.15      <!-- Project build properties. -->
    1.16      <property file="build.properties"/>
    1.17  
     2.1 --- a/make/jprt.properties	Thu Dec 22 19:00:27 2011 -0800
     2.2 +++ b/make/jprt.properties	Fri Dec 23 16:36:35 2011 -0800
     2.3 @@ -25,21 +25,21 @@
     2.4  
     2.5  # Properties for jprt
     2.6  
     2.7 -# The release to build
     2.8 +# Locked down to jdk8
     2.9  jprt.tools.default.release=jdk8
    2.10  
    2.11  # The different build flavors we want, we override here so we just get these 2
    2.12  jprt.build.flavors=product,fastdebug
    2.13  
    2.14  # Standard list of jprt build targets for this source tree
    2.15 -jprt.build.targets= 						\
    2.16 -    solaris_sparc_5.10-{product|fastdebug}, 			\
    2.17 -    solaris_sparcv9_5.10-{product|fastdebug}, 			\
    2.18 -    solaris_i586_5.10-{product|fastdebug}, 			\
    2.19 -    solaris_x64_5.10-{product|fastdebug}, 			\
    2.20 -    linux_i586_2.6-{product|fastdebug}, 			\
    2.21 -    linux_x64_2.6-{product|fastdebug}, 				\
    2.22 -    windows_i586_5.1-{product|fastdebug}, 			\
    2.23 +jprt.build.targets=                                             \
    2.24 +    solaris_sparc_5.10-{product|fastdebug},                     \
    2.25 +    solaris_sparcv9_5.10-{product|fastdebug},                   \
    2.26 +    solaris_i586_5.10-{product|fastdebug},                      \
    2.27 +    solaris_x64_5.10-{product|fastdebug},                       \
    2.28 +    linux_i586_2.6-{product|fastdebug},                         \
    2.29 +    linux_x64_2.6-{product|fastdebug},                          \
    2.30 +    windows_i586_5.1-{product|fastdebug},                       \
    2.31      windows_x64_5.2-{product|fastdebug}
    2.32  
    2.33  # Directories to be excluded from the source bundles

mercurial