grundlagen web pages updated

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

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 938529c637d5a0a491deb549368e6de3d174e548..51ecbd1a5698e532571a967c8d09c4669c650403 100644 (file)
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,12 +1,13 @@
 H=@
 
-TAGS = www up-html \
+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-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/
 
 SITEDIR    = html
 ETCDIR     = etc
@@ -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
@@ -49,7 +50,7 @@ COQ      = coq/grundlagen_2.v
 MATITA = matita/root matita/grundlagen_2.ma
 
 XMLLINT = xmllint --noout
-XSLT    = xalan
+XSLT    = xsltproc
 XHTBL   = $(XHTBLDIR)/xhtbl.native
 
 XHTBLOPTS =
@@ -101,7 +102,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
@@ -155,24 +156,32 @@ install-1: etc/coq/ld_731/contrib/lambdadelta.tar.gz
 
 install-coq:
        @echo "  INSTALL coq"
-       $(H)ssh $(REMOTE) "cd $(RSTATICDIR)/coq && tar -xzf ../../../lambdadelta/download/lambdadelta_1.tar.gz && . ../../../lambdadelta/etc/to_text.sh v"
+       $(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 -r html $(RHOMEDIR)
+       @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"
+       @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