changeset 277:f26e2ab2c2c7

Merge
author lana
date Thu, 15 Dec 2011 19:49:53 -0800
parents a49db7c01db7 ebec6a7e8d4e
children dffeb62b1a7f
files
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Dec 12 08:12:38 2011 -0800
+++ b/.hgtags	Thu Dec 15 19:49:53 2011 -0800
@@ -136,3 +136,6 @@
 ca977d167697a561c04894187fc1c4d927582ffa jdk8-b12
 bcc739229f6384786c7ac0b52c1822c85674dcf1 jdk8-b13
 9d0c9d638757cb09de18933b946fa04b4f3fb94f jdk8-b14
+804f666d6d44e33caac12ad8da3d2780ac44ef72 jdk8-b15
+09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b17
+09eb517404b059607aca30cdd1af83ffc57eafeb jdk8-b16
--- a/build.properties	Mon Dec 12 08:12:38 2011 -0800
+++ b/build.properties	Thu Dec 15 19:49:53 2011 -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/make/Makefile	Mon Dec 12 08:12:38 2011 -0800
+++ b/make/Makefile	Thu Dec 15 19:49:53 2011 -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