grundlagen web pages updated

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

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index f46fcdc303454d6ffee77b37166195714f5e7067..51ecbd1a5698e532571a967c8d09c4669c650403 100644 (file)
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,14 +1,15 @@
 H=@
 
-TAGS = www up \
+TAGS = www up-html up-css up-images up-download \
        lint-xml index lddl install-xml \
        test-html html install-html \
-       install-jed install-bib install-contrib \
-       install-automath install-matita \
+       install-jed install-bib install-2 install-1 install-coq \
+       install-automath install-v install-matita \
 
-LDURL   = http://lambdadelta.info/
+# LDURL = http://lambdadelta.info/
+LDURL = http://helm.cs.unibo.it/lambdadelta/
 
-HOMEDIR = .
+SITEDIR    = html
 ETCDIR     = etc
 DOWNDIR    = download
 XSLTDIR    = xslt
@@ -16,7 +17,7 @@ XMLDIR     = xml
 SRCDIR     = web/home
 LDDLDIR    = web/lddl
 XHTBLDIR   = bin/xhtbl
-HTMLDIR    = static/lddl
+HTMLDIR    = html/lddl
 JEDDIR     = $(HOME)/mps/jed
 BIBDIR     = $(HOME)/texmf/bibtex/bib
 CONTRIBDIR = $(ETCDIR)/lambdadelta
@@ -29,7 +30,7 @@ RDIR     = /projects/helm/public_html/lambdadelta
 RHOMEDIR = $(REMOTE):$(RDIR)
 RXMLDIR  = $(RHOMEDIR)/xml
 RDOWNDIR = $(RHOMEDIR)/download
-RHTMLDIR = /projects/helm/public_html/lambda-delta/static
+RSTATICDIR = /projects/helm/public_html/lambda-delta/static
 
 SLS     = helena.sl automath.sl
 BIB     = lambdadelta.bib
@@ -41,16 +42,19 @@ XMLS = Environment/grundlagen_2/l/not.ld.xml \
        Environment/grundlagen_2/l/e/pairis1.ld.xml \
        Environment/grundlagen_2/l/e/st/eq/landau/n/327/t25.ld.xml \
 
-LDWEB = ld_web.xsl ld_web_root.xsl ld_web_library.xsl
+LDWEB = ld_web.xsl ld_web_root.xsl ld_web_library.xsl ld_web_ebnf.xsl
 
 AUTOMATH = examples/automath/grundlagen_2.aut
+COQ      = coq/grundlagen_2.v
 
 MATITA = matita/root matita/grundlagen_2.ma
 
 XMLLINT = xmllint --noout
-XSLT    = xalan
+XSLT    = xsltproc
 XHTBL   = $(XHTBLDIR)/xhtbl.native
 
+XHTBLOPTS =
+
 ifeq ($(XSLT), xsltproc)
    XSLT_PARAM := --param
    XSLT_OUT   := -o
@@ -69,7 +73,7 @@ endif
 XSLT += $(XSLT_PARAM) baseurl '"$(LDURL)"' $(XSLT_PARAM) date '"$(shell date -R)"'
 
 define HTML_TEMPLATE
-   HTML_$(2)  = $$(HOMEDIR)/$(2).html
+   HTML_$(2)  = $$(SITEDIR)/$(2).html
    HTMLS     += $$(HTML_$(2))
 
    $$(HTML_$(2)): $(1) $$(XSLS) $$(LDWEB:%=$$(XSLTDIR)/%)
@@ -83,30 +87,31 @@ ifeq ($(MAKECMDGOALS), www)
    XSLS  = $(addprefix $(XSLTDIR)/,xhtbl.xsl $(notdir $(TBLS:%.tbl=%.xsl)))
 
    $(XSLS): $(TBLS) $(XHTBL)
-       @echo "  XHTBL *.tbl"
-       $(H)$(XHTBL) -b $(LDURL) -O $(XSLTDIR) $(TBLS)
+       @echo "  XHTBL $(XHTBLOPTS) *.tbl"
+       $(H)$(XHTBL) $(XHTBLOPTS) -b $(LDURL) -O $(XSLTDIR) $(TBLS)
 
    $(foreach LDW,$(LDWS),$(eval $(call HTML_TEMPLATE,$(LDW),$(notdir $(LDW:%.ldw.xml=%)))))
 endif
 
