X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FmatitamakeLib.ml;h=013d45b7a8a8fd4687386d0f73490cb8e31aa361;hb=946be00a2b9e1713e934414bd8419f267cca1077;hp=ec9a40b814b8cca206fef14af5a49af30c8f3f88;hpb=d90d73349df641ea2d18b4c2ff4fe9d970861778;p=helm.git

diff --git a/matita/matitamakeLib.ml b/matita/matitamakeLib.ml
index ec9a40b81..013d45b7a 100644
--- a/matita/matitamakeLib.ml
+++ b/matita/matitamakeLib.ml
@@ -33,7 +33,6 @@ let logger = fun mark ->
   | `Warning -> HLog.warn
   | `Debug -> HLog.debug
   | `Message -> HLog.message
-;;
 
 type development = 
   { root: string ; name: string }
@@ -83,7 +82,10 @@ let initialize () =
 let makefile_for_development devel =
   let develdir = pool () ^ devel.name in
   develdir ^ "/makefile"
-;;
+
+let dot_for_development devel = 
+  let dot_fname = pool () ^ devel.name ^ "/depend.dot" in
+  if Sys.file_exists dot_fname then Some dot_fname else None
 
 (* given a dir finds a development that is radicated in it or below *)
 let development_for_dir dir =
@@ -100,7 +102,6 @@ let development_for_dir dir =
   try
     Some (List.find (fun d -> is_prefix_of d.root dir) !developments)
   with Not_found -> None
-;;
 
 let development_for_name name =
   try 
@@ -112,7 +113,6 @@ let dump_development devel =
   let devel_dir = pool () ^ devel.name in 
   HExtlib.mkdir devel_dir;
   HExtlib.output_file ~filename:(devel_dir ^ rootfile) ~text:devel.root
-;;
 
 let list_known_developments () = 
   List.map (fun r -> r.name,r.root) !developments
@@ -186,6 +186,7 @@ let call_make ?matita_flags development target make =
     already_defined ^ 
       if Helm_registry.get_bool "matita.bench" then "-bench" else ""
   in
+  let csc = try ["SRC=" ^ Sys.getenv "SRC"] with Not_found -> [] in
   rebuild_makefile development;
   let makefile = makefile_for_development development in
   let nodb =
@@ -197,10 +198,11 @@ let call_make ?matita_flags development target make =
     try
       flags @ [ sprintf "MATITA_FLAGS=\"%s\"" matita_flags ]
     with Not_found -> flags in
+  let flags = flags @ csc in
   let args = 
     ["--no-print-directory"; "-s"; "-k"; "-f"; makefile; target] @ flags 
   in
-(*     prerr_endline (String.concat " " args);   *)
+ (*    prerr_endline (String.concat " " args);   *)
   make development.root args
       
 let build_development ?matita_flags ?(target="all") development =
@@ -272,7 +274,6 @@ let mk_maker refresh_cb =
 
 let build_development_in_bg ?matita_flags ?(target="all") refresh_cb development =
   call_make ?matita_flags development target (mk_maker refresh_cb)
-;;
 
 let clean_development ?matita_flags development =
   call_make ?matita_flags development "clean" make
@@ -282,11 +283,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 
@@ -300,6 +297,8 @@ 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");
+    unlink (pool () ^ development.name ^ "/depend.dot");
     rmdir (pool () ^ development.name);
     developments := 
       List.filter (fun d -> d.name <> development.name) !developments