X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2FMakefile;h=4c610a09a64fdf41bc6d923a9fbfeb3ecd09e525;hb=9b75ad80a3ee31314c02f113b255ad533a87d3d2;hp=0da13bb383983d363cceae09549166c85a496ba3;hpb=add1600e1ceef0f1c7e07a4d13c60edd7a3ea367;p=helm.git

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 0da13bb38..4c610a09a 100644
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -3,21 +3,21 @@ H=@
 TAGS = www up \
        lint-xml index lddl install-xml \
        test-html html install-html \
-       install-jed install-bib \
+       install-jed install-bib install-contrib \
 
 LDURL   = http://lambdadelta.info/
-LDDLURL = $(LDURL)static/lddl
 
 HOMEDIR = .
-ETCDIR   = etc
-DOWNDIR  = download
-XSLTDIR  = xslt
-XMLDIR   = xml
-SRCDIR   = web/home
-XHTBLDIR = bin/xhtbl
-HTMLDIR  = $(HOME)/public_html/lddl
-JEDDIR   = $(HOME)/mps/jed
-BIBDIR   = $(HOME)/texmf/bibtex/bib
+ETCDIR     = etc
+DOWNDIR    = download
+XSLTDIR    = xslt
+XMLDIR     = xml
+SRCDIR     = web/home
+XHTBLDIR   = bin/xhtbl
+HTMLDIR    = $(HOME)/public_html/lddl
+JEDDIR     = $(HOME)/mps/jed
+BIBDIR     = $(HOME)/texmf/bibtex/bib
+CONTRIBDIR = $(ETCDIR)/lambdadelta
 
 WEBDIRS  = $(SRCDIR) $(ETCDIR)
 
@@ -26,8 +26,9 @@ RDIR     = /projects/helm/public_html/lambdadelta
 RXMLDIR  = $(REMOTE):$(RDIR)/xml
 RHTMLDIR = $(REMOTE):$(RDIR)/static/lddl
 
-SLS = helena.sl automath.sl
-BIB = lambdadelta.bib
+SLS     = helena.sl automath.sl
+BIB     = lambdadelta.bib
+CONTRIB = lambdadelta_2.tar.gz
 
 XMLS = brg_si/grundlagen/l/not.ld.xml \
        brg_si/grundlagen/l/et.ld.xml \
@@ -44,10 +45,25 @@ XMLS = brg_si/grundlagen/l/not.ld.xml \
 LDWEB = ld_web.xsl ld_web_root.xsl ld_web_library.xsl
 
 XMLLINT = xmllint --noout
-XSLT    = xsltproc
+XSLT    = xalan
 XHTBL   = $(XHTBLDIR)/xhtbl.native
 
-%.html: BASEURL = --stringparam baseurl $(LDURL)
+ifeq ($(XSLT), xsltproc)
+   XSLT_PARAM := --param
+   XSLT_OUT   := -o
+   XSLT_XSL   :=
+   XSLT_IN    :=
+endif
+
+ifeq ($(XSLT), xalan)
+   XSLT_PARAM := -param
+   XSLT_OUT   := -out
+   XSLT_XSL   := -xsl
+   XSLT_IN    := -in
+   XSLT       += -indent 2
+endif
+
+XSLT += $(XSLT_PARAM) baseurl '"$(LDURL)"' $(XSLT_PARAM) date '"$(shell date -R)"'
 
 define HTML_TEMPLATE
    HTML_$(2)  = $$(HOMEDIR)/$(2).html
@@ -55,7 +71,7 @@ define HTML_TEMPLATE
 
    $$(HTML_$(2)): $(1) $$(XSLS) $$(LDWEB:%=$$(XSLTDIR)/%)
 	@echo "  XSLT $$(notdir $$<)"
-	$$(H)$$(XSLT) -o $$@ $$(BASEURL) $$(XSLTDIR)/ld_web.xsl $$<
+	$$(H)$$(XSLT) $$(XSLT_OUT) $$@ $$(XSLT_XSL) $$(XSLTDIR)/ld_web.xsl $$(XSLT_IN) $$<
 endef
 
 ifeq ($(MAKECMDGOALS), www)
@@ -65,14 +81,14 @@ ifeq ($(MAKECMDGOALS), www)
 
    $(XSLS): $(TBLS) $(XHTBL)
 	@echo "  XHTBL *.tbl"
-	$(H)$(XHTBL) -O $(XSLTDIR) $(TBLS)
+	$(H)$(XHTBL) -b $(LDURL) -O $(XSLTDIR) $(TBLS)
 
    $(foreach LDW,$(LDWS),$(eval $(call HTML_TEMPLATE,$(LDW),$(notdir $(LDW:%.ldw.xml=%)))))
 endif
 
 all: www
 
-www: $(HTMLS)
+www: $(HTMLS) $(TBLS) $(XHTBL)
 
 lint-xml: $(XMLS:%=$(XMLDIR)/%)
 	@echo XMLLINT --valid
@@ -110,16 +126,19 @@ install-bib: $(BIB:%=$(BIBDIR)/%)
 	@echo "  INSTALL $(BIB)"
 	$(H)scp $< $(DOWNDIR)
 	$(H)scp $< $(DOWNDIR)/$(BIB:%.bib=%.txt)
+
+install-contrib: $(CONTRIB:%=$(CONTRIBDIR)/%)
+	@echo "  INSTALL $(CONTRIB)"
+	$(H)scp $< $(DOWNDIR)
+
 up:
 	@echo "  UPDATE $(REMOTE):$(RDIR)"
 	$(H)ssh $(REMOTE) "svn up $(RDIR)"
 
-%.ld: BASEURL = --stringparam baseurl $(LDDLURL)
-
 %.ld:
 	@echo "  XSLT $@"
 	$(H)mkdir -p $(HTMLDIR)/$(@D)
-	$(H)$(XSLT) -o $(HTMLDIR)/$@.html $(BASEURL) $(XSLTDIR)/lddl.xsl $(XMLDIR)/$@.xml
+	$(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
 
 %.ldc:
 	@echo "  SKIP $@"