X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2FMakefile;h=df4a4b51942408d74a716fc85918d5464706eb97;hp=5366cc649adbe3d12ac82860f9c2cfe0597ea28f;hb=7bb7028a9aafcfd5c6570f4ad5ca472f19691bfc;hpb=f7d7f2459b3b0409be5f168822be3b836ccc929b

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 5366cc649..df4a4b519 100644
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,14 +1,16 @@
+SHELL := $(shell which bash)
 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-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 +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
@@ -31,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
@@ -49,8 +55,11 @@ 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 =
 
 ifeq ($(XSLT), xsltproc)
    XSLT_PARAM := --param
@@ -70,7 +79,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)/%)
@@ -84,30 +93,30 @@ 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:
 
 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"
@@ -117,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)"
@@ -152,21 +193,33 @@ 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:
-	@echo "  UPDATE $(RHOMEDIR)"
-	$(H)ssh $(REMOTE) "svn up $(RDIR)"
+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)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)