Merge jdk8-b16 jdk8-b17

Wed, 07 Dec 2011 13:02:35 -0800

author
katleman
date
Wed, 07 Dec 2011 13:02:35 -0800
changeset 257
3d45ab79643d
parent 255
76e37e606354
parent 256
23c42f40fd3e
child 258
b38846b9974c
child 259
e662b652098c

Merge

     1.1 --- a/build.properties	Thu Dec 01 10:33:23 2011 -0800
     1.2 +++ b/build.properties	Wed Dec 07 13:02:35 2011 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2007, 2011, 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 @@ -25,7 +25,7 @@
    1.11  
    1.12  # Base locations where bundles are located
    1.13  slashjava=/java
    1.14 -drops.dir=${slashjava}/devtools/share/jdk7-drops
    1.15 +drops.dir=${slashjava}/devtools/share/jdk8-drops
    1.16  
    1.17  # This is the JDK used to build and run the bootstrap version of javac.
    1.18  # The bootstrap javac is used to compile both boostrap versions of the
     2.1 --- a/make/Makefile	Thu Dec 01 10:33:23 2011 -0800
     2.2 +++ b/make/Makefile	Wed Dec 07 13:02:35 2011 -0800
     2.3 @@ -99,9 +99,9 @@
     2.4    DROPS_DIR = $(ALT_DROPS_DIR)
     2.5  else
     2.6    ifdef ALT_JDK_DEVTOOLS_DIR
     2.7 -    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
     2.8 +    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
     2.9    else
    2.10 -    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
    2.11 +    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
    2.12    endif
    2.13  endif
    2.14  

mercurial