milestone update in ground_2 and basic_2A

[helm.git] / matita / matita / contribs / lambdadelta / Makefile

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 4438f07b5be99ca54236b68d21ee1510311a8aca..41c7acdd1b2f4e3ef410206eca98e8166398883d 100644 (file)
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -3,16 +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_OPTS    := ../../matita.conf.xml $(XOA2_CONF)
-
 DEP_INPUT    := .depend
 DEP_DIR      := ../../../components/binaries/matitadep
 DEP          := matitadep.native
@@ -22,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 xoa2 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_2 basic_2A static_2 basic_2 apps_2 alpha_1
 
 LDWS := $(shell find -name "*.ldw.xml")
 TBLS := $(shell find -name "*.tbl")
@@ -60,27 +53,21 @@ 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 > $@
 
-# xoa ########################################################################
+names: $(NAMES:%=%/names.txt)
 
-xoa: $(XOA_TARGETS)
+# xoa ########################################################################
 
-$(XOA_TARGETS): $(XOA_CONF)
+xoa: $(XOA_CONF)
        @echo "  EXEC $(XOA) $(XOA_CONF)"
-       $(H)$(XOA_DIR)/$(XOA) $(XOA_OPTS)
-
-# xoa2 #######################################################################
-
-xoa2: $(XOA2_CONF)
-       @echo "  EXEC $(XOA) $(XOA2_CONF)"
-       $(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA2_OPTS)
+       $(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA_OPTS)
 
 # elim #######################################################################
 
@@ -101,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 ########################################################################
 
@@ -139,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)
@@ -149,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' ''
@@ -257,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 -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 ######################################################################