X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2FMakefile;h=41c7acdd1b2f4e3ef410206eca98e8166398883d;hb=1fd63df4c77f5c24024769432ea8492748b4ac79;hp=13465a4fc32d58f30241ecb54106a20e4ea3db27;hpb=621cd752af1ba6b277199c84986104c8119cfa6c;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 13465a4fc..41c7acdd1 100644
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -3,17 +3,11 @@ H    := @
 
 TRIM := sed "s/ \\+$$//"
 
-XOA_CONF     := ground_2/xoa.conf.xml
-XOA_TARGETS  := ground_2/notation/xoa/notation.ma ground_2/xoa/xoa.ma
-
 XOA_DIR      := ../../../components/binaries/xoa
 XOA          := xoa.native
+XOA_CONF     := ground_2/xoa.conf.xml
 XOA_OPTS     := ../../matita.conf.xml $(XOA_CONF)
 
-XOA2_CONF    := ground_2/xoa2.conf.xml
-XOA2_TARGETS := ground_2/notation/xoa/notation2.ma ground_2/xoa/xoa2.ma
-XOA2_OPTS    := ../../matita.conf.xml $(XOA2_CONF)
-
 DEP_INPUT    := .depend
 DEP_DIR      := ../../../components/binaries/matitadep
 DEP          := matitadep.native
@@ -23,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_2
-
 WWW          := ../../../../helm/www/lambdadelta
 
-TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib clean \
-        www up-html
+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 basic_2 apps_2 alpha_1
-XPACKAGES := ground_2 basic_2
+PACKAGES  := ground_2 basic_2A static_2 basic_2 apps_2 alpha_1
 
 LDWS := $(shell find -name "*.ldw.xml")
 TBLS := $(shell find -name "*.tbl")
@@ -49,36 +41,33 @@ define MAS_TEMPLATE
   MAS_$(1) := $$(shell find $(1) -name "*.ma")
   MAS      += $$(MAS_$(1))
 
-$(1)/$(1)_probe.txt: $$(MAS_$(1))
+$(1)/probe.txt: $$(MAS_$(1))
 	@echo "  PROBE $(1)"
 	$$(H)$$(PRB_DIR)/$$(PRB) $$(PRB_OPTS) $(1) -sn -sc -on -oc -f > $$@
-endef
-
-$(foreach PKG, $(PACKAGES), $(eval $(call MAS_TEMPLATE,$(PKG))))
 
-# XMAS #######################################################################
+$(1)/deps.txt: $$(MAS_$(1))
+	@echo "  PROBE $(1)"
+	$$(H)$$(PRB_DIR)/$$(PRB) $$(PRB_OPTS) $(1) -b $$@
 
-define XMAS_TEMPLATE
-  XMAS += $$(MAS_$(1))
 endef
 
-$(foreach PKG, $(XPACKAGES), $(eval $(call XMAS_TEMPLATE,$(PKG))))
+$(foreach PKG, $(PACKAGES), $(eval $(call MAS_TEMPLATE,$(PKG))))
 
-# xoa ########################################################################
+# names ######################################################################
 
-xoa: $(XOA_TARGETS)
+NAMES = basic_1A basic_2A static_2 basic_2
 
