X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaInit.ml;h=ad4992fc967d1ea8fa3f1111923a76a9f15d8227;hb=798e85cb6d55d80d988f91e6289e4041e95ad2e4;hp=c2677afdbd82ad40f9d8d5b816b4888087e601cb;hpb=4e238c92f66aedf21c2d3a33aa5215cdf0a7189f;p=helm.git

diff --git a/helm/software/matita/matitaInit.ml b/helm/software/matita/matitaInit.ml
index c2677afdb..ad4992fc9 100644
--- a/helm/software/matita/matitaInit.ml
+++ b/helm/software/matita/matitaInit.ml
@@ -134,6 +134,11 @@ Options:"
       "gragrep",
         sprintf "Grafite Grep v%s
 Usage: gragrep [ -r ] PATH
+Options:"
+          BuildTimeConf.version;
+      "matitaprover",
+        sprintf "Matita's prover v%s
+Usage: matitaprover [ -tptppath ] FILE.p
 Options:"
           BuildTimeConf.version;
       "matita",
@@ -210,10 +215,15 @@ let add_cmdline_spec l = extra_cmdline_specs := l @ !extra_cmdline_specs
 
 let parse_cmdline init_status =
   if not (already_configured [CmdLine] init_status) then begin
-    let includes = ref [ 
+    let includes = ref [] in
+    let default_includes = [ 
+      ".";
       BuildTimeConf.stdlib_dir_devel;
       BuildTimeConf.stdlib_dir_installed ; ] 
     in
+    let absolutize s =
+      if Pcre.pmatch ~pat:"^/" s then s else Sys.getcwd() ^"/"^s
+    in
     let args = ref [] in
     let add_l l = fun s -> l := s :: !l in
     let reduce_verbosity () =
@@ -240,6 +250,9 @@ let parse_cmdline init_status =
         "-noprofile", 
           Arg.Unit (fun () -> Helm_registry.set_bool "matita.profile" false),
           "Turns off profiling printings";
+        "-profile-only",
+          Arg.String (fun rex -> Helm_registry.set "matita.profile_only" rex),
+          "Activates only profiler with label matching the provided regex";
         "-bench", 
           Arg.Unit (fun () -> Helm_registry.set_bool "matita.bench" true),
           "Turns on parsable output on stdout, that is timings for matitac...";
@@ -265,14 +278,21 @@ let parse_cmdline init_status =
       std_arg_spec @ debug_arg_spec @ !extra_cmdline_specs
     in
     let set_list ~key l =
-      Helm_registry.set_list Helm_registry.of_string ~key ~value:(List.rev !l)
+      Helm_registry.set_list Helm_registry.of_string ~key ~value:l
     in
     Arg.parse arg_spec (add_l args) (usage ());
+    let includes = 
+      List.map absolutize ((List.rev !includes) @ default_includes) in
     set_list ~key:"matita.includes" includes;
-    args := List.filter (fun x -> x <> "") !args;
+    let args = List.rev (List.filter (fun x -> x <> "") !args) in
     set_list ~key:"matita.args" args;
     HExtlib.set_profiling_printings 
-      (fun () -> Helm_registry.get_bool "matita.profile");
+      (fun s -> 
+        Helm_registry.get_bool "matita.profile" && 
+        Pcre.pmatch 
+          ~pat:(Helm_registry.get_opt_default 
+                  Helm_registry.string ~default:".*" "matita.profile_only") 
+          s);
     CmdLine :: init_status
   end else
     init_status