[web] master update

[Richard Levitte]

The branch master has been updated
       via  e2ba17260f0cc0a1fd1b0c20bf5238a4795076df (commit)
      from  ac35d06e77a972cafbebc4ec233d3fd9525206e6 (commit)


- Log -----------------------------------------------------------------
commit e2ba17260f0cc0a1fd1b0c20bf5238a4795076df
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jul 30 12:28:54 2021 +0200

    Force the production of .inc files that are produced from the personel DB
    
    We have the option to also make this depend on that database, but the
    diverse scripts need to be adapted to make use of that instead of
    querying the data through our REST API.  That's another piece of work.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/252)

-----------------------------------------------------------------------

Summary of changes:
 Makefile | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9eedcec..27d99ae 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,14 @@ SNAP = $(CHECKOUTS)/openssl
 ## Where releases are found.
 RELEASEDIR = /var/www/openssl/source
 
+## The OMC repository checkout can be used for dependencies.
+## By default, we don't assume it, as not everyone has access to it.
+## If you have it, do 'make PERSONDB=PATH/TO/omc/persondb.yaml' where
+## PATH/TO/omc is the checked out OMC repository.
+## We let it be FORCE by default...  This forces the production of files
+## that depend on this database, instead of just conditionally.
+PERSONDB=FORCE
+
 ######################################################################
 ##
 ##  Release series.  These represent our release branches, and are
@@ -186,17 +194,17 @@ sitemap sitemap.txt:
 	@rm -f sitemap.txt
 	./bin/mk-sitemap master $(SERIES) > sitemap.txt
 
-community/committers.inc:
+community/committers.inc: $(PERSONDB)
 	@rm -f $@
 	wget -q https://api.openssl.org/0/Group/commit/Members
 	./bin/mk-committers <Members >$@
 	@rm -f Members
 
-community/otc.inc:
+community/otc.inc: $(PERSONDB)
 	./bin/mk-omc -n -t 'OTC Members' otc otc-inactive > $@
-community/omc.inc:
+community/omc.inc: $(PERSONDB)
 	./bin/mk-omc -n -e -l -p -t 'OMC Members' omc omc-inactive > $@
-community/omc-alumni.inc:
+community/omc-alumni.inc: $(PERSONDB)
 	./bin/mk-omc -n -l -t 'OMC Alumni' omc-alumni omc-emeritus > $@
 
 docs/faq.inc: $(wildcard docs/faq-[0-9]-*.txt) bin/mk-faq
@@ -332,4 +340,4 @@ source/old/index.html: source/old/index.html.tt bin/from-tt
 # than the tarballs that are moved into their respective directory,
 # we must declare them phony, or they will not be regenerated when
 # they should.
-.PHONY : $(SRCLISTS)
+.PHONY : $(SRCLISTS) FORCE