--- a/common/autoconf/generated-configure.sh Thu Jan 28 09:42:59 2016 -0800
+++ b/common/autoconf/generated-configure.sh Thu Jan 28 15:41:48 2016 -0800
@@ -4119,16 +4119,6 @@
- # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles
- # will basically do slowdebug builds when DEBUG_BINARIES is set for
- # fastdebug builds
- DEBUG_BINARIES=false
- # Fastdebug builds with this setting will essentially be slowdebug
- # in hotspot.
- # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles
- # will basically do slowdebug builds when DEBUG_BINARIES is set for
- # fastdebug builds
- DEBUG_BINARIES=false
#
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4849,7 +4839,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1453385294
+DATE_WHEN_GENERATED=1453964370
###############################################################################
#
--- a/common/autoconf/hotspot.m4 Thu Jan 28 09:42:59 2016 -0800
+++ b/common/autoconf/hotspot.m4 Thu Jan 28 15:41:48 2016 -0800
@@ -266,14 +266,3 @@
HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
AC_SUBST(HOTSPOT_MAKE_ARGS)
])
-
- # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles
- # will basically do slowdebug builds when DEBUG_BINARIES is set for
- # fastdebug builds
- DEBUG_BINARIES=false
- # Fastdebug builds with this setting will essentially be slowdebug
- # in hotspot.
- # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot makefiles
- # will basically do slowdebug builds when DEBUG_BINARIES is set for
- # fastdebug builds
- DEBUG_BINARIES=false
\ No newline at end of file
--- a/common/autoconf/spec.gmk.in Thu Jan 28 09:42:59 2016 -0800
+++ b/common/autoconf/spec.gmk.in Thu Jan 28 15:41:48 2016 -0800
@@ -500,7 +500,7 @@
INTERIM_LANGTOOLS_JAR = $(BUILDTOOLS_OUTPUTDIR)/interim_langtools.jar
INTERIM_LANGTOOLS_ARGS = "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" -cp $(INTERIM_LANGTOOLS_JAR)
NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javac.Main
-NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javadoc.Main
+NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) jdk.javadoc.internal.tool.Main
# Base flags for RC
# Guarding this against resetting value. Legacy make files include spec multiple
--- a/make/CompileJavaModules.gmk Thu Jan 28 09:42:59 2016 -0800
+++ b/make/CompileJavaModules.gmk Thu Jan 28 15:41:48 2016 -0800
@@ -42,7 +42,7 @@
################################################################################
-java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
+java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline
java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
java.base_CLEAN := intrinsic.properties
@@ -359,7 +359,7 @@
################################################################################
-jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*'
+jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' -XDstringConcat=inline
jdk.compiler_COPY := javax.tools.JavaCompilerTool
jdk.compiler_CLEAN_FILES := $(wildcard \
$(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
--- a/make/Javadoc.gmk Thu Jan 28 09:42:59 2016 -0800
+++ b/make/Javadoc.gmk Thu Jan 28 15:41:48 2016 -0800
@@ -418,7 +418,7 @@
DOCLETAPI_HEADER := <strong>Doclet API</strong>
DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
DOCLETAPI_GROUPNAME := Packages
-DOCLETAPI_REGEXP := com.sun.javadoc
+DOCLETAPI_REGEXP := jdk.javadoc.doclet.*
# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
# The index.html, options, and packages files
@@ -462,12 +462,69 @@
#############################################################
#
+# old docletapidocs
+#
+
+ALL_OTHER_TARGETS += olddocletapidocs
+
+OLD_DOCLET_DIR := $(JDK_API_DOCSDIR)/javadoc/old
+OLD_DOCLETAPI_DOCDIR := $(OLD_DOCLET_DIR)/doclet
+OLD_DOCLETAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
+OLD_DOCLETAPI_DOCTITLE := Doclet API
+OLD_DOCLETAPI_WINDOWTITLE := Doclet API
+OLD_DOCLETAPI_HEADER := <strong>Doclet API</strong>
+OLD_DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
+OLD_DOCLETAPI_GROUPNAME := Packages
+OLD_DOCLETAPI_REGEXP := com.sun.javadoc
+# OLD_DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+OLD_DOCLETAPI_INDEX_FILE = $(OLD_DOCLETAPI_DOCDIR)/index.html
+OLD_DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/old-docletapi.options
+OLD_DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/old-docletapi.packages
+
+olddocletapidocs: $(OLD_DOCLETAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(OLD_DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(OLD_DOCLETAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(OLD_DOCLETAPI_INDEX_FILE): $(OLD_DOCLETAPI_OPTIONS_FILE) $(OLD_DOCLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
+ $(prep-javadoc)
+ $(call JavadocSummary,$(OLD_DOCLETAPI_OPTIONS_FILE),$(OLD_DOCLETAPI_PACKAGES_FILE))
+ $(JAVADOC_CMD_SMALL) -d $(@D) \
+ @$(OLD_DOCLETAPI_OPTIONS_FILE) @$(OLD_DOCLETAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(OLD_DOCLETAPI_OPTIONS_FILE):
+ $(prep-target)
+ @($(call COMMON_JAVADOCFLAGS) ; \
+ $(call COMMON_JAVADOCTAGS) ; \
+ $(call OptionOnly,-Xdoclint:all) ; \
+ $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+ $(call OptionPair,-encoding,ascii) ; \
+ $(call OptionOnly,-breakiterator) ; \
+ $(call OptionPair,-doctitle,$(OLD_DOCLETAPI_DOCTITLE)) ; \
+ $(call OptionPair,-windowtitle,$(OLD_DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+ $(call OptionPair,-header,$(OLD_DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
+ $(call OptionPair,-bottom,$(OLD_DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+ $(call OptionTrip,-group,$(OLD_DOCLETAPI_GROUPNAME),$(OLD_DOCLETAPI_REGEXP)); \
+ $(call OptionTrip,-linkoffline,$(OLD_DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+ ) >> $@
+
+# Create a file with the package names in it
+$(OLD_DOCLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(OLD_DOCLETAPI_PKGS))
+ $(prep-target)
+ $(call PackageFilter,$(OLD_DOCLETAPI_PKGS))
+
+#############################################################
+#
# tagletapidocs
#
ALL_OTHER_TARGETS += tagletapidocs
-TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
-TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+TAGLETAPI_DOCDIR := $(OLD_DOCLET_DIR)/taglet
+TAGLETAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
--- a/make/common/NON_CORE_PKGS.gmk Thu Jan 28 09:42:59 2016 -0800
+++ b/make/common/NON_CORE_PKGS.gmk Thu Jan 28 15:41:48 2016 -0800
@@ -66,7 +66,10 @@
NIO_PKGS = com.sun.nio.file
-DOCLETAPI_PKGS = com.sun.javadoc
+OLD_DOCLETAPI_PKGS = com.sun.javadoc
+
+DOCLETAPI_PKGS = jdk.javadoc.doclet \
+ jdk.javadoc.doclet.taglet
TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
--- a/make/common/SetupJavaCompilers.gmk Thu Jan 28 09:42:59 2016 -0800
+++ b/make/common/SetupJavaCompilers.gmk Thu Jan 28 15:41:48 2016 -0800
@@ -55,7 +55,7 @@
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
JVM := $(JAVA_SMALL), \
JAVAC := $(NEW_JAVAC), \
- FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true \
+ FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true -XDstringConcat=inline \
$(DISABLE_WARNINGS) -Xlint:-options, \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
--- a/modules.xml Thu Jan 28 09:42:59 2016 -0800
+++ b/modules.xml Thu Jan 28 15:41:48 2016 -0800
@@ -2,7 +2,7 @@
<!--
- Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2016, 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
@@ -1643,6 +1643,10 @@
<to>jdk.javadoc</to>
<to>jdk.jdeps</to>
</export>
+ <export>
+ <name>com.sun.tools.javac.model</name>
+ <to>jdk.javadoc</to>
+ </export>
</module>
<module>
<name>jdk.crypto.ec</name>
@@ -1744,6 +1748,10 @@
</export>
</module>
<module>
+ <name>jdk.internal.opt</name>
+ <depend>java.base</depend>
+ </module>
+ <module>
<name>jdk.jartool</name>
<depend>java.base</depend>
<export>
@@ -1768,6 +1776,12 @@
<export>
<name>com.sun.tools.javadoc</name>
</export>
+ <export>
+ <name>jdk.javadoc.doclet</name>
+ </export>
+ <export>
+ <name>jdk.javadoc.doclet.taglet</name>
+ </export>
</module>
<module>
<name>jdk.jcmd</name>