-$(XOA_TARGETS): $(XOA_CONF)
-	@echo "  EXEC $(XOA) $(XOA_CONF)"
-	$(H)$(XOA_DIR)/$(XOA) $(XOA_OPTS)
+%/names.txt: %/*/*.ma
+	@echo "PROBE $* -ns"
+	$(H)$(PRB_DIR)/$(PRB) $(PRB_OPTS) $* -ns | sort > $@
 
-# xoa2 #######################################################################
+names: $(NAMES:%=%/names.txt)
 
-xoa2: $(XOA2_TARGETS)
+# xoa ########################################################################
 
-$(XOA2_TARGETS): $(XOA2_CONF)
-	@echo "  EXEC $(XOA) $(XOA2_CONF)"
-	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) $(XOA2_OPTS)
+xoa: $(XOA_CONF)
+	@echo "  EXEC $(XOA) $(XOA_CONF)"
+	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA_OPTS)
 
 # elim #######################################################################
 
@@ -98,26 +87,26 @@ $(DEP_INPUT): LINE = $(MAS:%=%:include \"\".)
 
 $(DEP_INPUT): $(MAS) Makefile
 	@echo "  GREP include"
-	$(H)grep "include \"" $^ > $(DEP_INPUT)
-	$(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT) 
+	$(H)grep "include \"" $(MAS) > $(DEP_INPUT)
+	$(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT)
 
 # dep ########################################################################
 
 deps: $(DEP_INPUT)
 	@echo "  MATITADEP -c"
-	$(H)$(DEP_DIR)/$(DEP) -c $(DEP_OPTS) < $<
+	$(H)$(DEP_DIR)/$(DEP) -c $(DEP_OPTS) $<
 
 # top ########################################################################
 
 top: $(DEP_INPUT)
 	@echo "  MATITADEP -t"
-	$(H)$(DEP_DIR)/$(DEP) -t $(DEP_OPTS) < $<
+	$(H)$(DEP_DIR)/$(DEP) -t $(DEP_OPTS) $<
 
 # leaf #######################################################################
 
 leaf: $(DEP_INPUT)
 	@echo "  MATITADEP -l"
-	$(H)$(DEP_DIR)/$(DEP) -l $(DEP_OPTS) < $<
+	$(H)$(DEP_DIR)/$(DEP) -l $(DEP_OPTS) $<
 
 # stats ######################################################################
 
@@ -125,7 +114,7 @@ define STATS_TEMPLATE
   STT_$(1) := $(1).stats
   STTS     += $$(STT_$(1))
 
-  $$(STT_$(1)): C0 = $$(shell cat $(1)/$(1)_probe.txt)
+  $$(STT_$(1)): C0 = $$(shell cat $(1)/probe.txt)
   $$(STT_$(1)): C2 = $$(word 2, $$(C0))
   $$(STT_$(1)): C3 = $$(word 4, $$(C0))
   $$(STT_$(1)): O1 = $$(shell ls $$(MAS_$(1)) | wc -l)
@@ -137,17 +126,17 @@ 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)
 
-$$(STT_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt
+$$(STT_$(1)): $$(MAS_$(1)) $(1)/probe.txt
 	@printf '\x1B[1;40;37m'
 	@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' ''
@@ -189,10 +178,10 @@ stats: $(STTS)
 # summary ####################################################################
 
 define SUMMARY_TEMPLATE
-  SUM_$(1) := $(1)/web/$(1)_sum.tbl  
+  SUM_$(1) := $(1)/web/$(1)_sum.tbl
   SUMS     += $$(SUM_$(1))
 
-  $$(SUM_$(1)): C0 = $$(shell cat $(1)/$(1)_probe.txt)
+  $$(SUM_$(1)): C0 = $$(shell cat $(1)/probe.txt)
   $$(SUM_$(1)): S1 = $$(word 1, $$(C0))
   $$(SUM_$(1)): S2 = $$(word 2, $$(C0))
   $$(SUM_$(1)): S3 = $$(word 3, $$(C0))
@@ -205,7 +194,7 @@ define SUMMARY_TEMPLATE
   $$(SUM_$(1)): P2 = $$(word 9, $$(C0))
   $$(SUM_$(1)): P3 = $$(shell echo "$$(P1)+$$(P2)"|bc)
 
-  $$(SUM_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt Makefile
+  $$(SUM_$(1)): $$(MAS_$(1)) $(1)/probe.txt Makefile
 	@printf '  SUMMARY $(1)\n'
 	@printf 'name "$$(basename $$(@F))"\n\n'                        >  $$@
 	@printf 'table {\n'                                             >> $$@
@@ -241,6 +230,10 @@ endif
 
 tbls: $(SUMS)
 
+# odeps ######################################################################
+
+odeps: $(PACKAGES:%=%/deps.txt)
+
 # trim #######################################################################
 
 TRIMS := $(MAS) $(TBLS) $(LDWS)
@@ -251,11 +244,41 @@ TRIMS := $(MAS) $(TBLS) $(LDWS)
 
 trim: $(TRIMS:%=%.trimmed)
 
-# contrib ####################################################################
+# package ground #############################################################
+
+pack-ground: PKG = lambdadelta_ground
+
+pack-ground: DIRS = ground_2
+
+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 -czf $(CONTRIB).tar.gz root $(XPACKAGES)"
-	$(H)tar -czf $(CONTRIB).tar.gz root $(XMAS)
+pack-2b:
+	@echo "  TAR -cjf $(PKG).tar.bz2 $(DIRS)"
+	$(H)tar -cjf $(PKG).tar.bz2 $(PMAS:%=../lambdadelta/%)
 
 # clean ######################################################################
 
@@ -264,13 +287,13 @@ clean:
 
 # www ######################################################################
 
-www:
-	$(H)$(MAKE) --no-print-directory -C $(WWW) www
+home:
+	$(H)$(MAKE) --no-print-directory -C $(WWW) home
 
 # www ######################################################################
 
-up-html:
-	$(H)$(MAKE) --no-print-directory -C $(WWW) up-html
+up-home:
+	$(H)$(MAKE) --no-print-directory -C $(WWW) up-home
 
 ##############################################################################