8175825: Stop including pubs repo

Reviewed-by: erikj
2017-05-12 19:09:50 +02:00 · 2017-05-12 19:09:50 +02:00 · a365f54c10
commit a365f54c10
parent ce8579b6c7
7 changed files with 24 additions and 25 deletions
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@ -5183,7 +5183,7 @@ VS_SDK_PLATFORM_NAME_2013=
 #CUSTOM_AUTOCONF_INCLUDE

 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1493884285
+DATE_WHEN_GENERATED=1494608938

 ###############################################################################
 #
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@ -271,9 +271,6 @@ BUNDLES_OUTPUTDIR=$(BUILD_OUTPUT)/bundles
 TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make
 MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support

-# By default, output javadoc directly into image
-JAVADOC_OUTPUTDIR = $(DOCS_IMAGE_DIR)
-
 # This does not get overridden in a bootcycle build
 CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
 BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk
@ -818,6 +815,8 @@ INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
 # Docs image
 DOCS_IMAGE_SUBDIR := docs
 DOCS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR)
+# Output docs directly into image
+DOCS_OUTPUTDIR := $(DOCS_IMAGE_DIR)

 # Macosx bundles directory definitions
 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
--- a/common/bin/hgforest.sh
+++ b/common/bin/hgforest.sh
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2017, 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
@ -183,7 +183,7 @@ trap 'nice_exit' EXIT

 subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
 jdk_subrepos_extra="closed jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed"
-subrepos_extra="$jdk_subrepos_extra deploy install sponsors pubs"
+subrepos_extra="$jdk_subrepos_extra deploy install sponsors"

 # Only look in specific locations for possible forests (avoids long searches)
 pull_default=""
--- a/common/doc/building.html
+++ b/common/doc/building.html
@ -6,6 +6,7 @@
  <meta name="generator" content="pandoc" />
  <title>OpenJDK Build README</title>
  <style type="text/css">code{white-space: pre;}</style>
+  <link rel="stylesheet" href=" ../../jdk/make/data/docs-resources/specs/resources/jdk-default.css" type="text/css" />
 </head>
 <body>
 <div id="header">
--- a/common/doc/testing.html
+++ b/common/doc/testing.html
@ -6,9 +6,8 @@
  <meta name="generator" content="pandoc" />
  <title>Testing OpenJDK</title>
  <style type="text/css">code{white-space: pre;}</style>
-  <link rel="stylesheet" href="http://openjdk.java.net/page.css" type="text/css" />
+  <link rel="stylesheet" href=" ../../jdk/make/data/docs-resources/specs/resources/jdk-default.css" type="text/css" />
  <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
-  <style type="text/css">pre { font-size: 10pt; }</style>
 </head>
 <body>
 <div id="header">
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@ -38,7 +38,7 @@ $(eval $(call ReadImportMetaData))
 ################################################################################

 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Javadoc.gmk))
+$(eval $(call IncludeCustomExtension, , Docs.gmk))

 ################################################################################
 # Javadoc settings
