X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2FMakefile;h=e9008a950c30a13b68e2dba934c0aa5991b00610;hb=3c6ff3987c3cc5e2df03fb76d07697c28c89c0a8;hp=cbdcfd4f0c1f044b8d95f92118103b0a46b1b6b1;hpb=9c489fe144c562dca776df59264329b704e18c49;p=helm.git

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index cbdcfd4f0..e9008a950 100644
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,21 +1,22 @@
 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/
 
-HOMEDIR = .
+SITEDIR    = html
 ETCDIR     = etc
 DOWNDIR    = download
 XSLTDIR    = xslt
 XMLDIR     = xml
 SRCDIR     = web/home
+LDDLDIR    = web/lddl
 XHTBLDIR   = bin/xhtbl
-HTMLDIR    = $(HOME)/public_html/lddl
+HTMLDIR    = static/lddl
 JEDDIR     = $(HOME)/mps/jed
 BIBDIR     = $(HOME)/texmf/bibtex/bib
 CONTRIBDIR = $(ETCDIR)/lambdadelta
@@ -27,8 +28,8 @@ REMOTE   = helm.cs.unibo.it
 RDIR     = /projects/helm/public_html/lambdadelta
 RHOMEDIR = $(REMOTE):$(RDIR)
 RXMLDIR  = $(RHOMEDIR)/xml
-RHTMLDIR = $(RHOMEDIR)/static/lddl
 RDOWNDIR = $(RHOMEDIR)/download
+RSTATICDIR = /projects/helm/public_html/lambda-delta/static
 
 SLS     = helena.sl automath.sl
 BIB     = lambdadelta.bib
@@ -40,9 +41,10 @@ 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
 
@@ -50,6 +52,8 @@ XMLLINT = xmllint --noout
 XSLT    = xalan
 XHTBL   = $(XHTBLDIR)/xhtbl.native
 
+XHTBLOPTS =
+
 ifeq ($(XSLT), xsltproc)
    XSLT_PARAM := --param
    XSLT_OUT   := -o
@@ -68,7 +72,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)/%)
@@ -82,19 +86,20 @@ 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:
 	@echo "  GENERATE INDEXES"
@@ -103,15 +108,13 @@ $(ETCDIR)/make-html.sh $(XMLDIR)/index.txt index:
 
 $(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"
 
-#	$(H)scp -r $(XMLDIR) $(RXMLDIR)
-
 test-html:
 	@$(MAKE) --no-print-directory $(XMLS:%.xml=%)
 
@@ -119,9 +122,11 @@ html: $(ETCDIR)/make_html.sh
 	@echo "  MAKE */*.ld"
 	$(H). $<
 
-install-html: $(ETCDIR)/make_html.sh
+install-html $(DOWNDIR)/static_lddl.tar.bz2: $(ETCDIR)/exclude.txt $(ETCDIR)/make_html.sh
 	@echo "  INSTALL html"
-	$(H)scp -r $(HTMLDIR)/* $(RHTMLDIR)
+	$(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
 
 install-jed: $(SLS:%=$(JEDDIR)/%)
 	@echo "  INSTALL $(SLS)"
@@ -132,7 +137,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)
 
@@ -144,16 +149,39 @@ 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 -xzf ../../../lambdadelta/download/lambdadelta_1.tar.gz && . ../../../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)
+
+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)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
-
-%.ldc:
-	@echo "  SKIP $@"
+	$(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $(LDDLDIR)/$@.ldw.xml
 
 .PHONY: $(TAGS)