X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatitadep.ml;h=050fa220e87d84fd3bf2c54329d2d81c21b02090;hb=55e5bef77f163b29feeb9ad4e83376c5aa301297;hp=fe7cab92075ee99c3dd74bfe57d71934e4cbbb99;hpb=5c1b44dfefa085fbb56e23047652d3650be9d855;p=helm.git diff --git a/helm/software/matita/matitadep.ml b/helm/software/matita/matitadep.ml index fe7cab920..050fa220e 100644 --- a/helm/software/matita/matitadep.ml +++ b/helm/software/matita/matitadep.ml @@ -25,34 +25,59 @@ (* $Id$ *) -open Printf - module GA = GrafiteAst module U = UriManager - +module HR = Helm_registry + +let print_times msg = + let times = Unix.times () in + let stamp = times.Unix.tms_utime +. times.Unix.tms_utime in + Printf.printf "TIME STAMP: %s: %f\n" msg stamp; flush stdout; stamp + +let fix_name f = + let f = + if Pcre.pmatch ~pat:"^\\./" f then String.sub f 2 (String.length f - 2) + else f + in + HExtlib.normalize_path f + +(* FG: old function left for reference *) +let exclude excluded_files files = + let map file = not (List.mem (fix_name file) excluded_files) in + List.filter map files + let main () = +(* let _ = print_times "inizio" in *) + let include_paths = ref [] in + let use_stdout = ref false in (* all are maps from "file" to "something" *) let include_deps = Hashtbl.create 13 in let baseuri_of = Hashtbl.create 13 in let baseuri_of_inv = Hashtbl.create 13 in + let dot_name = "depends" in let dot_file = ref "" in + let set_dot_file () = dot_file := dot_name^".dot" in (* helpers *) - let include_paths = ref [] in - let baseuri_of_script s = + let rec baseuri_of_script s = try Hashtbl.find baseuri_of s with Not_found -> - let _,b,_,_ = + let _,b,_,_ = Librarian.baseuri_of_script ~include_paths:!include_paths s in Hashtbl.add baseuri_of s b; Hashtbl.add baseuri_of_inv b s; + let _ = + if Filename.check_suffix s ".mma" then + let generated = Filename.chop_suffix s ".mma" ^ ".ma" in + ignore (baseuri_of_script generated) + in b in let script_of_baseuri ma b = try Some (Hashtbl.find baseuri_of_inv b) with Not_found -> HLog.error ("Skipping dependency of '"^ma^"' over '"^b^"'"); - HLog.error ("Plase include the file defining such baseuri, or fix"); + HLog.error ("Please include the file defining such baseuri, or fix"); HLog.error ("possibly incorrect verbatim URIs in the .ma file."); None in @@ -63,10 +88,22 @@ let main () = in (* initialization *) MatitaInit.add_cmdline_spec - ["-dot", Arg.Set_string dot_file, - " Save dependency graph in dot format to the given file";]; + ["-dot", Arg.Unit set_dot_file, + "Save dependency graph in dot format and generate a png"; + "-stdout", Arg.Set use_stdout, + "Print dependences on stdout" + ]; MatitaInit.parse_cmdline_and_configuration_file (); MatitaInit.initialize_environment (); + if not (Helm_registry.get_bool "matita.verbose") then MatitaMisc.shutup (); + let cmdline_args = HR.get_list HR.string "matita.args" in + let test x = + Filename.check_suffix x ".ma" || Filename.check_suffix x ".mma" + in + let files = fun () -> match cmdline_args with + | [] -> HExtlib.find ~test "." + | _ -> cmdline_args + in let args = let roots = Librarian.find_roots_in_dir (Sys.getcwd ()) in match roots with @@ -79,11 +116,11 @@ let main () = include_paths := (try Str.split (Str.regexp " ") (List.assoc "include_paths" opts) with Not_found -> []) @ - (Helm_registry.get_list Helm_registry.string "matita.includes"); - HExtlib.find ~test:(fun x -> Filename.check_suffix x ".ma") "." + (HR.get_list HR.string "matita.includes"); + files () | _ -> let roots = List.map (HExtlib.chop_prefix (Sys.getcwd()^"/")) roots in - prerr_endline ("Too many roots found:\n\t" ^ String.concat "\n\t" roots); + prerr_endline ("Too many roots found:\n\t"^String.concat "\n\t" roots); prerr_endline ("\nEnter one of these directories and retry"); exit 1 in @@ -93,62 +130,50 @@ let main () = Hashtbl.add include_deps ma_file ma_file Hashtbl.add include_deps_dot ma_file baseuri *) +(* let _ = print_times "prima di iter1" in *) List.iter (fun ma_file -> ignore (baseuri_of_script ma_file)) ma_files; +(* let _ = print_times "in mezzo alle due iter" in *) + let map s _ l = s :: l in + let ma_files = Hashtbl.fold map baseuri_of [] in List.iter (fun ma_file -> + let _ = if Filename.check_suffix ma_file ".mma" then + let generated = Filename.chop_suffix ma_file ".mma" ^ ".ma" in + Hashtbl.add include_deps generated ma_file; + in let ma_baseuri = baseuri_of_script ma_file in - let dependencies = DependenciesParser.deps_of_file ma_file in + let dependencies = + try DependenciesParser.deps_of_file ma_file + with Sys_error _ -> [] + in + let handle_uri uri = + if not (Http_getter_storage.is_legacy uri) then + let dep = resolve uri ma_baseuri in + match dep with + | None -> () + | Some u -> + match script_of_baseuri ma_file u with + | Some d -> Hashtbl.add include_deps ma_file d + | None -> () + in + let handle_script path = + ignore (baseuri_of_script path); + Hashtbl.add include_deps ma_file path + in List.iter (function - | DependenciesParser.UriDep uri -> + | DependenciesParser.UriDep uri -> let uri = UriManager.string_of_uri uri in - if not (Http_getter_storage.is_legacy uri) then - let dep = resolve uri ma_baseuri in - (match dep with - | None -> () - | Some u -> - match script_of_baseuri ma_file u with - | Some d -> Hashtbl.add include_deps ma_file d - | None -> ()) - | DependenciesParser.IncludeDep path -> - ignore (baseuri_of_script path); - Hashtbl.add include_deps ma_file path) + handle_uri uri + | DependenciesParser.InlineDep path -> + if Librarian.is_uri path + then handle_uri path else handle_script path + | DependenciesParser.IncludeDep path -> + handle_script path) dependencies) ma_files; - (* dot generation *) - if !dot_file <> "" then - begin - let oc = open_out !dot_file in - let fmt = Format.formatter_of_out_channel oc in - GraphvizPp.Dot.header fmt; - List.iter - (fun ma_file -> - let deps = Hashtbl.find_all include_deps ma_file in - let deps = - HExtlib.filter_map - (fun u -> - try Some (Hashtbl.find baseuri_of_inv u) - with Not_found -> None) - deps - in - let deps = List.fast_sort Pervasives.compare deps in - let deps = HExtlib.list_uniq deps in - GraphvizPp.Dot.node ma_file fmt; - List.iter (fun dep -> GraphvizPp.Dot.edge ma_file dep fmt) deps) - ma_files; - GraphvizPp.Dot.trailer fmt; - close_out oc - end; (* generate regular depend output *) - let fix_name f = - let f = - if Pcre.pmatch ~pat:"^\\./" f then - String.sub f 2 (String.length f - 2) - else - f - in - HExtlib.normalize_path f - in +(* let _ = print_times "dopo di iter2" in *) let deps = List.fold_left (fun acc ma_file -> @@ -169,8 +194,27 @@ let main () = acc d) [] deps in - Librarian.write_deps_file (Sys.getcwd()) + let where = if !use_stdout then None else Some (Sys.getcwd()) in + Librarian.write_deps_file where (deps@HExtlib.list_uniq (List.sort Pervasives.compare (List.map (fun x -> - x,[]) extern))) -;; - + x,[]) extern))); + (* dot generation *) + if !dot_file <> "" then + begin + let oc = open_out !dot_file in + let fmt = Format.formatter_of_out_channel oc in + GraphvizPp.Dot.header fmt; + List.iter + (fun (ma_file,deps) -> + GraphvizPp.Dot.node ma_file fmt; + List.iter (fun dep -> GraphvizPp.Dot.edge ma_file dep fmt) deps) + deps; + List.iter + (fun x -> GraphvizPp.Dot.node ~attrs:["style","dashed"] x fmt) + extern; + GraphvizPp.Dot.trailer fmt; + close_out oc; + ignore(Sys.command ("tred "^ !dot_file^"| dot -Tpng -o"^dot_name^".png")); + HLog.message ("Type 'eog "^dot_name^".png' to view the graph"); + end; +(* let _ = print_times "fine" in () *)