X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitamakeLib.ml;h=f811c84e2ecd56d633a6430d01ae933f62024b6e;hb=81b43e348e0c3e61114900d1e1df058ecc68cd90;hp=490e753e86abd853d37b672a424c8d7f21e581b9;hpb=1108f4fe01ea2dccd8d3b591f2cdc131dab7913e;p=helm.git diff --git a/helm/software/matita/matitamakeLib.ml b/helm/software/matita/matitamakeLib.ml index 490e753e8..f811c84e2 100644 --- a/helm/software/matita/matitamakeLib.ml +++ b/helm/software/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 } @@ -76,14 +75,22 @@ 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 *) 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 = @@ -94,13 +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 @@ -112,7 +117,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 @@ -137,26 +141,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 @@ -183,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 = @@ -194,9 +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); *) make development.root args let build_development ?matita_flags ?(target="all") development = @@ -239,6 +249,7 @@ let mk_maker refresh_cb = let pid = ref ~-1 in ignore(Sys.signal Sys.sigchld (Sys.Signal_ignore)); 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; @@ -267,7 +278,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 @@ -277,11 +287,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 +301,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