Mercurial > hg > openjdk > jigsaw > jaxp
changeset 300:8539c5fcf834
Merge
author | mchung |
---|---|
date | Mon, 30 Jan 2012 21:10:41 -0800 |
parents | 2c65e16432b3 (current diff) 7836655e2495 (diff) |
children | 68688f8573c0 |
files | .hgtags |
diffstat | 5 files changed, 22 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Nov 30 12:56:45 2011 -0800 +++ b/.hgtags Mon Jan 30 21:10:41 2012 -0800 @@ -142,3 +142,12 @@ ca977d167697a561c04894187fc1c4d927582ffa jdk8-b12 bcc739229f6384786c7ac0b52c1822c85674dcf1 jdk8-b13 9d0c9d638757cb09de18933b946fa04b4f3fb94f jdk8-b14 +804f666d6d44e33caac12ad8da3d2780ac44ef72 jdk8-b15 +09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b17 +09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b16 +ebec6a7e8d4e481d205a2109ddeea8121d76db7f jdk8-b18 +dffeb62b1a7fc8b316bf58fe5479323f3661894e jdk8-b19 +f052abb8f37444ba77858913887d0d92795dd6b8 jdk8-b20 +d41eeadf5c1344b88c5051a997aec9e1ad7ce1db jdk8-b21 +cf9d6ec44f891236ad18451021d6dcd57dc82f7b jdk8-b22 +95102fd334183d15dc98a95dd0d749527b6c7300 jdk8-b23
--- a/build.properties Wed Nov 30 12:56:45 2011 -0800 +++ b/build.properties Mon Jan 30 21:10:41 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ # Base locations where bundles are located slashjava=/java -drops.dir=${slashjava}/devtools/share/jdk7-drops +drops.dir=${slashjava}/devtools/share/jdk8-drops # This is the JDK used to build and run the bootstrap version of javac. # The bootstrap javac is used to compile both boostrap versions of the
--- a/build.xml Wed Nov 30 12:56:45 2011 -0800 +++ b/build.xml Mon Jan 30 21:10:41 2012 -0800 @@ -43,14 +43,6 @@ Run 'make help' for help using the Makefile. </description> - <!-- Mac is special, need to downgrade these before build.properties. --> - <condition property="javac.source" value="1.5"> - <os family="mac"/> - </condition> - <condition property="javac.target" value="1.5"> - <os family="mac"/> - </condition> - <!-- Project build properties. --> <property file="build.properties"/>
--- a/make/Makefile Wed Nov 30 12:56:45 2011 -0800 +++ b/make/Makefile Mon Jan 30 21:10:41 2012 -0800 @@ -99,9 +99,9 @@ DROPS_DIR = $(ALT_DROPS_DIR) else ifdef ALT_JDK_DEVTOOLS_DIR - DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops + DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops else - DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops + DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops endif endif
--- a/make/jprt.properties Wed Nov 30 12:56:45 2011 -0800 +++ b/make/jprt.properties Mon Jan 30 21:10:41 2012 -0800 @@ -25,21 +25,21 @@ # Properties for jprt -# The release to build +# Locked down to jdk8 jprt.tools.default.release=jdk8 # The different build flavors we want, we override here so we just get these 2 jprt.build.flavors=product,fastdebug # Standard list of jprt build targets for this source tree -jprt.build.targets= \ - solaris_sparc_5.10-{product|fastdebug}, \ - solaris_sparcv9_5.10-{product|fastdebug}, \ - solaris_i586_5.10-{product|fastdebug}, \ - solaris_x64_5.10-{product|fastdebug}, \ - linux_i586_2.6-{product|fastdebug}, \ - linux_x64_2.6-{product|fastdebug}, \ - windows_i586_5.1-{product|fastdebug}, \ +jprt.build.targets= \ + solaris_sparc_5.10-{product|fastdebug}, \ + solaris_sparcv9_5.10-{product|fastdebug}, \ + solaris_i586_5.10-{product|fastdebug}, \ + solaris_x64_5.10-{product|fastdebug}, \ + linux_i586_2.6-{product|fastdebug}, \ + linux_x64_2.6-{product|fastdebug}, \ + windows_i586_5.1-{product|fastdebug}, \ windows_x64_5.2-{product|fastdebug} # Directories to be excluded from the source bundles