X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2FMakefile;h=f3d8b3232ad8e33d4e84f8c98851de01ee8d8a01;hb=5102e7f780e83c7fef1d3826f81dfd37ee4028bc;hp=2945fc62c91d5e43d9a1e8d910f116af0557afeb;hpb=645b62762e9c86e343d4741541a2ddccfed8ebc7;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 2945fc62c..f3d8b3232 100644
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -25,7 +25,7 @@ MAC_OPTS     :=
 
 PRB_DIR      := ../../../components/binaries/probe
 PRB          := probe.native
-PRB_OPTS     := $(XOA_OPTS) -g 
+PRB_OPTS     := $(XOA_OPTS) -g -i
 
 ORIG         := . ./orig.sh 
 ORIGS        := basic_2/basic_1.orig
@@ -34,13 +34,15 @@ CONTRIB      := lambdadelta_2
 
 TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib
 
-PACKAGES := ground_2 basic_2 apps_2
+PACKAGES  := ground_2 basic_2 apps_2 alpha_1
+XPACKAGES := ground_2 basic_2
 
 LDWS := $(shell find -name "*.ldw.xml")
 TBLS := $(shell find -name "*.tbl")
 
 all:
-	../../matitac.opt
+	@echo "  MATITAC $(PACKAGES)"
+	$(H)../../matitac.opt $(PACKAGES)
 
 # MAS ########################################################################
 
@@ -50,7 +52,7 @@ define MAS_TEMPLATE
 
 $(1)/$(1)_probe.txt: $$(MAS_$(1))
 	@echo "  PROBE $(1)"
-	$$(H)$$(PRB_DIR)/$$(PRB) $$(PRB_OPTS) $(1) -sn -on -i > $$@
+	$$(H)$$(PRB_DIR)/$$(PRB) $$(PRB_OPTS) $(1) -sn -on -c > $$@
 
 $(1)/$(1)_mac.txt: $$(MAS_$(1))
 	@echo "  MAC $(1)"
@@ -59,6 +61,14 @@ endef
 
 $(foreach PKG, $(PACKAGES), $(eval $(call MAS_TEMPLATE,$(PKG))))
 
+# XMAS #######################################################################
+
+define XMAS_TEMPLATE
+  XMAS += $$(MAS_$(1))
+endef
+
+$(foreach PKG, $(XPACKAGES), $(eval $(call XMAS_TEMPLATE,$(PKG))))
+
 # xoa ########################################################################
 
 xoa: $(XOA_TARGETS)
@@ -123,9 +133,10 @@ define STATS_TEMPLATE
   $$(STT_$(1)): P1  = $$(shell grep "^theorem " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): P2  = $$(shell grep "^lemma " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): P3  = $$(shell grep "^fact " $$(MAS_$(1)) | wc -l)
