X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatitadep.ml;h=621b20ecff4cfc523ed13ae3af7dd86cb7276dd0;hb=e5014674aed0dab6f3aa43773c8caeffcfe0ac32;hp=fbbfc137b2c47600caac850560a1750d893cbd07;hpb=3c5c1885b52ab5e33ff63871bc4ef5fa275a900e;p=helm.git

diff --git a/helm/matita/matitadep.ml b/helm/matita/matitadep.ml
index fbbfc137b..621b20ecf 100644
--- a/helm/matita/matitadep.ml
+++ b/helm/matita/matitadep.ml
@@ -1,4 +1,41 @@
-module TA = TacticAst 
+(* Copyright (C) 2005, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://helm.cs.unibo.it/
+ *)
+
+let paths_to_search_in = ref [];;
+
+let add_l l = fun s -> l := s :: !l ;;
+
+let arg_spec = [
+  "-I", Arg.String (add_l paths_to_search_in), 
+    "<path> Adds path to the list of searched paths for the include command";
+]
+let usage =
+  Printf.sprintf "MatitaDep v%s\nUsage: matitadep [options] file...\nOptions:"
+    BuildTimeConf.version
+
+module TA = GrafiteAst 
 module U = UriManager
 
 let deps = Hashtbl.create (Array.length Sys.argv)
@@ -23,40 +60,61 @@ let resolve alias =
  
   (*** TODO MANCANO LE URI VERBATIM DENTRO GLI AST DEI TERMINI ****)
 
+let find path = 
+  let rec aux = function
+  | [] -> close_in (open_in path); path
+  | p :: tl ->
+      try
+        close_in (open_in (p ^ "/" ^ path)); p ^ "/" ^ path
+      with Sys_error _ -> aux tl
+  in
+  let paths = !paths_to_search_in in
+  try
+    aux paths
+  with Sys_error _ as exc ->
+    MatitaLog.error ("Unable to read " ^ path);
+    MatitaLog.error ("opts.include_paths was " ^ String.concat ":" paths);
+    raise exc
+;;
+
 let main () =
-  for i = 1 to Array.length Sys.argv - 1 do
-    let file = Sys.argv.(i) in
+  Helm_registry.load_from BuildTimeConf.matita_conf;
+  CicNotation.load_notation BuildTimeConf.core_notation_script;
+  let files = ref [] in
+  Arg.parse arg_spec (add_l files) usage;
+  List.iter (fun file -> 
     let ic = open_in file in
-    let stms =
-      try
-        CicTextualParser2.parse_statements (Stream.of_channel ic)
-      with
-        (CicTextualParser2.Parse_error _) as exc ->
-          prerr_endline ("Unable to parse: " ^ file);
-          prerr_endline (MatitaExcPp.to_string exc);
-          exit 1
-    in
-    close_in ic;
-    List.iter 
-      (function
-      | TA.Executable (_, TA.Command (_, TA.Set (_, "baseuri", uri))) ->
-          let uri = MatitaMisc.strip_trailing_slash uri in
-          baseuri := (uri, file) :: !baseuri
-      | TA.Executable (_, TA.Command 
-          (_, TA.Alias (_, TA.Ident_alias(_, uri)))) -> 
-            Hashtbl.add aliases file uri
-      | _ -> ()) 
-      stms; 
+    let istream = Stream.of_channel ic in
+    (try
+      while true do
+        try 
+          match GrafiteParser.parse_statement istream with
+          | TA.Executable (_, TA.Command (_, TA.Set (_, "baseuri", uri))) ->
+              let uri = MatitaMisc.strip_trailing_slash uri in
+              baseuri := (uri, file) :: !baseuri
+          | TA.Executable (_, TA.Command 
+              (_, TA.Alias (_, TA.Ident_alias(_, uri)))) -> 
+                Hashtbl.add aliases file uri
+          | TA.Executable (_, TA.Command (_, TA.Include (_, path))) ->
+                Hashtbl.add deps file (find path)
+          | _ -> ()
+        with 
+          CicNotationParser.Parse_error _ as exn ->
+            prerr_endline ("Unable to parse: " ^ file);
+            prerr_endline (MatitaExcPp.to_string exn);
+            ()
+      done
+    with
+    | End_of_file -> close_in ic);
     Hashtbl.iter 
       (fun file alias -> 
         let dep = resolve alias in
         match dep with 
         | None -> ()
         | Some d -> Hashtbl.add deps file d)
-      aliases;
-  done;
-  for i = 1 to Array.length Sys.argv - 1 do
-    let file = Sys.argv.(i) in
+      aliases)
+  !files;
+  List.iter (fun file -> 
     let deps = Hashtbl.find_all deps file in
     let deps = List.fast_sort Pervasives.compare deps in
     let deps = MatitaMisc.list_uniq deps in
@@ -65,8 +123,10 @@ let main () =
     in
     let deps = file :: deps in
     Printf.printf "%s: %s\n" (MatitaMisc.obj_file_of_script file)
-      (String.concat " " deps)
-  done
+      (String.concat " " deps))
+    !files
+;;
   
+let _ =
+  main ()
 
-let _ = main ()