Mercurial > hg > openjdk > jdk9
changeset 2560:4a25d35d9159
8178042: Allow custom taglets
Reviewed-by: erikj, mchung
author | ihse |
---|---|
date | Wed, 26 Apr 2017 14:34:09 +0200 |
parents | e1cd0e7075ae |
children | 7f290cff26cd |
files | make/Javadoc.gmk |
diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Javadoc.gmk Tue Apr 25 07:54:11 2017 -0700 +++ b/make/Javadoc.gmk Wed Apr 26 14:34:09 2017 +0200 @@ -35,6 +35,11 @@ $(eval $(call ReadImportMetaData)) ################################################################################ + +# Hook to include the corresponding custom file, if present. +$(eval $(call IncludeCustomExtension, , Javadoc.gmk)) + +################################################################################ # Javadoc settings # On top of the sources that was used to compile the JDK, we need some @@ -43,7 +48,7 @@ $(SUPPORT_OUTPUTDIR)/rmic/* $(JDK_TOPDIR)/src/*/share/doc/stub) # Should we use -Xdocrootparent? Allow custom to overwrite. -DOCROOTPARENT_FLAG = TRUE +DOCROOTPARENT_FLAG ?= TRUE # URLs JAVADOC_BASE_URL := http://docs.oracle.com/javase/$(VERSION_SPECIFICATION)/docs @@ -77,6 +82,7 @@ -taglet build.tools.taglet.ExtLink \ -taglet build.tools.taglet.Incubating \ -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ + $(CUSTOM_JAVADOC_TAGS) \ # # Which doclint checks to ignore @@ -218,7 +224,7 @@ $1_OPTIONS += -Xdoclint:all,$$(call CommaList, $$(addprefix -, \ $$(JAVADOC_DISABLED_DOCLINT))) - ifneq ($$($$DOCROOTPARENT_FLAG), ) + ifeq ($$($$DOCROOTPARENT_FLAG), TRUE) $1_OPTIONS += -Xdocrootparent $$(JAVADOC_BASE_URL) endif @@ -430,11 +436,6 @@ ################################################################################ -# Hook to include the corresponding custom file, if present. -$(eval $(call IncludeCustomExtension, , Javadoc.gmk)) - -################################################################################ - docs-jdk-api-javadoc: $(JDK_API_JAVADOC_TARGETS) docs-jdk-api-modulegraph: $(JDK_API_MODULEGRAPH_TARGETS)