X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FmatitamakeLib.ml;h=503ed210f53401414236c2f51eb46d195c7c3cae;hb=d0e212dcd4bdbeaee9979e53bedd3258cd8e8d0f;hp=10a543869813d077b319cb4fe43929210cadfe9b;hpb=5cb95a2e44f979183a8c3e39baa3b4e7cfaf8182;p=helm.git

diff --git a/matita/matitamakeLib.ml b/matita/matitamakeLib.ml
index 10a543869..503ed210f 100644
--- a/matita/matitamakeLib.ml
+++ b/matita/matitamakeLib.ml
@@ -137,26 +137,29 @@ let rebuild_makefile development =
   let template = Pcre.replace ~pat:"@CLEAN@" ~templ:rm template in
   HExtlib.output_file ~filename:makefilepath ~text:template
   
+let rebuild_makefile_devel development = 
+  let path = development.root ^ "/makefile" in
+  if not (Sys.file_exists path) then
+    begin
+      let template = 
+        HExtlib.input_file BuildTimeConf.matitamake_makefile_template_devel
+      in
+      let template = 
+        Pcre.replace ~pat:"@MATITA_RT_BASE_DIR@"
+          ~templ:BuildTimeConf.runtime_base_dir template
+      in
+      HExtlib.output_file ~filename:path ~text:template
+    end
+  
 (* creates a new development if possible *)
 let initialize_development name dir =
   let name = Pcre.replace ~pat:" " ~templ:"_" name in 
   let dev = {name = name ; root = dir} in
-  match development_for_dir dir with
-  | Some dev ->
-      if dir <> dev.root then begin
-        logger `Error 
-          (sprintf ("Dir \"%s\" is already handled by development \"%s\"\n"
-            ^^ "Development \"%s\" is rooted in \"%s\"\n"
-            ^^ "Dir \"%s\" is a sub-dir of \"%s\"")
-          dir dev.name dev.name dev.root dir dev.root);
-        None
-      end else (* requirement development alreay exists, do nothing *)
-        Some dev
-  | None -> 
-      dump_development dev;
-      rebuild_makefile dev;
-      developments := dev :: !developments;
-      Some dev
+  dump_development dev;
+  rebuild_makefile dev;
+  rebuild_makefile_devel dev;
+  developments := dev :: !developments;
+  Some dev
 
 let make chdir args = 
   let old = Unix.getcwd () in
@@ -175,28 +178,29 @@ let make chdir args =
       
 let call_make ?matita_flags development target make =
   let matita_flags = 
-    match matita_flags with 
-    | None -> (try Sys.getenv "MATITA_FLAGS" with Not_found -> "")
-    | Some s -> s 
+    let already_defined = 
+      match matita_flags with 
+      | None -> (try Sys.getenv "MATITA_FLAGS" with Not_found -> "")
+      | Some s -> s 
+    in
+    already_defined ^ 
+      if Helm_registry.get_bool "matita.bench" then "-bench" else ""
   in
   rebuild_makefile development;
   let makefile = makefile_for_development development in
   let nodb =
     Helm_registry.get_opt_default Helm_registry.bool ~default:false "db.nodb"
   in
-  let flags = [] in
+  let flags = [] in 
   let flags = flags @ if nodb then ["NODB=true"] else [] in
   let flags =
     try
-      flags @ [ sprintf "MATITA_FLAGS=%s" matita_flags ]
+      flags @ [ sprintf "MATITA_FLAGS=\"%s\"" matita_flags ]
     with Not_found -> flags in
   let args = 
     ["--no-print-directory"; "-s"; "-k"; "-f"; makefile; target] @ flags 
   in
-(*
-  prerr_endline 
-    ("callink make from "^development.root^" args: "^String.concat " " args);
-*)
+(*     prerr_endline (String.concat " " args);   *)
   make development.root args
       
 let build_development ?matita_flags ?(target="all") development =
@@ -238,7 +242,8 @@ let mk_maker refresh_cb =
     let err_r,err_w = Unix.pipe () in
     let pid = ref ~-1 in
     ignore(Sys.signal Sys.sigchld (Sys.Signal_ignore));
-    try 
+    try
+(*       prerr_endline (String.concat " " args); *)
       let argv = Array.of_list ("make"::args) in
       pid := Unix.create_process "make" argv Unix.stdin out_w err_w;
       Unix.close out_w;
@@ -277,11 +282,7 @@ let clean_development_in_bg ?matita_flags  refresh_cb development =
 
 let destroy_development_aux development clean_development =
   let delete_development development = 
-    let unlink file =
-      try 
-        Unix.unlink file 
-      with Unix.Unix_error _ -> logger `Debug ("Unable to delete " ^ file)
-    in
+    let unlink = HExtlib.safe_remove in
     let rmdir dir =
       try
         Unix.rmdir dir 
@@ -295,6 +296,7 @@ let destroy_development_aux development clean_development =
     unlink (makefile_for_development development);
     unlink (pool () ^ development.name ^ rootfile);
     unlink (pool () ^ development.name ^ "/depend");
+    unlink (pool () ^ development.name ^ "/depend.errors");
     rmdir (pool () ^ development.name);
     developments := 
       List.filter (fun d -> d.name <> development.name) !developments