X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaWiki.ml;h=87e9a44178a47a18b5bad6f9e9b3961e0825e71f;hb=79ce67a7a7502462e827de098b1056516092c0a7;hp=3c5607bd7df9ff1bf458d61f5f0dac65a3aea604;hpb=397b5f9d848e63a9703a1f90faf9869092ec8893;p=helm.git diff --git a/helm/software/matita/matitaWiki.ml b/helm/software/matita/matitaWiki.ml index 3c5607bd7..87e9a4417 100644 --- a/helm/software/matita/matitaWiki.ml +++ b/helm/software/matita/matitaWiki.ml @@ -66,13 +66,9 @@ let clean_exit n = match !grafite_status with [] -> exit n | grafite_status::_ -> - try - let baseuri = GrafiteTypes.get_string_option grafite_status "baseuri" in + let baseuri = GrafiteTypes.get_baseuri grafite_status in LibraryClean.clean_baseuris ~verbose:false [baseuri]; exit n - with GrafiteTypes.Option_error("baseuri", "not found") -> - (* no baseuri ==> nothing to clean yet *) - exit n let terminate n = let terminator = String.make 1 (Char.chr 249) in @@ -174,7 +170,7 @@ let rec interactive_loop () = | _ -> () in run_script str - (MatitaEngine.eval_from_stream ~first_statement_only:true ~prompt:false + (MatitaEngine.eval_from_stream ~first_statement_only:true ~include_paths:(Lazy.force include_paths) ~watch_statuses) ; interactive_loop (Some (List.length !lexicon_status)) with @@ -209,10 +205,9 @@ let main () = ); (* must be called after init since args are set by cmdline parsing *) let system_mode = Helm_registry.get_bool "matita.system" in - Helm_registry.set_int "matita.verbosity" 0; let include_paths = Helm_registry.get_list Helm_registry.string "matita.includes" in - grafite_status := [GrafiteSync.init ()]; + grafite_status := [GrafiteSync.init "cic:/matita/tests/"]; lexicon_status := [CicNotation2.load_notation ~include_paths BuildTimeConf.core_notation_script] ; @@ -249,10 +244,11 @@ let main () = else begin let baseuri = - GrafiteTypes.get_string_option - (match !grafite_status with + GrafiteTypes.get_baseuri + (match !grafite_status with [] -> assert false - | s::_ -> s) "baseuri" in + | s::_ -> s) + in let moo_fname = LibraryMisc.obj_file_of_baseuri ~must_exist:false ~baseuri ~writable:true