X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2Fsoftware%2Fmatita%2FmatitaInit.ml;h=72c8600bb76a42fe13b968859319a7433db73f94;hb=72206bee39e35bcc5cf8a7074ade13a4a81c0c08;hp=1df34c4a1de2a066c9af182ca3b0a8339fda360c;hpb=c09f706392d4a15d78bbe216dc0b5b7c8d41a1f8;p=helm.git

diff --git a/helm/software/matita/matitaInit.ml b/helm/software/matita/matitaInit.ml
index 1df34c4a1..72c8600bb 100644
--- a/helm/software/matita/matitaInit.ml
+++ b/helm/software/matita/matitaInit.ml
@@ -45,7 +45,6 @@ let already_configured s l =
 let conffile = ref BuildTimeConf.matita_conf
 
 let registry_defaults = [
-  "db.nodb",                  "false";
   "matita.debug",             "false";
   "matita.external_editor",   "gvim -f -c 'go %p' %f";
   "matita.preserve",          "false";
@@ -76,6 +75,17 @@ let load_configuration init_status =
         let login = (Unix.getpwuid (Unix.getuid ())).Unix.pw_name in
         Helm_registry.set "user.name" login
       end;
+      let home = Helm_registry.get_string "matita.basedir" in
+      let user_conf_file = home ^ "/matita.conf.xml" in
+      if HExtlib.is_regular user_conf_file then
+        begin
+          HLog.message ("Loading additional conf file from " ^ user_conf_file);
+          try
+            Helm_registry.load_from user_conf_file
+          with exn -> 
+            HLog.error
+              ("While loading conf file: " ^ snd (MatitaExcPp.to_string exn))
+        end;
       ConfigurationFile::init_status 
     end
   else
@@ -215,7 +225,9 @@ 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
@@ -242,9 +254,6 @@ let parse_cmdline init_status =
         "-force",
             Arg.Unit (fun () -> Helm_registry.set_bool "matita.force" true),
             ("Force actions that would not be executed per default");
-        "-nodb", Arg.Unit (fun () -> Helm_registry.set_bool "db.nodb" true),
-            ("Avoid using external database connection"
-             ^ "\n    WARNING: disable many features");
         "-noprofile", 
           Arg.Unit (fun () -> Helm_registry.set_bool "matita.profile" false),
           "Turns off profiling printings";
@@ -276,12 +285,13 @@ 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 !includes in
+    let includes = 
+      List.map absolutize ((List.rev !includes) @ default_includes) in
     set_list ~key:"matita.includes" includes;
-    let args = List.filter (fun x -> x <> "") !args in
+    let args = List.rev (List.filter (fun x -> x <> "") !args) in
     set_list ~key:"matita.args" args;
     HExtlib.set_profiling_printings 
       (fun s ->