--- a/make/CreateJmods.gmk Fri Jun 16 09:20:15 2017 -0700
+++ b/make/CreateJmods.gmk Sat Jun 17 08:02:30 2017 +0100
@@ -81,7 +81,6 @@
LEGAL_NOTICES := \
$(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
- $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)) \
$(call FindModuleLegalDirs, $(MODULE)) \
#
@@ -106,10 +105,10 @@
DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \
$(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules)))
- EXCLUDE_PATTERN := $(strip $(subst $(SPACE),|,$(strip $(ALL_UPGRADEABLE_MODULES))))
+ EXCLUDE_PATTERN := $(strip $(subst $(SPACE),$$|,$(strip $(ALL_UPGRADEABLE_MODULES))))
JMOD_FLAGS += --module-path $(JMODS_DIR) \
- --hash-modules '^(?!$(EXCLUDE_PATTERN))'
+ --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)'
endif
endif
endif
--- a/make/Docs.gmk Fri Jun 16 09:20:15 2017 -0700
+++ b/make/Docs.gmk Sat Jun 17 08:02:30 2017 +0100
@@ -63,7 +63,7 @@
# URLs
JAVADOC_BASE_URL := http://www.oracle.com/pls/topic/lookup?ctx=javase9&id=homepage
BUG_SUBMIT_URL := http://bugreport.java.com/bugreport/
-COPYRIGHT_URL := {@docroot}/../legal/cpyr.html
+COPYRIGHT_URL := {@docroot}/../legal/copyright.html
LICENSE_URL := http://www.oracle.com/technetwork/java/javase/terms/license/java9speclicense.html
REDISTRIBUTION_URL := http://www.oracle.com/technetwork/java/redist-137594.html
@@ -169,11 +169,6 @@
JAVASE_LONG_NAME := Standard Edition $(VERSION_SPECIFICATION)
################################################################################
-# Index page text titles/snippets
-
-JDK_INDEX_TITLE := $(JAVA_PLATFORM), $(JDK_LONG_NAME) Specification $(DRAFT_MARKER_TITLE)
-
-################################################################################
# Functions
# Helper function for creating a png file from a dot file generated by the
@@ -208,7 +203,6 @@
#
ifneq ($$($1_GROUPS),)
$1_OVERVIEW_TEXT += \
- <p>For an overview of the full specification, grouped by usage, see the <a href="../index.html">$$(JAVA_PLATFORM), $$($1_LONG_NAME) Specification</a>.</p> \
<dl> \
#
$1_OVERVIEW_TEXT += $$(foreach g, $$($1_GROUPS), \
@@ -442,17 +436,19 @@
################################################################################
JDK_INDEX_HTML := $(DOCS_OUTPUTDIR)/index.html
-JDK_INDEX_TOOLS_DIR := $(TOOLS_CLASSES_DIR)/build/tools/docs
-$(JDK_INDEX_HTML): $(BUILD_JIGSAW_TOOLS) \
- $(JDK_INDEX_TOOLS_DIR)/docs-bundle-page.html \
- $(JDK_INDEX_TOOLS_DIR)/docs-module-groups.properties
- $(call LogInfo, Generating docs bundle index page)
- $(MKDIR) -p $(@D)
- $(TOOL_GEN_DOCS_BUNDLE_PAGE) --title '$(JDK_INDEX_TITLE)' \
- --output $@
+JDK_INDEX_CONTENT := \
+ <!DOCTYPE html> \
+ <html lang="en"> \
+ <head> \
+ <meta http-equiv="refresh" content="0;url=api/index.html"> \
+ </head> \
+ </html>
-JDK_INDEX_TARGETS := $(JDK_INDEX_HTML)
+$(JDK_INDEX_HTML):
+ $(ECHO) '$(JDK_INDEX_CONTENT)' > $@
+
+JDK_INDEX_TARGETS += $(JDK_INDEX_HTML)
# Copy the global resources
GLOBAL_SPECS_RESOURCES_DIR := $(JDK_TOPDIR)/make/data/docs-resources/
--- a/make/common/Modules.gmk Fri Jun 16 09:20:15 2017 -0700
+++ b/make/common/Modules.gmk Sat Jun 17 08:02:30 2017 +0100
@@ -72,8 +72,11 @@
jdk.naming.rmi \
#
+# Modules that directly or indirectly requiring upgradeable modules
+# should carefully be considered if it should be upgradeable or not.
UPGRADEABLE_MODULES += \
java.activation \
+ java.compiler \
java.corba \
java.transaction \
java.xml.bind \
@@ -82,10 +85,9 @@
jdk.internal.vm.compiler \
#
-# Modules explicitly declared as not being upgradeable even though they require
-# an upgradeable module.
-NON_UPGRADEABLE_MODULES += \
- jdk.aot \
+UPGRADEABLE_TOOL_MODULES += \
+ jdk.xml.bind \
+ jdk.xml.ws \
#
AGGREGATOR_MODULES += \
@@ -99,7 +101,6 @@
#
PLATFORM_MODULES += \
- java.compiler \
java.scripting \
java.security.jgss \
java.smartcardio \
@@ -175,13 +176,10 @@
jdk.policytool \
jdk.rmic \
jdk.scripting.nashorn \
- jdk.scripting.nashorn.shell \
jdk.sctp \
jdk.security.auth \
jdk.security.jgss \
- jdk.xml.bind \
jdk.xml.dom \
- jdk.xml.ws \
jdk.zipfs \
#
@@ -384,15 +382,8 @@
# Upgradeable modules are those that are either defined as upgradeable or that
# require an upradeable module.
FindAllUpgradeableModules = \
- $(filter-out $(MODULES_FILTER) $(NON_UPGRADEABLE_MODULES), \
- $(sort $(UPGRADEABLE_MODULES) $(foreach m, \
- $(filter-out $(UPGRADEABLE_MODULES), $(call FindAllModules)), \
- $(if $(filter $(UPGRADEABLE_MODULES), \
- $(call FindTransitiveDepsForModule, $m)), \
- $m \
- ) \
- )) \
- )
+ $(sort $(filter-out $(MODULES_FILTER), $(UPGRADEABLE_MODULES) $(UPGRADEABLE_TOOL_MODULES)))
+
################################################################################