X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2FMakefile;h=dc13cc1561ad288013ab4681a6885f83578a5341;hb=ea99a55173ebdcfe60f3b3d6f6c979f5d7785d48;hp=34dd97cd5d86a80ed0c893874ed90962c3603037;hpb=3b7b8afcb429a60d716d5226a5b6ab0d003228b1;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 34dd97cd5..dc13cc156 100644
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -5,7 +5,7 @@ TRIM := sed "s/ \\+$$//"
 
 XOA_DIR      := ../../../components/binaries/xoa
 XOA          := xoa.native
-XOA_CONF     := ground_2/xoa.conf.xml
+XOA_CONF     := ground/xoa.conf.xml
 XOA_OPTS     := ../../matita.conf.xml $(XOA_CONF)
 
 DEP_INPUT    := .depend
@@ -17,18 +17,16 @@ PRB_DIR      := ../../../components/binaries/probe
 PRB          := probe.native
 PRB_OPTS     := $(XOA_OPTS) -g -i
 
-ORIG         := . ./orig.sh 
+ORIG         := . ./orig.sh
 ORIGS        := basic_2/basic_1.orig
 
-CONTRIB      := lambdadelta_2B
-
 WWW          := ../../../../helm/www/lambdadelta
 
-TAGS := all xoa orig elim deps top leaf stats tbls odeps trim contrib clean \
-        home up-home
+TAGS := all names xoa orig elim deps top leaf stats tbls odeps trim clean \
+        pack-ground pack-2a pack-2b \
+        home up-home \
 
-PACKAGES  := ground_2 static_2 basic_2 apps_2 alpha_1
-XPACKAGES := ground_2 static_2 basic_2
+PACKAGES  := ground basic_2A static_2 basic_2 apps_2 alpha_1
 
 LDWS := $(shell find -name "*.ldw.xml")
 TBLS := $(shell find -name "*.tbl")
@@ -55,13 +53,15 @@ endef
 
 $(foreach PKG, $(PACKAGES), $(eval $(call MAS_TEMPLATE,$(PKG))))
 
-# XMAS #######################################################################
+# names ######################################################################
 
-define XMAS_TEMPLATE
-  XMAS += $$(MAS_$(1))
-endef
+NAMES = basic_1A basic_2A static_2 basic_2
 
-$(foreach PKG, $(XPACKAGES), $(eval $(call XMAS_TEMPLATE,$(PKG))))
+%/names.txt: %/*/*.ma
+	@echo "PROBE $* -ns"
+	$(H)$(PRB_DIR)/$(PRB) $(PRB_OPTS) $* -ns | sort > $@
+
+names: $(NAMES:%=%/names.txt)
 
 # xoa ########################################################################
 
@@ -88,7 +88,7 @@ $(DEP_INPUT): LINE = $(MAS:%=%:include \"\".)
 $(DEP_INPUT): $(MAS) Makefile
 	@echo "  GREP include"
 	$(H)grep "include \"" $(MAS) > $(DEP_INPUT)
-	$(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT) 
+	$(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT)
 
 # dep ########################################################################
 
@@ -126,7 +126,7 @@ define STATS_TEMPLATE
   $$(STT_$(1)): P4 = $$(shell grep "qed[.-]" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): D1 = $$(word 5, $$(C0))
   $$(STT_$(1)): D2 = $$(word 7, $$(C0))
-  $$(STT_$(1)): D3 = $$(shell grep "defined[.-]" $$(MAS_$(1)) | wc -l)  
+  $$(STT_$(1)): D3 = $$(shell grep "defined[.-]" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M1 = $$(word 6, $$(C0))
   $$(STT_$(1)): M2 = $$(shell grep "$$(OPEN)\*[^*:]*$$$$" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M3 = $$(shell grep "(\*\*)" $$(MAS_$(1)) | wc -l)
@@ -136,7 +136,7 @@ $$(STT_$(1)): $$(MAS_$(1)) $(1)/probe.txt
 	@printf '%-15s %-46s' 'Statistics for:' $(1)
 	@printf '\x1B[0m\n'
 	@printf '\x1B[1;40;35m'
-	@printf '%-12s' '' 
+	@printf '%-12s' ''
 	@printf '   %-8s %6i' Chars $$(C2)
 	@printf '   %-7s %7i' Nodes $$(C3)
 	@printf '   %-11s' ''
@@ -186,7 +186,7 @@ define SUMMARY_TEMPLATE
   $$(SUM_$(1)): S2 = $$(word 2, $$(C0))
   $$(SUM_$(1)): S3 = $$(word 3, $$(C0))
   $$(SUM_$(1)): S4 = $$(word 4, $$(C0))
-  $$(SUM_$(1)): S5 = $$(shell printf "%.1f" `echo "scale=2;$$(S4)/$$(S2)"|bc`)
+  $$(SUM_$(1)): S5 = $$(shell printf "%.1f" `echo "scale=2;if($$(S2)!=0)$$(S4)/$$(S2) else 0"|bc`)
   $$(SUM_$(1)): C1 = $$(word 5, $$(C0))
   $$(SUM_$(1)): C2 = $$(word 7, $$(C0))
   $$(SUM_$(1)): C3 = $$(shell echo "$$(C1)+$$(C2)"|bc)
@@ -244,11 +244,41 @@ TRIMS := $(MAS) $(TBLS) $(LDWS)
 
 trim: $(TRIMS:%=%.trimmed)
 
-# contrib ####################################################################
+# package ground #############################################################
+
+pack-ground: PKG = lambdadelta_ground
+
+pack-ground: DIRS = ground
+
+pack-ground: PMAS = $(shell find $(DIRS) -name *.ma)
+
+pack-ground:
+	@echo "  TAR -cjf $(PKG).tar.bz2 root $(DIRS)"
+	$(H)tar -cjf $(PKG).tar.bz2 ../lambdadelta/root $(PMAS:%=../lambdadelta/%)
+
+# package 2A ###################################################################
+
+pack-2a: PKG = lambdadelta_2A
+
+pack-2a: DIRS = basic_2A
+
+pack-2a: PMAS = $(shell find $(DIRS) -name *.ma)
+
+pack-2a:
+	@echo "  TAR -cjf $(PKG).tar.bz2 $(DIRS)"
+	$(H)tar -cjf $(PKG).tar.bz2 $(PMAS:%=../lambdadelta/%)
+
+# package 2B ###################################################################
+
+pack-2b: PKG = lambdadelta_2B
+
+pack-2b: DIRS = static_2 basic_2
+
+pack-2b: PMAS = $(shell find $(DIRS) -name *.ma)
 
-contrib:
-	@echo "  TAR -cjf $(CONTRIB).tar.bz2 root $(XPACKAGES)"
-	$(H)tar -cjf $(CONTRIB).tar.bz2 ../lambdadelta/root $(XMAS:%=../lambdadelta/%)
+pack-2b:
+	@echo "  TAR -cjf $(PKG).tar.bz2 $(DIRS)"
+	$(H)tar -cjf $(PKG).tar.bz2 $(PMAS:%=../lambdadelta/%)
 
 # clean ######################################################################