severe bug found in parallel zeta

[helm.git] / helm / software / matita / Makefile

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index 0218c9dbd53b8d197cbd5d4a86d271f75b8c36b6..fcf51b5d05f46ffc252d9b8eaad6a8c3ddb8d6b1 100644 (file)
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -5,7 +5,13 @@ include ../Makefile.defs
 NULL =
 H=@
 
-OCAML_FLAGS = -pp $(CAMLP5O) -rectypes
+ifeq ($(ANNOT),true)
+  ANNOTOPTION = -dtypes
+else
+  ANNOTOPTION =
+endif
+
+OCAML_FLAGS = -pp $(CAMLP5O) -rectypes $(ANNOTOPTION) 
 OCAMLDEP_FLAGS = -pp $(CAMLP5O) 
 PKGS = -package "$(MATITA_REQUIRES)"
 CPKGS = -package "$(MATITA_CREQUIRES)"
@@ -31,23 +37,25 @@ MLI = \
        lablGraphviz.mli        \
        matitaTypes.mli         \
        matitaMisc.mli          \
+       applyTransformation.mli \
        matitaEngine.mli        \
        matitaExcPp.mli         \
-       applyTransformation.mli \
        matitacLib.mli          \
        matitaInit.mli          \
-       matitaAutoGui.mli       \
        matitaGtkMisc.mli       \
+       matitaAutoGui.mli       \
+       virtuals.mli            \
        matitaScript.mli        \
+       predefined_virtuals.mli \
        matitaMathView.mli      \
        matitaGui.mli           \
        $(NULL)
 CMLI =                         \
        matitaTypes.mli         \
        matitaMisc.mli          \
+       applyTransformation.mli \
        matitaEngine.mli        \
        matitaExcPp.mli         \
-       applyTransformation.mli \
        matitacLib.mli          \
        matitaInit.mli          \
        matitaWiki.mli          \
@@ -61,7 +69,7 @@ ML = buildTimeConf.ml matitaGeneratedGui.ml $(MLI:%.mli=%.ml)
 # objects for matitac (batch compiler)
 CML = buildTimeConf.ml $(CMLI:%.mli=%.ml)
 MAINCML = $(MAINCMLI:%.mli=%.ml)
-       
+
 PROGRAMS_BYTE = \
        matita matitac matitadep matitaclean \
        matitawiki
@@ -179,21 +187,23 @@ distclean: clean
        $(H)rm -f matita.conf.xml.sample
        $(H)rm -rf .matita
 
-TEST_DIRS =                            \
-       legacy                          \
-       library                         \
-       tests                           \
-       dama                            \
-       contribs/CoRN                   \
-       contribs/RELATIONAL             \
-       contribs/LOGIC                  \
-       contribs/LAMBDA-TYPES           \
-       contribs/PREDICATIVE-TOPOLOGY   \
+TEST_DIRS =                    \
+       legacy                  \
+       library                 \
+       contribs/character      \
+       tests                   \
+       contribs/dama/dama      \
+       contribs/assembly       \
+       contribs/CoRN           \
+       contribs/RELATIONAL     \
+       contribs/LOGIC          \
+       contribs/limits         \
        $(NULL)
 
 #      library_auto                    
-TEST_DIRS_OPT =                        \
-       $(TEST_DIRS)        \
+TEST_DIRS_OPT =                \
+       $(TEST_DIRS)            \
+#      contribs/LAMBDA-TYPES   \
        $(NULL)
 
 .PHONY: tests tests.opt cleantests cleantests.opt
@@ -216,17 +226,16 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 ifeq ($(DISTRIBUTED),yes)
 
 
-dist_library: install_preliminaries dist_library@library
-dist_library@%: 
-       $(H)echo "depend $*"
-       $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitadep)
-       $(H)echo "publish $*"
-       $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitac -system -noinnertypes)
-       $(H)echo "destroy $*"
-       $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitaclean)
-       # sqlite3 only
+dist_library: install_preliminaries 
+       $(H)echo "depend"
+       $(H)cd $(WHERE)/ma/standard-library;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitadep)
+       $(H)echo "publish"
+       $(H)cd $(WHERE)/ma/standard-library;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitac -system -noinnertypes)
+       $(H)echo "destroy"
+       $(H)cd $(WHERE)/ma/standard-library;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitaclean)
+# sqlite3 only
        $(H)cp $(WHERE)/.matita/matita.db  $(WHERE)/metadata.db || true
-       #$(H)rm -rf $(WHERE)/.matita/
+#$(H)rm -rf $(WHERE)/.matita/
        touch $@
 
 endif
@@ -256,7 +265,7 @@ INSTALL_STUFF_BIN = $(INSTALL_PROGRAMS)
 endif
 
 install-arch: install_preliminaries 
-install-indep: dist_library 
+install-indep: 
 
 install_preliminaries : install_preliminaries.stamp
 
@@ -275,8 +284,8 @@ endif
        $(H)for p in $(INSTALL_PROGRAMS_LINKS_MATITA); do \
                ln -fs matita $(WHERE)/$$p;\
        done
-       $(H)cd library;../matitadep
        $(H)cp -a library/ $(WHERE)/ma/standard-library
+       $(H)cp -a nlibrary/ $(WHERE)/ma/new-standard-library
 
        $(H)touch install_preliminaries.stamp
 
@@ -360,7 +369,7 @@ TAGS:
        $(H)cd ..; otags -vi -r components/ matita/
 
 .PHONY: depend
-       
+
 depend: 
        $(H)echo "  OCAMLDEP"
        $(H)$(OCAMLDEP) *.ml *.mli > .depend