Merge
authorlana
Thu, 15 Jun 2017 17:43:14 +0000
changeset 45611 722a1c593e9e
parent 45552 66b9491a40a2 (current diff)
parent 45610 e9dbf9eb0100 (diff)
child 45612 3368f6d8b082
Merge
--- a/make/Docs.gmk	Thu Jun 15 17:24:10 2017 +0000
+++ b/make/Docs.gmk	Thu Jun 15 17:43:14 2017 +0000
@@ -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,15 +436,17 @@
 ################################################################################
 
 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_HTML): 
+	$(ECHO) '$(JDK_INDEX_CONTENT)' > $@
 
 JDK_INDEX_TARGETS := $(JDK_INDEX_HTML)