changeset 55112:ad4285992012

8224257: fix issues in files generated by pandoc Reviewed-by: tbell, jjg, erikj Contributed-by: jonathan.gibbons@oracle.com, erik.joelsson@oracle.com
author jjg
date Thu, 30 May 2019 10:37:48 -0700
parents 63fa55abb6d2
children a41029c383bf
files make/Docs.gmk make/Main.gmk make/ToolsJdk.gmk
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/Docs.gmk	Thu May 30 18:10:34 2019 +0100
+++ b/make/Docs.gmk	Thu May 30 10:37:48 2019 -0700
@@ -586,6 +586,7 @@
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
             OPTIONS := -A $($m_$f_BOTTOM_FILE), \
             EXTRA_DEPS := $($m_$f_BOTTOM_FILE), \
+            POST_PROCESS := $(TOOL_FIXUPPANDOC), \
         )) \
         $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \
       ) \
@@ -616,6 +617,7 @@
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
             REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \
             OPTIONS := -A $(SPECS_BOTTOM_FILE_1), \
+            POST_PROCESS := $(TOOL_FIXUPPANDOC), \
             EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
                 $(PANDOC_HTML_MANPAGE_FILTER_JAVASCRIPT) \
                 $(SPECS_BOTTOM_FILE_1), \
--- a/make/Main.gmk	Thu May 30 18:10:34 2019 +0100
+++ b/make/Main.gmk	Thu May 30 10:37:48 2019 -0700
@@ -869,7 +869,7 @@
   JVM_DOCS_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc
 
   # The gensrc steps for hotspot and jdk.jdi create html spec files.
-  docs-jdk-specs: $(JVM_DOCS_TARGETS) jdk.jdi-gensrc \
+  docs-jdk-specs: buildtools-jdk $(JVM_DOCS_TARGETS) jdk.jdi-gensrc \
       docs-jdk-index
 
   docs-zip: docs-jdk
--- a/make/ToolsJdk.gmk	Thu May 30 18:10:34 2019 +0100
+++ b/make/ToolsJdk.gmk	Thu May 30 10:37:48 2019 -0700
@@ -117,6 +117,9 @@
 TOOL_PUBLICSUFFIXLIST = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.publicsuffixlist.GeneratePublicSuffixList
 
+TOOL_FIXUPPANDOC = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.fixuppandoc.Main
+
 ##########################################################################################
 
 # Executable javascript filter for man page generation using pandoc.