Convert SSI includes to tt includes in community/

This also fixes community/dirdata.yaml for better rendering of breadcrumbs

Reviewed-by: Anton Arapov <[email protected]>
Reviewed-by: Tomas Vavra <[email protected]>
(Merged from openssl#430)

Author: levitte

.gitignore

@@ -5,9 +5,13 @@ blog
 sitemap.txt
 ./*.html
 community/committers.inc
+community/committers.md
 community/omc-alumni.inc
+community/omc-alumni.md
 community/otc.inc
+community/otc.md
 community/omc.inc
+community/omc.md
 community/*.html
 docs/OpenSSL300Design.html
 docs/OpenSSLStrategicArchitecture.html

Makefile

@@ -61,7 +61,8 @@ FUTURESERIES=
 # they have their own special handling.
 H_TOP = $(addsuffix .html,$(basename $(shell git ls-files -- *.md)))
 H_COMMUNITY = $(addsuffix .html,\
-                $(basename $(shell git ls-files -- community/*.md)))
+                $(basename $(shell git ls-files -- community/*.md)) \
+                $(basename $(basename $(shell git ls-files -- community/*.md.tt))))
 # We filter out any file starting with 'sub-'...  they get special treatment
 H_DOCS = $(addsuffix .html,\
            $(basename $(shell git ls-files -- docs/*.md \
@@ -87,8 +88,6 @@ H_SUPPORT = $(addsuffix .html,$(basename $(shell git ls-files -- support/*.md)))
 SIMPLE = $(H_TOP) \
 	 newsflash.inc \
 	 $(H_COMMUNITY) \
-	 community/committers.inc community/otc.inc \
-	 community/omc.inc community/omc-alumni.inc \
 	 news/changelog.html \
 	 $(foreach S,$(SERIES),news/openssl-$(S)-notes.inc) \
 	 $(foreach S,$(SERIES),news/openssl-$(S)-notes.html) \
@@ -389,13 +388,16 @@ community/committers.inc: $(PERSONDB) bin/mk-committers Makefile
 	wget -q https://api.openssl.org/0/Group/commit/Members
 	./bin/mk-committers <Members >$@
 	@rm -f Members
+community/committers.md: community/committers.inc
 
 community/otc.inc: $(PERSONDB) bin/mk-omc Makefile
 	./bin/mk-omc -n -p -t 'OTC Members' otc otc-inactive > $@
 community/omc.inc: $(PERSONDB) bin/mk-omc Makefile
 	./bin/mk-omc -n -e -l -p -t 'OMC Members' omc omc-inactive > $@
+community/omc.md: community/omc.inc
 community/omc-alumni.inc: $(PERSONDB) bin/mk-omc Makefile
 	./bin/mk-omc -n -l -t 'OMC Alumni' omc-alumni omc-emeritus > $@
+community/omc-alumni.md: community/omc-alumni.inc
 
 news/changelog.inc: news/changelog.txt bin/post-process-html5 Makefile
 	@rm -f $@
@@ -583,6 +585,9 @@ source/old/index.md: source/old/index.md.tt Makefile bin/from-tt Makefile
 	@rm -f $@
 	./bin/from-tt releases='$(SERIES) $(OLDSERIES2) fips' $<
 
+# Extra inc -> markdown dependencies
+
+
 # Extra HTML dependencies (apart from the markdown file it comes from)
 
 # makehtmldepend creates a standard dependency for HTML files rendered from

community/committers.md community/committers.md.ttcommunity/committers.md renamed to community/committers.md.tt

@@ -15,6 +15,6 @@ source tree, with appropriate code reviews.
   <td wdith="50%">Name</td>
   <td wdith="50%">GitHub ID</td>
 </tr>
-<!--#include virtual="committers.inc" -->
+[% INCLUDE "committers.inc" %]
 </table>
 </p>

community/dirdata.yaml

@@ -1,21 +1,19 @@
 ---
-breadcrumbs:
-  - |
-    [Home](/) : [Community](.)
-sidebar:
-  - |
-    # [Community](.)
+breadcrumbs: >-
+  [Home](/) : [Community](.)
+sidebar: |
+  # [Community](.)
 
-    -   [Our Mission and Values](mission.html)
-    -   [List of Committers](committers.html)
-    -   [OpenSSL Technical Committee](otc.html)
-    -   [OpenSSL Management Committee](omc.html)
-    -   [Code of Conduct](conduct.html)
-    -   [Contact Information](contacts.html)
-    -   [Getting Started as a Contributor](getting-started.html)
-    -   [Mailing Lists](mailinglists.html)
-    -   [Wiki](https://wiki.openssl.org)
-    -   [Blog](/blog)
-    -   [Binaries and Engines](binaries.html)
-    -   [Thanks!](thanks.html)
+  -   [Our Mission and Values](mission.html)
+  -   [List of Committers](committers.html)
+  -   [OpenSSL Technical Committee](otc.html)
+  -   [OpenSSL Management Committee](omc.html)
+  -   [Code of Conduct](conduct.html)
+  -   [Contact Information](contacts.html)
+  -   [Getting Started as a Contributor](getting-started.html)
+  -   [Mailing Lists](mailinglists.html)
+  -   [Wiki](https://wiki.openssl.org)
+  -   [Blog](/blog)
+  -   [Binaries and Engines](binaries.html)
+  -   [Thanks!](thanks.html)
 ---

community/omc-alumni.md community/omc-alumni.md.ttcommunity/omc-alumni.md renamed to community/omc-alumni.md.tt

@@ -7,6 +7,6 @@ We gratefully acknowledge the contributions of the following alumni (who
 were previously in the OMC, or a team member or founder prior to
 creation of the OMC):
 
-<p><!--#include virtual="omc-alumni.inc" --></p>
+<p>[% INCLUDE "omc-alumni.inc" %]</p>
 
 We also respectfully remember Ulf Möller who is no longer with us.

community/omc.md community/omc.md.ttcommunity/omc.md renamed to community/omc.md.tt

@@ -9,7 +9,7 @@ are taken on the basis of a vote.
 
 The current OMC consists of (in alphabetical order):
 
-<p><!--#include virtual="omc.inc" --></p>
+<p>[% INCLUDE "omc.inc" %]</p>
 
 Names with an (I) are currently inactive as defined in our
 [bylaws](/policies/omc-bylaws.html).

community/otc.md.tt

@@ -9,7 +9,7 @@ the basis of a vote.
 
 The current OTC consists of (in alphabetical order):
 
-<p><!--#include virtual="otc.inc" --></p>
+<p>[% INCLUDE "otc.inc" %]</p>
 
 Names with an (I) are currently inactive as defined in our
 [bylaws](/policies/omc-bylaws.html).