-  $$(STT_$(1)): P4  = $$(shell grep qed $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): P4  = $$(shell grep "qed[.-]" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): C1  = $$(shell grep "^inductive \|^record " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): C2  = $$(shell grep "^definition \|^let rec " $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): C3  = $$(shell grep "defined[.-]" $$(MAS_$(1)) | wc -l)  
   $$(STT_$(1)): M1  = $$(shell grep "^axiom " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M2  = $$(shell grep "$$(OPEN)\*[^*:]*$$$$" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M3  = $$(shell grep "(\*\*)" $$(MAS_$(1)) | wc -l)
@@ -155,7 +166,8 @@ $$(STT_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt $(1)/$(1)_mac.txt
 	@printf '\x1B[1;40;33m'
 	@printf '%-8s %6i' Declared $$(C1)
 	@printf '   %-8s %4i' Defined $$(C2)	
-	@printf '   %-29s' ''
+	@printf '   %-7s %7i' Proved $$(C3)
+	@printf '   %-11s' ''
 	@printf '\x1B[0m\n'
 	@printf '\x1B[1;40;31m'
 	@printf '%-8s %6i' Axioms $$(M1)
@@ -191,30 +203,30 @@ define SUMMARY_TEMPLATE
 
   $$(SUM_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt $(1)/$(1)_mac.txt
 	@printf '  SUMMARY $(1)\n'
-	@printf 'name "$$(basename $$(@F))"\n\n'                >  $$@
-	@printf 'table {\n'                                     >> $$@
-	@printf '   class "gray"   [ "category"\n'              >> $$@
-	@printf '      [ "objects" * ]\n'                       >> $$@
-	@printf '   ]\n'                                        >> $$@
-	@printf '   class "cyan"   [ "sizes"\n'                 >> $$@
-	@printf '      [ "files"      "$$(S4)" ]\n'             >> $$@
-	@printf '      [ "characters" "$$(word 1, $$(S1))" ]\n' >> $$@
-	@printf '      [ "nodes"      "$$(word 3, $$(S0))" ]\n' >> $$@
-	@printf '   ]\n'                                        >> $$@	
-	@printf '   class "green"  [ "propositions"\n'          >> $$@
-	@printf '      [ "theorems" "$$(P1)" ]\n'               >> $$@
-	@printf '      [ "lemmas"   "$$(P2)" ]\n'               >> $$@
-	@printf '      [ "total"    "$$(P3)" ]\n'               >> $$@
-	@printf '   ]\n'                                        >> $$@
-	@printf '   class "yellow" [ "concepts"\n'              >> $$@
-	@printf '      [ "declared" "$$(C1)" ]\n'               >> $$@
-	@printf '      [ "defined"  "$$(C2)" ]\n'               >> $$@
-	@printf '      [ "total"    "$$(C3)" ]\n'               >> $$@
-	@printf '   ]\n'                                        >> $$@
-	@printf '}\n\n'                                         >> $$@
-	@printf 'class "component" { 0 }\n\n'                   >> $$@
-	@printf 'class "plane"     { 1 } { 3 } { 5 }\n\n'       >> $$@
-	@printf 'class "number"    { 2 } { 4 } { 6 }\n'         >> $$@
+	@printf 'name "$$(basename $$(@F))"\n\n'                  >  $$@
+	@printf 'table {\n'                                       >> $$@
+	@printf '   class "gray"   [ "category"\n'                >> $$@
+	@printf '      [ "objects" * ]\n'                         >> $$@
+	@printf '   ]\n'                                          >> $$@
+	@printf '   class "cyan"   [ "sizes"\n'                   >> $$@
+	@printf '      [ "files"      "$$(S4)" ]\n'               >> $$@
+	@printf '      [ "characters" "$$(word 1, $$(S1))" ]\n'   >> $$@
+	@printf '      [ "nodes"      "$$(word 3, $$(S0))" ]\n'   >> $$@
+	@printf '   ]\n'                                          >> $$@	
+	@printf '   class "green"  [ "propositions"\n'            >> $$@
+	@printf '      [ "theorems" "$$(P1)" ]\n'                 >> $$@
+	@printf '      [ "lemmas"   "$$(P2)" ]\n'                 >> $$@
+	@printf '      [ "total"    "$$(P3)" ]\n'                 >> $$@
+	@printf '   ]\n'                                          >> $$@
+	@printf '   class "yellow" [ "concepts"\n'                >> $$@
+	@printf '      [ "declared" "$$(C1)" ]\n'                 >> $$@
+	@printf '      [ "defined"  "$$(C2)" ]\n'                 >> $$@
+	@printf '      [ "total"    "$$(C3)" ]\n'                 >> $$@
+	@printf '   ]\n'                                          >> $$@
+	@printf '}\n\n'                                           >> $$@
+	@printf 'class "capitalize italic" { 0 }\n\n'             >> $$@
+	@printf 'class "italic"            { 1 } { 3 } { 5 }\n\n' >> $$@
+	@printf 'class "right italic"      { 2 } { 4 } { 6 }\n'   >> $$@
 
 .PHONY: $$(SUM_$(1))
 endef
@@ -238,8 +250,8 @@ trim: $(TRIMS:%=%.trimmed)
 # contrib ####################################################################
 
 contrib:
-	@echo "  TAR -czf $(CONTRIB).tar.gz root *.ma"
-	$(H)tar -czf $(CONTRIB).tar.gz root $(MAS)
+	@echo "  TAR -czf $(CONTRIB).tar.gz root $(XPACKAGES)"
+	$(H)tar -czf $(CONTRIB).tar.gz root $(XMAS)
 
 ##############################################################################