equal
deleted
inserted
replaced
83 -tag 'implSpec:a:Implementation Requirements:' \ |
83 -tag 'implSpec:a:Implementation Requirements:' \ |
84 -tag 'implNote:a:Implementation Note:' \ |
84 -tag 'implNote:a:Implementation Note:' \ |
85 -tag param \ |
85 -tag param \ |
86 -tag return \ |
86 -tag return \ |
87 -tag throws \ |
87 -tag throws \ |
|
88 -taglet build.tools.taglet.JSpec\$$JLS \ |
|
89 -taglet build.tools.taglet.JSpec\$$JVMS \ |
88 -taglet build.tools.taglet.ModuleGraph \ |
90 -taglet build.tools.taglet.ModuleGraph \ |
|
91 -taglet build.tools.taglet.ToolGuide \ |
89 -tag since \ |
92 -tag since \ |
90 -tag serialData \ |
93 -tag serialData \ |
91 -tag factory \ |
94 -tag factory \ |
92 -tag see \ |
95 -tag see \ |
93 -tag 'jvms:a:See <cite>The Java™ Virtual Machine Specification</cite>:' \ |
|
94 -tag 'jls:a:See <cite>The Java™ Language Specification</cite>:' \ |
|
95 -taglet build.tools.taglet.ExtLink \ |
96 -taglet build.tools.taglet.ExtLink \ |
96 -taglet build.tools.taglet.Incubating \ |
97 -taglet build.tools.taglet.Incubating \ |
97 -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
98 -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
98 $(CUSTOM_JAVADOC_TAGS) \ |
99 $(CUSTOM_JAVADOC_TAGS) \ |
99 # |
100 # |
273 # Figure out all modules, both specified and transitive indirect exports, that |
274 # Figure out all modules, both specified and transitive indirect exports, that |
274 # will be processed by javadoc. |
275 # will be processed by javadoc. |
275 $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES)) |
276 $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES)) |
276 $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS)) |
277 $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS)) |
277 |
278 |
278 $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) |
279 $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) \ |
|
280 -Djspec.version=$$(VERSION_SPECIFICATION) |
279 |
281 |
280 ifeq ($$(ENABLE_FULL_DOCS), true) |
282 ifeq ($$(ENABLE_FULL_DOCS), true) |
281 # Tell the ModuleGraph taglet to generate html links to soon-to-be-created |
283 # Tell the ModuleGraph taglet to generate html links to soon-to-be-created |
282 # png files with module graphs. |
284 # png files with module graphs. |
283 $1_JAVA_ARGS += -DenableModuleGraph=true |
285 $1_JAVA_ARGS += -DenableModuleGraph=true |
582 FILES := $f, \ |
584 FILES := $f, \ |
583 DEST := $(DOCS_OUTPUTDIR)/specs/, \ |
585 DEST := $(DOCS_OUTPUTDIR)/specs/, \ |
584 CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \ |
586 CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \ |
585 OPTIONS := -A $($m_$f_BOTTOM_FILE), \ |
587 OPTIONS := -A $($m_$f_BOTTOM_FILE), \ |
586 EXTRA_DEPS := $($m_$f_BOTTOM_FILE), \ |
588 EXTRA_DEPS := $($m_$f_BOTTOM_FILE), \ |
|
589 POST_PROCESS := $(TOOL_FIXUPPANDOC), \ |
587 )) \ |
590 )) \ |
588 $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \ |
591 $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \ |
589 ) \ |
592 ) \ |
590 ) \ |
593 ) \ |
591 ) |
594 ) |
612 DEST := $(DOCS_OUTPUTDIR)/specs/man, \ |
615 DEST := $(DOCS_OUTPUTDIR)/specs/man, \ |
613 FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \ |
616 FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \ |
614 CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \ |
617 CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \ |
615 REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \ |
618 REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \ |
616 OPTIONS := -A $(SPECS_BOTTOM_FILE_1), \ |
619 OPTIONS := -A $(SPECS_BOTTOM_FILE_1), \ |
|
620 POST_PROCESS := $(TOOL_FIXUPPANDOC), \ |
617 EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \ |
621 EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \ |
618 $(PANDOC_HTML_MANPAGE_FILTER_JAVASCRIPT) \ |
622 $(PANDOC_HTML_MANPAGE_FILTER_JAVASCRIPT) \ |
619 $(SPECS_BOTTOM_FILE_1), \ |
623 $(SPECS_BOTTOM_FILE_1), \ |
620 )) \ |
624 )) \ |
621 $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \ |
625 $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \ |