a) update with upstream version

[helm.git] / helm / software / matita / matitadep.ml

diff --git a/helm/software/matita/matitadep.ml b/helm/software/matita/matitadep.ml
index ae95f8cf013f85c081e58032c66ab1cbe5d94cc1..d50707f2932debc4f4766e1132a1a77f45939519 100644 (file)
--- a/helm/software/matita/matitadep.ml
+++ b/helm/software/matita/matitadep.ml
@@ -25,12 +25,31 @@
 
 (* $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
+ 
+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 excluded_files = 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
@@ -38,8 +57,8 @@ let main () =
   let dot_name = "depends" in 
   let dot_file = ref "" in
   let set_dot_file () = dot_file := dot_name^".dot" in
+  let set_excluded_file name = excluded_files := name :: !excluded_files in 
   (* helpers *)
-  let include_paths = ref [] in
   let baseuri_of_script s = 
      try Hashtbl.find baseuri_of s 
      with Not_found -> 
@@ -66,9 +85,20 @@ let main () =
   (* initialization *)
   MatitaInit.add_cmdline_spec 
     ["-dot", Arg.Unit set_dot_file,
-    "Save dependency graph in dot format and generate a png";];
+        "Save dependency graph in dot format and generate a png";
+     "-exclude", Arg.String set_excluded_file,
+        "Exclude a file from the dependences";
+     "-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 files = fun () -> match cmdline_args with
+     | [] -> HExtlib.find ~test:(fun x -> Filename.check_suffix x ".ma") "."
+     | _  -> cmdline_args
+  in
   let args = 
       let roots = Librarian.find_roots_in_dir (Sys.getcwd ()) in
       match roots with
@@ -81,28 +111,24 @@ 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 ("\nEnter one of these directories and retry");
          exit 1
   in
-  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 args = exclude !excluded_files args in
   let ma_files = args in
   (* here we go *)
   (* fills:
               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 *)
   List.iter
    (fun ma_file -> 
       let ma_baseuri = baseuri_of_script ma_file in
@@ -125,6 +151,7 @@ let main () =
        dependencies)
    ma_files;
   (* generate regular depend output *)
+(*  let _ = print_times "dopo di iter2" in *)
   let deps =
     List.fold_left
      (fun acc ma_file -> 
@@ -145,11 +172,12 @@ 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)));
   (* dot generation *)
-  if !dot_file <> "" then 
+  if !dot_file <> "" then
     begin
       let oc = open_out !dot_file in
       let fmt = Format.formatter_of_out_channel oc in 
@@ -167,5 +195,6 @@ let main () =
       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 () *)
+