Sambin's & Valentini's toolbox (???)

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

diff --git a/helm/software/matita/matitadep.ml b/helm/software/matita/matitadep.ml
index d50707f2932debc4f4766e1132a1a77f45939519..c0d784637b07a540f0059452599c3ce1a4bf0728 100644 (file)
--- a/helm/software/matita/matitadep.ml
+++ b/helm/software/matita/matitadep.ml
@@ -59,14 +59,19 @@ let main () =
   let set_dot_file () = dot_file := dot_name^".dot" in
   let set_excluded_file name = excluded_files := name :: !excluded_files in 
   (* helpers *)
-  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 =
@@ -95,8 +100,11 @@ let main () =
   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:(fun x -> Filename.check_suffix x ".ma") "."
+     | [] -> HExtlib.find ~test "."
      | _  -> cmdline_args
   in
   let args = 
@@ -129,10 +137,19 @@ let main () =
 (*  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
       List.iter 
        (function
          | DependenciesParser.UriDep uri -> 
@@ -145,7 +162,8 @@ let main () =
                   match script_of_baseuri ma_file u with
                   | Some d -> Hashtbl.add include_deps ma_file d
                   | None -> ())                
-         | DependenciesParser.IncludeDep path -> 
+         | DependenciesParser.InlineDep path
+        | DependenciesParser.IncludeDep path -> 
                 ignore (baseuri_of_script path);
                 Hashtbl.add include_deps ma_file path)
        dependencies)