X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitamakeLib.ml;h=f811c84e2ecd56d633a6430d01ae933f62024b6e;hb=cf45f0f766c147324e587522a4a3761b5ac13415;hp=75c7e742d068d0f1bd2194f9faa95899cb3c5b64;hpb=ef08e2dc4458a7db58575e1694e580c1a8e39a9b;p=helm.git

diff --git a/helm/software/matita/matitamakeLib.ml b/helm/software/matita/matitamakeLib.ml
index 75c7e742d..f811c84e2 100644
--- a/helm/software/matita/matitamakeLib.ml
+++ b/helm/software/matita/matitamakeLib.ml
@@ -75,7 +75,12 @@ let initialize () =
           match root with 
           | None -> ()
           | Some root -> 
-              developments := {root = root ; name = name} :: !developments) 
+              developments := {root = root ; name = name} :: !developments;
+              let inc = Helm_registry.get_list 
+                Helm_registry.string "matita.includes" in
+              Helm_registry.set_list Helm_registry.of_string 
+                ~key:"matita.includes" ~value:(inc @ [root])
+          ) 
       l
 
 (* finds the makefile path for development devel *)
@@ -96,12 +101,11 @@ let development_for_dir dir =
       false
     else
       let pref = String.sub d2 0 len1 in
-      pref = d1
+      pref = d1 && (len1 = len2 || d2.[len1] = '/')
   in
-  (* it must be unique *)
   try
     Some (List.find (fun d -> is_prefix_of d.root dir) !developments)
-  with Not_found -> None
+  with Not_found | Failure _ -> None
 
 let development_for_name name =
   try 
@@ -186,6 +190,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 +202,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 =
@@ -296,6 +302,7 @@ let destroy_development_aux development clean_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