From: Ferruccio Guidi <ferruccio.guidi@unibo.it>
Date: Sat, 22 Sep 2007 21:29:37 +0000 (+0000)
Subject: - system flag now forks for matitadep too
X-Git-Tag: make_still_working~5999
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=ae5ab4187e4dcc57a16d2375445f8353fbad7d92;p=helm.git

- system flag now forks for matitadep too
= legacy Base-1 and LambdaDelta-1 reinserted on tests.
  will compile in system space because they are published
---

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index 0562ba3bb..93a6fc6cb 100644
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -199,6 +199,7 @@ distclean: clean
 	$(H)rm -rf .matita
 
 TEST_DIRS = 				\
+	legacy                          \
 	library 			\
 	tests 				\
 	dama				\
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile
index e869346ab..3198e94cf 100644
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Base-1/makefile
@@ -1,7 +1,7 @@
-H=@
+H= @
 
 RT_BASEDIR=../../../
-OPTIONS=-bench -onepass
+OPTIONS=-bench -onepass -system
 MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS)
 CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) 
 MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS)
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile
index b8fec3cd2..8f20b3276 100644
--- a/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/LambdaDelta-1/makefile
@@ -1,7 +1,7 @@
 H=@
 
 RT_BASEDIR=../../../
-OPTIONS=-bench -onepass 
+OPTIONS=-bench -onepass -system
 MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS)
 CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) 
 MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS)
diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
index 6e29fc2da..93fba67ce 100644
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,6 +1,6 @@
 GOALS = all opt clean clean.opt
 
-DEVELS = Base-2 Unified-Sub 
+DEVELS = Base-1 LambdaDelta-1 Base-2 Unified-Sub 
 
 $(GOALS): 
 	@$(foreach DEVEL, $(DEVELS), $(MAKE) -k -C $(DEVEL) $@;) 
diff --git a/helm/software/matita/legacy/makefile b/helm/software/matita/legacy/makefile
index ec9f8cb26..a1dd3ca33 100644
--- a/helm/software/matita/legacy/makefile
+++ b/helm/software/matita/legacy/makefile
@@ -1,7 +1,7 @@
 H=@
 
 RT_BASEDIR=../
-OPTIONS=-bench
+OPTIONS=-bench -onepass -system
 MMAKE=$(RT_BASEDIR)matitamake $(OPTIONS)
 CLEAN=$(RT_BASEDIR)matitaclean $(OPTIONS) 
 MMAKEO=$(RT_BASEDIR)matitamake.opt $(OPTIONS)
diff --git a/helm/software/matita/matitaInit.ml b/helm/software/matita/matitaInit.ml
index cf821c167..44b09b5ae 100644
--- a/helm/software/matita/matitaInit.ml
+++ b/helm/software/matita/matitaInit.ml
@@ -331,6 +331,8 @@ let initialize_all () =
 let parse_cmdline_and_configuration_file () =
   status := List.fold_left (fun s f -> f s) !status conf_components
 
-;;
+let initialize_environment () =
+  status := initialize_environment !status
 
-Inversion_principle.init ()
+let _ =
+  Inversion_principle.init ()
diff --git a/helm/software/matita/matitaInit.mli b/helm/software/matita/matitaInit.mli
index 272657cc3..ac0dc6a75 100644
--- a/helm/software/matita/matitaInit.mli
+++ b/helm/software/matita/matitaInit.mli
@@ -28,6 +28,7 @@ val initialize_all: unit -> unit
 
   (** {2 per-components initialization} *)
 val parse_cmdline_and_configuration_file: unit -> unit
+val initialize_environment: unit -> unit
 
   (** {2 Utilities} *)
 
diff --git a/helm/software/matita/matitadep.ml b/helm/software/matita/matitadep.ml
index 3a5ee6561..cfbc3783c 100644
--- a/helm/software/matita/matitadep.ml
+++ b/helm/software/matita/matitadep.ml
@@ -55,6 +55,7 @@ let main () =
     ["-dot", Arg.Set_string dot_file,
       "<file> Save dependency graph in dot format to the given file"];
   MatitaInit.parse_cmdline_and_configuration_file ();
+  MatitaInit.initialize_environment ();
   let include_paths =
    Helm_registry.get_list Helm_registry.string "matita.includes" in
   let args = Helm_registry.get_list Helm_registry.string "matita.args" in
diff --git a/helm/software/matita/matitamakeLib.ml b/helm/software/matita/matitamakeLib.ml
index ccfdd9bab..eed971f45 100644
--- a/helm/software/matita/matitamakeLib.ml
+++ b/helm/software/matita/matitamakeLib.ml
@@ -355,7 +355,7 @@ let publish_development_bstract build clean devel =
     let orig_matita_flags = 
       try Sys.getenv "MATITA_FLAGS" with Not_found -> "" 
     in
-    "\"" ^ orig_matita_flags ^ "\"", "\"" ^ orig_matita_flags ^ " -system\"" 
+    orig_matita_flags, orig_matita_flags ^ " -system" 
   in
   HLog.message "cleaning the development before publishing";
   if clean ~matita_flags devel then
diff --git a/helm/software/matita/template_makefile.in b/helm/software/matita/template_makefile.in
index e61f757d6..ac3e14498 100644
--- a/helm/software/matita/template_makefile.in
+++ b/helm/software/matita/template_makefile.in
@@ -17,7 +17,7 @@ all: $(TODO)
 
 clean:
 	$(MATITACLEAN) $(MATITA_FLAGS) $(SRC) 
-	rm -f $(TODO)
+	rm -f $(TODO) @DEPFILE@
 
 %.moo:
 	if [ -z "$<" ]; then \