The branch master has been updated via 0d901a188206337f6b05aaa8030d077ce2cba6a7 (commit) via 47495e47d7291a0aeb8f47d1dbbad044b61f3b84 (commit) from 773282bef044fc98ba75b0f7626eb765b0177b90 (commit)
- Log ----------------------------------------------------------------- commit 0d901a188206337f6b05aaa8030d077ce2cba6a7 Author: Richard Levitte <levi...@openssl.org> Date: Fri Sep 3 17:14:50 2021 +0200 Add dependency on Makefile on all other targets that use |releases| Reviewed-by: Tim Hudson <t...@openssl.org> (Merged from https://github.com/openssl/web/pull/258) commit 47495e47d7291a0aeb8f47d1dbbad044b61f3b84 Author: Richard Levitte <levi...@openssl.org> Date: Fri Sep 3 17:08:51 2021 +0200 Make the manpage sidebar generated from template Since this is another file where the contents depend on what we release, we make this a template alongside all other templates, which do their thing from the definition of |releases|. Reviewed-by: Tim Hudson <t...@openssl.org> (Merged from https://github.com/openssl/web/pull/258) ----------------------------------------------------------------------- Summary of changes: Makefile | 13 +++++++++---- inc/mansidebar.shtml => docs/mansidebar.html.tt | 5 +++-- 2 files changed, 12 insertions(+), 6 deletions(-) rename inc/mansidebar.shtml => docs/mansidebar.html.tt (57%) diff --git a/Makefile b/Makefile index 6aba02c..b9b0d4d 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ SIMPLE = newsflash.inc sitemap.txt \ docs/OpenSSLStrategicArchitecture.html \ docs/OpenSSL300Design.html \ docs/manpages.html \ + docs/mansidebar.shtml \ news/changelog.html \ $(foreach S,$(SERIES),news/openssl-$(S)-notes.inc) \ $(foreach S,$(SERIES),news/openssl-$(S)-notes.html) \ @@ -195,9 +196,13 @@ manpages: $(foreach S,$(MANSERIES),man-apropos-$(S) man-index-$(S)) mancross: ./bin/mk-mancross master $(SERIES) -docs/manpages.html: docs/manpages.html.tt +docs/manpages.html: docs/manpages.html.tt Makefile bin/from-tt @rm -f $@ - ./bin/from-tt releases='master $(SERIES)' docs/manpages.html.tt + ./bin/from-tt releases='master $(SERIES)' $< + +docs/mansidebar.html: docs/mansidebar.html.tt Makefile bin/from-tt + @rm -f $@ + ./bin/from-tt releases='master $(SERIES)' $< ###################################################################### ## @@ -235,7 +240,7 @@ news/changelog.inc: news/changelog.md bin/mk-changelog @rm -f $@ (echo 'Table of contents'; sed -e '1,/^OpenSSL Releases$$/d' < $<) \ | pandoc -t html5 -f commonmark | ./bin/post-process-html5 >$@ -news/changelog.html: news/changelog.html.tt news/changelog.inc +news/changelog.html: news/changelog.html.tt news/changelog.inc Makefile bin/from-tt @rm -f $@ ./bin/from-tt 'releases=$(SERIES)' $< # Additionally, make news/changelog.html depend on clxy[z].txt, where xy[z] @@ -361,7 +366,7 @@ endef # remains named 'fips' $(foreach S,fips $(SERIES) $(OLDSERIES2),$(eval $(call mkoldsourceindex,$(S),$(patsubst fips,FIPS,$(S))))) -source/old/index.html: source/old/index.html.tt bin/from-tt +source/old/index.html: source/old/index.html.tt Makefile bin/from-tt @rm -f $@ ./bin/from-tt releases='$(SERIES) $(OLDSERIES2) fips' $< diff --git a/inc/mansidebar.shtml b/docs/mansidebar.html.tt similarity index 57% rename from inc/mansidebar.shtml rename to docs/mansidebar.html.tt index b6c4293..6237fb8 100644 --- a/inc/mansidebar.shtml +++ b/docs/mansidebar.html.tt @@ -3,8 +3,9 @@ <section> <h1><a href="/docs/manpages.html">Manpages</a></h1> <ul> - <li><a href="/docs/manmaster">master</a></li> - <li><a href="/docs/man1.1.1">1.1.1</a></li> +[% FOREACH release IN releases.split('\s+') -%] + <li><a href="/docs/man[% release %]">[% release %]</a></li> +[% END -%] </ul> </section> </aside>