X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatitaclean.ml;h=807f545258ff899ac98eaa226b8fd3352b14ad18;hb=78d6c353f0288a1b3b86aeb43b22a483c34822d9;hp=e15f736dcafc9154510504c177aed40dab6288d6;hpb=afe21e48aefe81db3ca150fac9a5bbfbc893fa59;p=helm.git

diff --git a/helm/matita/matitaclean.ml b/helm/matita/matitaclean.ml
index e15f736dc..807f54525 100644
--- a/helm/matita/matitaclean.ml
+++ b/helm/matita/matitaclean.ml
@@ -28,17 +28,15 @@ open Printf
 module UM = UriManager
 module TA = GrafiteAst
 
-let _ = MatitaInit.initialize_all ()
-
-let main uri_to_remove = MatitacleanLib.clean_baseuris uri_to_remove
-
-let _ =
+let main () =
+  let _ = MatitaInit.initialize_all () in
   let uris_to_remove = ref [] in
   let files_to_remove = ref [] in
+  let basedir = Helm_registry.get "matita.basedir" in
   (match Helm_registry.get_list Helm_registry.string "matita.args" with
   | [ "all" ] ->
-      MatitaDb.clean_owner_environment ();
-      let xmldir = Helm_registry.get "matita.basedir" ^ "/xml" in
+      LibraryDb.clean_owner_environment ();
+      let xmldir = basedir ^ "/xml" in
       ignore
        (Sys.command
          ("find " ^ xmldir ^
@@ -59,7 +57,7 @@ let _ =
               files_to_remove := suri :: !files_to_remove;
               let u = MatitaMisc.baseuri_of_file suri in
               if String.length u < 5 || String.sub u 0 5 <> "cic:/" then begin
-                MatitaLog.error (sprintf "File %s defines a bad baseuri: %s"
+                HLog.error (sprintf "File %s defines a bad baseuri: %s"
                   suri u);
                 exit 1
               end else
@@ -67,7 +65,9 @@ let _ =
           in
           uris_to_remove := uri :: !uris_to_remove)
         files);
-  main !uris_to_remove;
-  let moos = List.map MatitaMisc.obj_file_of_script !files_to_remove in
-  List.iter MatitaMisc.safe_remove moos
+  LibraryClean.clean_baseuris ~basedir !uris_to_remove;
+  let moos =
+   List.map (MatitaMisc.obj_file_of_script ~basedir) !files_to_remove
+  in
+   List.iter HExtlib.safe_remove moos