OpenJDK / amber / amber
changeset 57299:a33465cf8774
8227644: make more build-time variables available to Markdown files
Reviewed-by: mchung
| author | jjg |
|---|---|
| date | Fri, 12 Jul 2019 15:15:07 -0700 |
| parents | ff76baab1c90 |
| children | 901ab17af3ce |
| files | make/Docs.gmk make/launcher/LauncherCommon.gmk |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Docs.gmk Fri Jul 12 11:51:07 2019 -0700 +++ b/make/Docs.gmk Fri Jul 12 15:15:07 2019 -0700 @@ -595,7 +595,9 @@ DEST := $(DOCS_OUTPUTDIR)/specs/, \ CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \ OPTIONS := -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_$($m_$f_NOF_SUBDIRS))', \ - REPLACEMENTS := @@VERSION_STRING@@ => $(VERSION_STRING), \ + REPLACEMENTS := \ + @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \ + @@VERSION_STRING@@ => $(VERSION_STRING), \ POST_PROCESS := $(TOOL_FIXUPPANDOC), \ )) \ $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \ @@ -625,7 +627,10 @@ DEST := $(DOCS_OUTPUTDIR)/specs/man, \ FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \ CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \ - REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \ + REPLACEMENTS := \ + @@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \ + @@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), \ EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
--- a/make/launcher/LauncherCommon.gmk Fri Jul 12 11:51:07 2019 -0700 +++ b/make/launcher/LauncherCommon.gmk Fri Jul 12 15:15:07 2019 -0700 @@ -235,7 +235,10 @@ FORMAT := man, \ FILTER := $(PANDOC_TROFF_MANPAGE_FILTER), \ POST_PROCESS := $(MAN_POST_PROCESS), \ - REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \ + REPLACEMENTS := \ + @@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \ + @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \ + @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \ EXTRA_DEPS := $(PANDOC_TROFF_MANPAGE_FILTER) \ $(PANDOC_TROFF_MANPAGE_FILTER_JAVASCRIPT), \ ))