web site update

[helm.git] / helm / www / lambdadelta / Makefile

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 2f35c136573f74114dd25b5ae9ebc506003ef97d..df4a4b51942408d74a716fc85918d5464706eb97 100644 (file)
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,3 +1,4 @@
+SHELL := $(shell which bash)
 H=@
 
 TAGS = www up-html up-css up-images up-download \
@@ -17,7 +18,8 @@ XMLDIR     = xml
 SRCDIR     = web/home
 LDDLDIR    = web/lddl
 XHTBLDIR   = bin/xhtbl
-HTMLDIR    = static/lddl
+INDEXDIR   = bin/index
+HTMLDIR    = html/lddl
 JEDDIR     = $(HOME)/mps/jed
 BIBDIR     = $(HOME)/texmf/bibtex/bib
 CONTRIBDIR = $(ETCDIR)/lambdadelta
@@ -32,6 +34,9 @@ RXMLDIR  = $(RHOMEDIR)/xml
 RDOWNDIR = $(RHOMEDIR)/download
 RSTATICDIR = /projects/helm/public_html/lambda-delta/static
 
+DLHTMLSTAMP = $(ETCDIR)/lddl_html.stamp
+DLHTMLIXSTAMP = $(ETCDIR)/lddl_html_ix.stamp
+
 SLS     = helena.sl automath.sl
 BIB     = lambdadelta.bib
 CONTRIB = lambdadelta_2.tar.gz
@@ -50,8 +55,9 @@ COQ      = coq/grundlagen_2.v
 MATITA = matita/root matita/grundlagen_2.ma
 
 XMLLINT = xmllint --noout
-XSLT    = xalan
+XSLT    = xsltproc
 XHTBL   = $(XHTBLDIR)/xhtbl.native
+INDEX   = $(INDEXDIR)/index.native
 
 XHTBLOPTS =
 
@@ -94,7 +100,6 @@ ifeq ($(MAKECMDGOALS), www)
 endif
 
 all:
-       @echo $(HTMLS)
 
 www: $(HTMLS) $(TBLS) $(XHTBL)
 
@@ -102,7 +107,7 @@ lint-xml: $(XMLS:%=$(XMLDIR)/%)
        @echo XMLLINT --valid
        $(H)$(XMLLINT) --valid $^
 
-$(ETCDIR)/make-html.sh $(XMLDIR)/index.txt index:
+$(ETCDIR)/make_html.sh $(XMLDIR)/index.txt index:
        @echo "  GENERATE INDEXES"
        $(H)find $(XMLDIR) -name "*.ld.xml" | sed s/.xml//g | sed s/xml/ld:/g > $(XMLDIR)/index.txt
        $(H)sed "s/^/make --no-print-directory /" $(XMLDIR)/index.txt | sed s.ld:/.. > $(ETCDIR)/make_html.sh
@@ -121,13 +126,45 @@ test-html:
 
 html: $(ETCDIR)/make_html.sh
        @echo "  MAKE */*.ld"
-       $(H). $<
+#      $(H). $<
+       $(H)$(INDEX) -i $(LDDLDIR) -o $(HTMLDIR) .
+
+test: $(DLHTMLIXSTAMP)
+
+$(DLHTMLSTAMP):
+       $(H)for LDW in `find $(LDDLDIR) -name *.ldw.xml`; do \
+       TMP=$${LDW/web/html};HTML=$${TMP/ldw.xml/html}; \
+       echo "  XSLT $$LDW"; \
+       mkdir -p $${HTML%/*}; \
+       $(XSLT) $(XSLT_OUT) $$HTML $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $$LDW; \
+       done
+       $(H)touch $@
+       $(H)touch $(DLHTMLIXSTAMP)
+
+$(DLHTMLIXSTAMP):
+       $(H)for LDW in `find $(LDDLDIR) -name index.ldw.xml`; do \
+       TMP=$${LDW/web/html};HTML=$${TMP/ldw.xml/html}; \
+       echo "  XSLT $$LDW"; \
+       mkdir -p $${HTML%/*}; \
+       $(XSLT) $(XSLT_OUT) $$HTML $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $$LDW; \
+       done
+       $(H)touch $@
+
+install-html: $(ETCDIR)/html_lddl.tar.bz2
+
+$(ETCDIR)/html_lddl.tar.bz2:
+       @echo "  INSTALL html"
+       $(H)tar -cjf $@ $(HTMLDIR)
+       $(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
+       $(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
+
+install-html-ix: $(ETCDIR)/html_lddl_ix.tar.bz2
 
-install-html $(DOWNDIR)/static_lddl.tar.bz2: $(ETCDIR)/exclude.txt $(ETCDIR)/make_html.sh
+$(ETCDIR)/html_lddl_ix.tar.bz2:
        @echo "  INSTALL html"
-       $(H)tar -cjf $(DOWNDIR)/static_lddl.tar.bz2 -C static -X $< lddl
-       $(H)scp $(DOWNDIR)/static_lddl.tar.bz2 $(RDOWNDIR)
-       $(H)ssh $(REMOTE) "cd $(RSTATICDIR) && tar -xjf ../../lambdadelta/download/static_lddl.tar.bz2
+#      $(H)tar -cjf $@ `find $(HTMLDIR) -name index.html`
+       $(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
+       $(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
 
 install-jed: $(SLS:%=$(JEDDIR)/%)
        @echo "  INSTALL $(SLS)"
@@ -164,7 +201,7 @@ install-v: $(HELENADIR)/$(COQ)
 
 up-html:
        @echo "  UPDATE $(RHOMEDIR)/html/"
-       $(H)scp -q -r html $(RHOMEDIR)
+       $(H)scp -q html/*.html $(RHOMEDIR)/html/
 
 up-css:
        @echo "  UPDATE $(RHOMEDIR)/css/"
@@ -180,9 +217,9 @@ up-download:
 
 %.ld:
        @echo "  XSLT $@"
-       $(H)mkdir -p $(LDDLDIR)/$(@D)
-       $(H)$(XSLT) $(XSLT_OUT) $(LDDLDIR)/$@.ldw.xml $(XSLT_XSL) $(XSLTDIR)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
-       $(H)mkdir -p $(HTMLDIR)/$(@D)
-       $(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $(LDDLDIR)/$@.ldw.xml
+#      $(H)mkdir -p $(LDDLDIR)/$(@D)
+#      $(H)$(XSLT) --novalid $(XSLT_OUT) $(LDDLDIR)/$@.ldw.xml $(XSLT_XSL) $(XSLTDIR)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
+#      $(H)mkdir -p $(HTMLDIR)/$(@D)
+#      $(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $(LDDLDIR)/$@.ldw.xml
 
 .PHONY: $(TAGS)