X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FmatitamakeLib.ml;h=0ab251ddc5d3c5784f2a296550e767f5f4219dc1;hb=7b05e20cb3ed6be79c2fdf94654047b1e58902f9;hp=553e1176fe21df83355923d3ca1f8b8506333c2a;hpb=e85f44f9159792f670ca831e239a17d9ed3a9a70;p=helm.git

diff --git a/matita/matitamakeLib.ml b/matita/matitamakeLib.ml
index 553e1176f..0ab251ddc 100644
--- a/matita/matitamakeLib.ml
+++ b/matita/matitamakeLib.ml
@@ -101,7 +101,7 @@ let development_for_dir dir =
       false
     else
       let pref = String.sub d2 0 len1 in
-      pref = d1 && d2.[len1] = '/'
+      pref = d1 && (len1 = len2 || d2.[len1] = '/')
   in
   try
     Some (List.find (fun d -> is_prefix_of d.root dir) !developments)
@@ -193,11 +193,7 @@ let call_make ?matita_flags development target make =
   let csc = try ["SRC=" ^ Sys.getenv "SRC"] with Not_found -> [] 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 = flags @ if nodb then ["NODB=true"] else [] in
   let flags =
     try
       flags @ [ sprintf "MATITA_FLAGS=\"%s\"" matita_flags ]
@@ -247,7 +243,7 @@ let mk_maker refresh_cb =
     let out_r,out_w = Unix.pipe () in
     let err_r,err_w = Unix.pipe () in
     let pid = ref ~-1 in
-    ignore(Sys.signal Sys.sigchld (Sys.Signal_ignore));
+    let oldhandler = Sys.signal Sys.sigchld (Sys.Signal_ignore) in
     try
 (*       prerr_endline (String.concat " " args); *)
       let argv = Array.of_list ("make"::args) in
@@ -271,10 +267,13 @@ let mk_maker refresh_cb =
         aux r;
         refresh_cb ()
       done;
+      ignore(Sys.signal Sys.sigchld oldhandler);
       true
     with 
     | Unix.Unix_error (_,"read",_)
-    | Unix.Unix_error (_,"select",_) -> true)
+    | Unix.Unix_error (_,"select",_) -> 
+        ignore(Sys.signal Sys.sigchld oldhandler);
+        true)
 
 let build_development_in_bg ?matita_flags ?(target="all") refresh_cb development =
   call_make ?matita_flags development target (mk_maker refresh_cb)
@@ -325,12 +324,18 @@ let root_for_development development = development.root
 let name_for_development development = development.name
 
 let publish_development_bstract build clean devel = 
-  let matita_flags = "\"-system\"" in
+  let matita_flags, matita_flags_system = 
+    let orig_matita_flags = 
+      try Sys.getenv "MATITA_FLAGS" with Not_found -> "" 
+    in
+    "\"" ^ orig_matita_flags ^ "\"", "\"" ^ orig_matita_flags ^ " -system\"" 
+  in
   HLog.message "cleaning the development before publishing";
-  if clean ~matita_flags:"" devel then
+  if clean ~matita_flags devel then
     begin
       HLog.message "rebuilding the development in 'system' space";
-      if build ~matita_flags devel then
+      (* here we should use pristine metadata if we use sqlite *)
+      if build ~matita_flags:matita_flags_system devel then
         begin
           HLog.message "publishing succeded";
           true