@ -321,7 +321,7 @@ JDK_JAVADOC_OVERVIEW := $(JDK_TOPDIR)/src/java.base/share/classes/overview-core.
 $(eval $(call SetupApiDocsGeneration, JDK_API, \
    MODULES := $(JDK_JAVADOC_MODULES), \
    NAME := JDK, \
-    TARGET_DIR := $(JAVADOC_OUTPUTDIR)/api, \
+    TARGET_DIR := $(DOCS_OUTPUTDIR)/api, \
    OVERVIEW := $(JDK_JAVADOC_OVERVIEW), \
    DOC_TITLE := $(JDK_JAVADOC_DOC_TITLE), \
    WINDOW_TITLE := $(JAVADOC_WINDOW_TITLE), \
@ -372,7 +372,7 @@ $(foreach m, $(ALL_MODULES), \
      $(eval $(call SetupCopyFiles, COPY_$m, \
          SRC := $d, \
          FILES := $(filter $(COPY_SPEC_FILTER), $(call CacheFind, $d)), \
-          DEST := $(JAVADOC_OUTPUTDIR)/specs/, \
+          DEST := $(DOCS_OUTPUTDIR)/specs/, \
      )) \
      $(eval JDK_SPECS_TARGETS += $(COPY_$m)) \
    ) \
@ -384,7 +384,7 @@ GLOBAL_SPECS_RESOURCES_DIR := $(JDK_TOPDIR)/make/data/docs-resources/specs
 $(eval $(call SetupCopyFiles, COPY_GLOBAL_RESOURCES, \
    SRC := $(GLOBAL_SPECS_RESOURCES_DIR), \
    FILES := $(call CacheFind, $(GLOBAL_SPECS_RESOURCES_DIR)), \
-    DEST := $(JAVADOC_OUTPUTDIR)/specs/, \
+    DEST := $(DOCS_OUTPUTDIR)/specs/, \
 ))
 JDK_SPECS_TARGETS += $(COPY_GLOBAL_RESOURCES)

@ -392,7 +392,7 @@ ifeq ($(ENABLE_FULL_DOCS), true)
  # For all markdown files in $module/share/specs directories, convert them to
  # html.

-  GLOBAL_SPECS_DEFAULT_CSS_FILE := $(JAVADOC_OUTPUTDIR)/specs/resources/jdk-default.css
+  GLOBAL_SPECS_DEFAULT_CSS_FILE := $(DOCS_OUTPUTDIR)/specs/resources/jdk-default.css

  $(foreach m, $(ALL_MODULES), \
    $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
@ -401,7 +401,7 @@ ifeq ($(ENABLE_FULL_DOCS), true)
        $(eval $(call SetupProcessMarkdown, CONVERT_MARKDOWN_$m_$(patsubst $(TOPDIR)/%,%,$d), \
            SRC := $d, \
            FILES := $(filter %.md, $(call CacheFind, $d)), \
-            DEST := $(JAVADOC_OUTPUTDIR)/specs/, \
+            DEST := $(DOCS_OUTPUTDIR)/specs/, \
            CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
        )) \
      ) \
@ -415,7 +415,7 @@ endif
 JDWP_PROTOCOL := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
 $(eval $(call SetupCopyFiles, COPY_JDWP_PROTOCOL, \
    FILES := $(JDWP_PROTOCOL), \
-    DEST := $(JAVADOC_OUTPUTDIR)/specs/jdwp, \
+    DEST := $(DOCS_OUTPUTDIR)/specs/jdwp, \
 ))
 JDK_SPECS_TARGETS += $(COPY_JDWP_PROTOCOL)

@ -423,7 +423,7 @@ JDK_SPECS_TARGETS += $(COPY_JDWP_PROTOCOL)
 JVMTI_HTML := $(HOTSPOT_OUTPUTDIR)/variant-$(JVM_VARIANT_MAIN)/gensrc/jvmtifiles/jvmti.html
 $(eval $(call SetupCopyFiles, COPY_JVMTI_HTML, \
    FILES := $(JVMTI_HTML), \
-    DEST := $(JAVADOC_OUTPUTDIR)/specs, \
+    DEST := $(DOCS_OUTPUTDIR)/specs, \
 ))
 JDK_SPECS_TARGETS += $(COPY_JVMTI_HTML)

@ -434,7 +434,7 @@ JAVADOC_ZIP_NAME := jdk-$(VERSION_STRING)-docs.zip
 JAVADOC_ZIP_FILE := $(OUTPUT_ROOT)/bundles/$(JAVADOC_ZIP_NAME)

 $(eval $(call SetupZipArchive, BUILD_JAVADOC_ZIP, \
-    SRC := $(JAVADOC_OUTPUTDIR), \
+    SRC := $(DOCS_OUTPUTDIR), \
    ZIP := $(JAVADOC_ZIP_FILE), \
    EXTRA_DEPS := $(JDK_API_JAVADOC_TARGETS) $(JDK_API_MODULEGRAPH_TARGETS) \
        $(JDK_SPECS_TARGETS), \
@ -444,11 +444,11 @@ ZIP_TARGETS += $(BUILD_JAVADOC_ZIP)

 ################################################################################

-docs-jdk-api-javadoc: $(JDK_API_JAVADOC_TARGETS)
+docs-jdk-api-javadoc: $(JDK_API_JAVADOC_TARGETS) $(JDK_API_CUSTOM_TARGETS)

 docs-jdk-api-modulegraph: $(JDK_API_MODULEGRAPH_TARGETS)

-docs-javase-api-javadoc: $(JAVASE_API_JAVADOC_TARGETS)
+docs-javase-api-javadoc: $(JAVASE_API_JAVADOC_TARGETS) $(JAVASE_API_CUSTOM_TARGETS)

 docs-javase-api-modulegraph: $(JAVASE_API_MODULEGRAPH_TARGETS)

--- a/make/Main.gmk
+++ b/make/Main.gmk
@ -366,22 +366,22 @@ ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-im
 # If building full docs, to complete docs-*-api we need both the javadoc and
 # modulegraph targets.
 docs-jdk-api-javadoc:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-jdk-api-javadoc)
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-javadoc)

 docs-jdk-api-modulegraph:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-jdk-api-modulegraph)
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-modulegraph)

 docs-javase-api-javadoc:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javase-api-javadoc)
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-javadoc)

 docs-javase-api-modulegraph:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javase-api-modulegraph)
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-modulegraph)

 docs-jdk-specs:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-jdk-specs)
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-specs)

 docs-zip:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
+	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip)

 update-build-docs:
 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)