-all: www
+all:
+       @echo $(HTMLS)
 
 www: $(HTMLS) $(TBLS) $(XHTBL)
 
 lint-xml: $(XMLS:%=$(XMLDIR)/%)
        @echo XMLLINT --valid
-       $(H)$(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
 
 $(DOWNDIR)/lddl.tar.bz2 lddl: $(ETCDIR)/exclude.txt $(XMLDIR)/index.txt
        @echo "  GENERATE lddl.tar.bz2"
-       $(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X $< $(XMLDIR) 
+       $(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X $< $(XMLDIR)
 
-install-xml: $(DOWNDIR)/lddl.tar.bz2 
+install-xml: $(DOWNDIR)/lddl.tar.bz2
        @echo "  INSTALL xml"
        $(H)scp $^ $(RDOWNDIR)
        $(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf download/lddl.tar.bz2"
@@ -120,9 +125,9 @@ html: $(ETCDIR)/make_html.sh
 
 install-html $(DOWNDIR)/static_lddl.tar.bz2: $(ETCDIR)/exclude.txt $(ETCDIR)/make_html.sh
        @echo "  INSTALL html"
-       $(H)tar -cjf $(DOWNDIR)/static_lddl.tar.bz2 -C static -X $< lddl 
+       $(H)tar -cjf $(DOWNDIR)/static_lddl.tar.bz2 -C static -X $< lddl
        $(H)scp $(DOWNDIR)/static_lddl.tar.bz2 $(RDOWNDIR)
-       $(H)ssh $(REMOTE) "cd $(RHTMLDIR) && tar -xjf ../../lambdadelta/download/static_lddl.tar.bz2
+       $(H)ssh $(REMOTE) "cd $(RSTATICDIR) && tar -xjf ../../lambdadelta/download/static_lddl.tar.bz2
 
 install-jed: $(SLS:%=$(JEDDIR)/%)
        @echo "  INSTALL $(SLS)"
@@ -133,7 +138,7 @@ install-bib: $(BIB:%=$(BIBDIR)/%)
        $(H)scp $< $(DOWNDIR)
        $(H)scp $< $(DOWNDIR)/$(BIB:%.bib=%.txt)
 
-install-contrib: $(CONTRIB:%=$(CONTRIBDIR)/%)
+install-2: $(CONTRIB:%=$(CONTRIBDIR)/%)
        @echo "  INSTALL $(CONTRIB)"
        $(H)scp $< $(DOWNDIR)
 
@@ -145,14 +150,38 @@ install-matita: $(MATITA:%=$(HELENADIR)/%)
        @echo "  INSTALL matita"
        $(H)tar -C $(HELENADIR) -cjf $(DOWNDIR)/grundlagen_2.tar.bz2 $(MATITA)
 
-up:
-       @echo "  UPDATE $(RHOMEDIR)"
-       $(H)ssh $(REMOTE) "svn up $(RDIR)"
+install-1: etc/coq/ld_731/contrib/lambdadelta.tar.gz
+       @echo "  INSTALL $<"
+       $(H)scp $< $(DOWNDIR)/lambdadelta_1.tar.gz
+
+install-coq:
+       @echo "  INSTALL coq"
+       $(H)ssh $(REMOTE) "cd $(RSTATICDIR)/coq && tar -xjf ../../../lambdadelta/download/lambdadelta_1A.tar.bz2 && . ../../../lambdadelta/etc/to_text.sh v"
+
+install-v: $(HELENADIR)/$(COQ)
+       @echo "  INSTALL $(notdir $<)"
+       $(H)scp $< $(DOWNDIR)
+
+up-html:
+       @echo "  UPDATE $(RHOMEDIR)/html/"
+       $(H)scp -q html/*.html $(RHOMEDIR)/html/
+
+up-css:
+       @echo "  UPDATE $(RHOMEDIR)/css/"
+       $(H)scp -q -r css $(RHOMEDIR)
+
+up-images:
+       @echo "  UPDATE $(RHOMEDIR)/images/"
+       $(H)scp -q -r images $(RHOMEDIR)
+
+up-download:
+       @echo "  UPDATE $(RHOMEDIR)/download/"
+       $(H)scp -q -r download $(RHOMEDIR)
 
 %.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)$(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