Porting to ocaml 5

[helm.git] / matita / matita / matitaInit.ml

diff --git a/matita/matita/matitaInit.ml b/matita/matita/matitaInit.ml
index c40f81dff1b54b60bef14f234dab188d56b75431..9f7ae3ac2306183c2bdd03d538d2c25c74af9c5d 100644 (file)
--- a/matita/matita/matitaInit.ml
+++ b/matita/matita/matitaInit.ml
@@ -59,7 +59,7 @@ let registry_defaults = [
 
 let set_registry_values =
   List.iter 
-    (fun key, value -> 
+    (fun (key, value) -> 
        if not (Helm_registry.has key) then Helm_registry.set ~key ~value)
 
 let fill_registry init_status =
@@ -97,7 +97,6 @@ let initialize_db init_status =
   wants [ ConfigurationFile; CmdLine ] init_status;
   if not (already_configured [ Db ] init_status) then
     begin
-      LibraryDb.create_owner_environment ();
       Db::init_status
     end
   else
@@ -117,7 +116,7 @@ let initialize_environment init_status =
   
 let status = ref []
 
-let usages = Hashtbl.create 11 (** app name (e.g. "matitac") -> usage string *)
+let usages = Hashtbl.create 11 (* app name (e.g. "matitac") -> usage string *)
 let _ =
   List.iter
     (fun (name, s) -> Hashtbl.replace usages name s)
@@ -168,10 +167,9 @@ let parse_cmdline init_status =
     wants [Registry] init_status;
     let includes = ref [] in
     let default_includes = [ 
-      BuildTimeConf.stdlib_dir_devel;
-      BuildTimeConf.stdlib_dir_installed ; 
       BuildTimeConf.new_stdlib_dir_devel;
-      BuildTimeConf.new_stdlib_dir_installed ; 
+    (* CSC: no installed standard library!
+      BuildTimeConf.new_stdlib_dir_installed ; *)
     ] 
     in
     let absolutize s =
@@ -201,6 +199,9 @@ let parse_cmdline init_status =
           (Printf.sprintf ("<filename> Read configuration from filename"
              ^^ "\n    Default: %s")
             BuildTimeConf.matita_conf);
+        "-extract_ocaml", 
+          Arg.Unit (fun () -> Helm_registry.set_bool "extract_ocaml" true),
+          "Extract ocaml code";
         "-force",
             Arg.Unit (fun () -> Helm_registry.set_bool "matita.force" true),
             ("Force actions that would not be executed per default");
@@ -284,7 +285,3 @@ let parse_cmdline_and_configuration_file () =
 
 let initialize_environment () =
   status := initialize_environment !status
-
-let _ =
-  CicFix.init ()
-;;