OpenJDK / jdk / jdk10
changeset 39930:c35da27e81c2
8039305: [javadoc] broken link in jdk/api/javadoc/taglet/com/sun/tools/doclets/Taglet.html
Reviewed-by: erikj, jjg
| author | ksrini |
|---|---|
| date | Wed, 03 Aug 2016 16:00:49 -0700 |
| parents | f6828731baa8 |
| children | 2e768cb7252d |
| files | make/Javadoc.gmk |
| diffstat | 1 files changed, 9 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Javadoc.gmk Thu Aug 04 10:05:40 2016 +0200 +++ b/make/Javadoc.gmk Wed Aug 03 16:00:49 2016 -0700 @@ -576,14 +576,14 @@ ALL_OTHER_TARGETS += tagletapidocs TAGLETAPI_DOCDIR := $(OLD_DOCLET_DIR)/taglet TAGLETAPI2COREAPI := ../../../$(JDKJRE2COREAPI) +TAGLETAPI_DOCTITLE := Taglet API +TAGLETAPI_WINDOWTITLE := Taglet API +TAGLETAPI_HEADER := <strong>Taglet API</strong> TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR)) # TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk -# Temporary directory (special generation rules) -TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp - # The index.html, options, and packages files -TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/com/sun/tools/doclets/Taglet.html +TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages @@ -592,20 +592,12 @@ tagletapidocs: $(TAGLETAPI_INDEX_FILE) -# Set relative location to core api document root -$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/.. - # Run javadoc if the index file is out of date or missing $(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE) $(prep-javadoc) - $(RM) -r $(TAGLETAPI_TEMPDIR) - $(MKDIR) -p $(TAGLETAPI_TEMPDIR) $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE)) - $(JAVADOC_CMD_SMALL) -d $(TAGLETAPI_TEMPDIR) \ + $(JAVADOC_CMD_SMALL) -d $(@D) \ @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE) - cp -r $(TAGLETAPI_TEMPDIR)/com $(TAGLETAPI_DOCDIR) - cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(TAGLETAPI_DOCDIR) - $(RM) -r $(TAGLETAPI_TEMPDIR) # Create file with javadoc options in it $(TAGLETAPI_OPTIONS_FILE): @@ -617,6 +609,10 @@ $(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \ $(call OptionPair,-addmods,$(TAGLETAPI_MODULES)) ; \ $(call OptionPair,-encoding,ascii) ; \ + $(call OptionOnly,-breakiterator) ; \ + $(call OptionPair,-doctitle,$(TAGLETAPI_DOCTITLE)) ; \ + $(call OptionPair,-windowtitle,$(TAGLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \ + $(call OptionPair,-header,$(TAGLETAPI_HEADER)$(DRAFT_HEADER)) ; \ $(call OptionOnly,-nonavbar) ; \ $(call OptionOnly,-noindex) ; \ $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \