X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2Fmatita%2FmatitacLib.ml;h=c16915e63c9cbeb11c97cf60a457104e746a2446;hb=b05dceab1903f9d15f214a9ddeaf791cd594e215;hp=4d04d371c8ea07f4de3d08122d13474d8f05c0fb;hpb=0d681e06c6ced0be7f9dbce417684b082229745a;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 4d04d371c..c16915e63 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -36,16 +36,14 @@ let usage =
   sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:"
     BuildTimeConf.version
 
-let _ =
-  Helm_registry.load_from "matita.conf.xml";
-  Http_getter.init ();
-  MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
-  MatitaDb.clean_owner_environment ();
-  MatitaDb.create_owner_environment ()
-
-let status = ref (Lazy.force MatitaEngine.initial_status) ;;
+let status = ref None
 
 let run_script is eval_function  =
+  let status = 
+    match !status with
+    | None -> assert false
+    | Some s -> s
+  in
   let slash_n_RE = Pcre.regexp "\\n" in
   let cb status stm = 
     (* dump_status status; *)
@@ -102,6 +100,14 @@ let rec go () =
   | exn -> MatitaLog.error (Printexc.to_string exn); go ()
   
 let main ~mode = 
+  Helm_registry.load_from "matita.conf.xml";
+  Http_getter.init ();
+  MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
+(*
+  MatitaDb.clean_owner_environment ();
+  MatitaDb.create_owner_environment ();
+*)
+  status := Some (ref (Lazy.force MatitaEngine.initial_status));
   at_exit
     (fun () ->
        Http_getter_logger.log "Sync map tree to disk...";
@@ -130,7 +136,11 @@ let main ~mode =
     let hou = 
       if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else "" 
     in
-    let proof_status = !status.proof_status in
+    let proof_status,moo_content_rev = 
+      match !status with
+      | Some s -> !s.proof_status, !s.moo_content_rev
+      | None -> assert false
+    in
     if proof_status <> MatitaTypes.No_proof then
      begin
       MatitaLog.error
@@ -139,13 +149,22 @@ let main ~mode =
      end
     else
      begin
+       let os = open_out (MatitaMisc.obj_file_of_script fname) in
+       let output s = output_string os s in
+       output "(* GENERATED FILE: DO NOT EDIT! *)\n\n";
+       List.iter output (List.rev moo_content_rev);
+       close_out os;
        MatitaLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
-         close_out (open_out (MatitaMisc.obj_file_of_script fname));
        exit 0
      end
   with 
-  | Sys.Break -> MatitaLog.error "user break!"; exit ~-1
+  | Sys.Break ->
+      MatitaLog.error "user break!";
+      if mode = `COMPILER then
+        exit ~-1
+      else
+        pp_ocaml_mode ()
   | MatitaEngine.Drop ->
       if mode = `COMPILER then 
         exit 1 
@@ -158,4 +177,4 @@ let main ~mode =
      if mode = `COMPILER then
        exit 1
      else
-       go ()
+       pp_ocaml_mode ()