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 *)
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
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 =
- 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 ]
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 =
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
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)
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
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