Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add specs post processing to Docs.gmk JDK-8224257-branch
authorerikj
Wed, 22 May 2019 12:13:57 -0700
branchJDK-8224257-branch
changeset 57365 40c87d67e9f2
parent 57363 ac8238552c85
child 57379 97795fc7e6c5
Add specs post processing to Docs.gmk
make/Docs.gmk file | annotate | diff | comparison | revisions
make/Main.gmk file | annotate | diff | comparison | revisions
make/ToolsJdk.gmk file | annotate | diff | comparison | revisions
make/jdk/src/classes/build/tools/fixuppandoc/Main.java file | annotate | diff | comparison | revisions 
--- a/make/Docs.gmk	Mon May 20 17:52:51 2019 -0700
+++ b/make/Docs.gmk	Wed May 22 12:13:57 2019 -0700
@@ -585,6 +585,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))) \
       ) \
@@ -615,6 +616,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	Mon May 20 17:52:51 2019 -0700
+++ b/make/Main.gmk	Wed May 22 12:13:57 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	Mon May 20 17:52:51 2019 -0700
+++ b/make/ToolsJdk.gmk	Wed May 22 12:13:57 2019 -0700
@@ -114,6 +114,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.
--- a/make/jdk/src/classes/build/tools/fixuppandoc/Main.java	Mon May 20 17:52:51 2019 -0700
+++ b/make/jdk/src/classes/build/tools/fixuppandoc/Main.java	Wed May 22 12:13:57 2019 -0700
@@ -54,7 +54,7 @@
      * Runs the program.
      *
      * <pre>
-     *     java build.tools.fixuphtml.Main [-o output-file] [input-file]
+     *     java build.tools.fixuppandoc.Main [-o output-file] [input-file]
      * </pre>
      *
      * If no input file is specified, the program will read from standard input.
jdk-sandbox