Thu, 15 Dec 2011 19:49:58 -0800
Merge
1.1 --- a/.hgtags Mon Dec 12 08:13:56 2011 -0800 1.2 +++ b/.hgtags Thu Dec 15 19:49:58 2011 -0800 1.3 @@ -136,3 +136,6 @@ 1.4 e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12 1.5 adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13 1.6 54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14 1.7 +c9ab96ff23d52d85d5dcce1f9c0fd7a3de418c74 jdk8-b15 1.8 +3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b17 1.9 +3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b16
2.1 --- a/build.properties Mon Dec 12 08:13:56 2011 -0800 2.2 +++ b/build.properties Thu Dec 15 19:49:58 2011 -0800 2.3 @@ -1,5 +1,5 @@ 2.4 # 2.5 -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. 2.6 +# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. 2.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 # 2.9 # This code is free software; you can redistribute it and/or modify it 2.10 @@ -25,7 +25,7 @@ 2.11 2.12 # Base locations where bundles are located 2.13 slashjava=/java 2.14 -drops.dir=${slashjava}/devtools/share/jdk7-drops 2.15 +drops.dir=${slashjava}/devtools/share/jdk8-drops 2.16 2.17 # This is the JDK used to build and run the bootstrap version of javac. 2.18 # The bootstrap javac is used to compile both boostrap versions of the
3.1 --- a/make/Makefile Mon Dec 12 08:13:56 2011 -0800 3.2 +++ b/make/Makefile Thu Dec 15 19:49:58 2011 -0800 3.3 @@ -99,9 +99,9 @@ 3.4 DROPS_DIR = $(ALT_DROPS_DIR) 3.5 else 3.6 ifdef ALT_JDK_DEVTOOLS_DIR 3.7 - DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops 3.8 + DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops 3.9 else 3.10 - DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops 3.11 + DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops 3.12 endif 3.13 endif 3.14