From fd60036a34b0a8516eb29b698674c8242c4a84c1 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Wed, 2 Nov 2022 21:12:25 +0000 Subject: [PATCH] 8296188: Update style and header in JDWP Protocol spec and JVMTI spec Reviewed-by: erikj --- make/Docs.gmk | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/make/Docs.gmk b/make/Docs.gmk index ce0caede5ba..c1c9f7330ba 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -595,7 +595,7 @@ ifeq ($(ENABLE_PANDOC), true) GLOBAL_SPECS_DEFAULT_CSS_FILE := $(DOCS_OUTPUTDIR)/resources/jdk-default.css # Unset the following to suppress the link to the tool guides NAV_LINK_GUIDES := --nav-link-guides - HEADER_RIGHT_SIDE_INFO := '$(subst &,&,$(JDK_SHORT_NAME))$(DRAFT_MARKER_STR)' + HEADER_RIGHT_SIDE_INFO := $(subst &,&,$(JDK_SHORT_NAME))$(DRAFT_MARKER_STR) $(foreach m, $(ALL_MODULES), \ $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \ @@ -612,7 +612,7 @@ ifeq ($(ENABLE_PANDOC), true) REPLACEMENTS := \ @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \ @@VERSION_STRING@@ => $(VERSION_STRING), \ - POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info $(HEADER_RIGHT_SIDE_INFO) \ + POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \ --nav-subdirs $($m_$f_NOF_SUBDIRS) $(NAV_LINK_GUIDES), \ )) \ $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \ @@ -647,7 +647,7 @@ ifeq ($(ENABLE_PANDOC), true) @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \ @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \ OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \ - POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info $(HEADER_RIGHT_SIDE_INFO) \ + POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \ --nav-subdirs 1 --nav-link-guides, \ EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \ $(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \ @@ -663,13 +663,25 @@ endif # Special treatment for generated documentation +SPEC_HEADER_BLOCK := \ +
\ +
\ +
$(HEADER_RIGHT_SIDE_INFO)
\ + \ +
\ +
+ JDWP_PROTOCOL := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html ifneq ($(call ApplySpecFilter, $(JDWP_PROTOCOL)), ) + JDWP_HEADER_BLOCK := $(subst PATH_TO_SPECS,..,$(SPEC_HEADER_BLOCK)) $(eval $(call SetupTextFileProcessing, PROCESS_JDWP_PROTOCOL, \ SOURCE_FILES := $(JDWP_PROTOCOL), \ OUTPUT_DIR := $(DOCS_OUTPUTDIR)/specs/jdwp, \ REPLACEMENTS := \ - => $(SPECS_TOP) ; \ +