From: Ferruccio Guidi Date: Mon, 12 Sep 2011 12:00:49 +0000 (+0000) Subject: refactoring completed! X-Git-Tag: make_still_working~2288 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=eadeb433386822aac6862c76ba73957c07a99098;p=helm.git refactoring completed! --- diff --git a/helm/software/helena/Makefile b/helm/software/helena/Makefile index 248d12606..9070d13c4 100644 --- a/helm/software/helena/Makefile +++ b/helm/software/helena/Makefile @@ -10,29 +10,17 @@ KEEP = README CLEAN = etc/log.txt etc/profile.txt -TAGS = test-si test-si-fast profile xml-si xml-si-crg html test-html \ - install-html install-lddl install-dtd install-xml instal-css - - -XMLS = xml/brg_si/grundlagen/l/not.ld.xml \ - xml/brg_si/grundlagen/l/et.ld.xml \ - xml/brg_si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ - xml/brg_si/grundlagen/l/e/pairis1.ld.xml \ - xml/brg_si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ - xml/crg_si/grundlagen/l/not.ld.xml \ - xml/crg_si/grundlagen/l/et.ld.xml \ - xml/crg_si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ - xml/crg_si/grundlagen/l/e/pairis1.ld.xml \ - xml/crg_si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ - xml/brg_si/grundlagen/ccs.ldc.xml +TAGS = test-si test-si-fast profile xml-si xml-si-crg include Makefile.common +XMLDIR = $(HOME)/svn/helm-stable/www/lambda_delta + INPUT = examples/grundlagen/grundlagen.aut test-si: $(MAIN).opt etc @echo " HELENA -p -o -c $(INPUT)" - $(H)./$(MAIN).opt -p -o -c -S 3 $(O) $(INPUT) > etc/log.txt + $(H)./$(MAIN).opt -p -o -c -S 3 -O $(XMLDIR) $(O) $(INPUT) > etc/log.txt test-si-fast: $(MAIN).opt etc @echo " HELENA -o -q $(INPUT)" @@ -46,55 +34,8 @@ profile: $(MAIN).opt etc xml-si: $(MAIN).opt etc @echo " HELENA -o -x -s 2 $(INPUT)" - $(H)./$(MAIN).opt -o -x -s 2 -S 1 $(INPUT) > etc/log.txt + $(H)./$(MAIN).opt -o -x -s 2 -S 1 -O $(XMLDIR) $(INPUT) > etc/log.txt xml-si-crg: $(MAIN).opt etc @echo " HELENA -o -x -s 1 $(INPUT)" - $(H)./$(MAIN).opt -o -x -s 1 -S 1 $(INPUT) > etc/log.txt - -etc: - @echo " MKDIR etc" - $(H)mkdir etc - -%.ld: BASEURL = --stringparam baseurl $(LDDLURL) - -%.ld: - @echo " XSLT $@" - $(H)mkdir -p $(LOCALLDDLDIR)/$(@D) - $(H)$(XSLT) -o $(LOCALLDDLDIR)/$@.html $(BASEURL) xml/lddl.xsl xml/$@.xml - -%.ldc: - @echo " SKIP $@" - -etc/make-html.sh xml/index.txt index: - @echo " GENERATE INDEXES" - $(H)find xml -name "*.ld.xml" | sed s/.xml//g | sed s/xml/ld:/g > xml/index.txt - $(H)sed "s/^/make --no-print-directory /" xml/index.txt | sed s.ld:/.. > etc/make-html.sh - -html: etc/make-html.sh - @echo " MAKE */*.ld" - $(H). $< - -test-html: - @$(MAKE) --no-print-directory $(XMLS:xml/%.xml=%) - -install-html: etc/make-html.sh - @echo " INSTALL xml" - $(H)scp -r $(LOCALLDDLDIR)/* $(LDDLDIR) - -install-lddl: index - @echo " INSTALL lddl.tar.bz2" - $(H)tar -cjf etc/lddl.tar.bz2 -X etc/exclude.txt xml - $(H)scp etc/lddl.tar.bz2 $(DOWNDIR) - -install-dtd: xml/ld.dtd - @echo " INSTALL $<" - $(H)scp $< $(XMLDIR) - -install-css: xml/ld-html.css - @echo " INSTALL $<" - $(H)scp $< $(LDDLDIR) - -install-xml: etc/make-html.sh - @echo " INSTALL xml" - $(H)scp -r xml/index.txt xml/ld.dtd xml/brg_si/ xml/crg_si/ $(XMLDIR) + $(H)./$(MAIN).opt -o -x -s 1 -S 1 -O $(XMLDIR) $(INPUT) > etc/log.txt diff --git a/helm/software/helena/Makefile.common b/helm/software/helena/Makefile.common index 00c54f873..902f37a3d 100644 --- a/helm/software/helena/Makefile.common +++ b/helm/software/helena/Makefile.common @@ -7,11 +7,7 @@ endif RELISE = $(MAIN:%=%_$(shell cat MakeVersion)) -LDDLURL = http://lambda-delta.info/static/lddl -LDDLDIR = mowgli:/projects/helm/public_html/lambda-delta/static/lddl DOWNDIR = $(HOME)/svn/helm-stable/www/lambda_delta/download -XMLDIR = mowgli:/projects/helm/public_html/lambda_delta/xml -LOCALLDDLDIR = $(HOME)/public_html/lddl DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make)) @@ -21,8 +17,6 @@ OCAMLDEP = $(OCAMLFIND) ocamldep -native $(INCLUDES) OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) -linkpkg -package "$(REQUIRES)" $(INCLUDES) OCAMLLEX = ocamllex.opt OCAMLYACC = ocamlyacc -v -XMLLINT = xmllint --noout -XSLT = xsltproc TAR = tar -czf etc/$(MAIN:%=%.tgz) define DIR_TEMPLATE @@ -69,10 +63,6 @@ clean: @echo " CLEAN . $(SRC)" $(H)find -name "*~" | xargs $(RM) $(CLEAN) -lint-xml: $(XMLS) - @echo XMLLINT --valid - $(H)$(XMLLINT) --valid $^ - relise: clean @echo " RELISE $(RELISE)" $(H)mkdir -p $(RELISE) @@ -84,6 +74,10 @@ tgz: clean @echo " TAR -czf $(MAIN:%=%.tgz) . $(DIRECTORIES)" $(H)find -name "Make*" | xargs $(TAR) $(KEEP) +etc: + @echo " MKDIR etc" + $(H)mkdir etc + %.ml %.mli: %.mly @echo " OCAMLYACC $<" $(H)$(OCAMLYACC) $< diff --git a/helm/software/helena/xml/ld.css b/helm/software/helena/xml/ld.css deleted file mode 100644 index 92d2e8d92..000000000 --- a/helm/software/helena/xml/ld.css +++ /dev/null @@ -1,63 +0,0 @@ -@charset "UTF-8"; - -/* general ******************************************************************/ - -body { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); - margin: 2.5%; -} - -a:link, a:visited { - text-decoration: underline; -} - -a:active, a:hover, a:focus { - background: rgb(192, 192, 192); -} - -/* blocks *******************************************************************/ - -.spacer { - text-align: center; -} - -.head1 { - margin: 0.5em 0; - text-align: center; - font-weight: bold; - font-size: xx-large; -} - -.head2 { - margin: 0.5em 0; - text-align: left; - font-weight: bold; - font-size: x-large; -} - -.text { - margin: 1em 0; - text-align: left; -} - -/* inline decorations *******************************************************/ - -.icon32 { - border: 0; - width: 32px; - height: 32px; -} - -.rule { - border: 0; - height: 4px; - width: 100%; -} - -.w3c { - margin: 0 0.5em; - border: 0; - width: 88px; - height: 32px; /* this should be 31px */ -} diff --git a/helm/software/helena/xml/ld.dtd b/helm/software/helena/xml/ld.dtd deleted file mode 100644 index 3dd881315..000000000 --- a/helm/software/helena/xml/ld.dtd +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/helm/software/helena/xml/lddl.css b/helm/software/helena/xml/lddl.css deleted file mode 100644 index 41a635d45..000000000 --- a/helm/software/helena/xml/lddl.css +++ /dev/null @@ -1,43 +0,0 @@ -@charset "UTF-8"; - -/* terms ********************************************************************/ - -.separator { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.sort { - background: rgb(255, 255, 255); - color: rgb(128, 0, 255); -} - -.lref { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.gref { - background: rgb(255, 255, 255); - color: rgb(0, 0, 255); -} - -.appl { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.cast { - background: rgb(255, 255, 255); - color: rgb(255, 0, 0); -} - -.local { - background: rgb(255, 255, 255); - color: rgb(0, 160, 0); -} - -.global { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} diff --git a/helm/software/helena/xml/lddl.xsl b/helm/software/helena/xml/lddl.xsl deleted file mode 100644 index 2711cff96..000000000 --- a/helm/software/helena/xml/lddl.xsl +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/helm/software/helena/xml/lddl_entry.xsl b/helm/software/helena/xml/lddl_entry.xsl deleted file mode 100644 index 676d37722..000000000 --- a/helm/software/helena/xml/lddl_entry.xsl +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - -
- - - - - - - - - - - - - - -
-
- - - - -
-
- -
-
- - - - Declaration - - - - - - Definition - - - -
diff --git a/helm/software/helena/xml/lddl_library.xsl b/helm/software/helena/xml/lddl_library.xsl deleted file mode 100644 index c7914ed64..000000000 --- a/helm/software/helena/xml/lddl_library.xsl +++ /dev/null @@ -1,283 +0,0 @@ - - - - - - - - - - - - , - - - - / - - - - + - - - - .​ - - - - ( - - - - ) - - - - [ - - - - ] - - - - < - - - - > - - - - : - - - - = - - - - " - - - - Informal description: - - - - Validation parameters: - - - - sort hierarchy = - - - - kernel options = - - - - - - - - - - - - - &Pi; - - - - &Pi; - - - &lambda; - - - &lambda; - &infin; - - - &lambda; - - - - - - - - - &delta; - - - - - - &chi; - - - - - - - - - - - - - - - - - - - - - .html - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &lambda;&delta; Digital Library (LDDL) - - - diff --git a/helm/software/helena/xml/lddl_root.xsl b/helm/software/helena/xml/lddl_root.xsl deleted file mode 100644 index c4cf27cd8..000000000 --- a/helm/software/helena/xml/lddl_root.xsl +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - lambda_delta digital library (LDDL) - - - - -
- - [lambda_delta home] -
-
- -
-
- [Spacer] -
- - - -
- - - -
- - - - - - - - - - - -
-
- -
diff --git a/helm/software/helena/xml/lddl_term.xsl b/helm/software/helena/xml/lddl_term.xsl deleted file mode 100644 index 4e0c488b5..000000000 --- a/helm/software/helena/xml/lddl_term.xsl +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -