X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatitaclean.ml;h=826a4a2822abb4301c9ad10b9d83089fb32ca030;hb=b46f4ee699f30aafeac0f0e1bb92420f9f929119;hp=807f545258ff899ac98eaa226b8fd3352b14ad18;hpb=0ac236dda6f80f6dc86a7f12d8c88b25e64e3251;p=helm.git

diff --git a/helm/matita/matitaclean.ml b/helm/matita/matitaclean.ml
index 807f54525..826a4a282 100644
--- a/helm/matita/matitaclean.ml
+++ b/helm/matita/matitaclean.ml
@@ -23,39 +23,44 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
 
 module UM = UriManager
 module TA = GrafiteAst
 
+let clean_suffixes = [ ".moo"; ".lexicon"; ".metadata"; ".xml.gz" ]
+
 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
+  match Helm_registry.get_list Helm_registry.string "matita.args" with
   | [ "all" ] ->
       LibraryDb.clean_owner_environment ();
       let xmldir = basedir ^ "/xml" in
-      ignore
-       (Sys.command
-         ("find " ^ xmldir ^
-          " \\( -name \\*.xml.gz -o -name \\*.moo \\) " ^ 
-          "-exec rm \\{\\} \\; 2> /dev/null"));
+      let clean_pat =
+        String.concat " -o "
+          (List.map (fun suf -> "-name \\*" ^ suf) clean_suffixes) in
+      let clean_cmd =
+        sprintf "find %s \\( %s \\) -exec rm \\{\\} \\; 2> /dev/null"
+          xmldir clean_pat in
+      ignore (Sys.command clean_cmd);
       ignore 
        (Sys.command ("find " ^ xmldir ^ 
         " -type d -exec rmdir -p {} \\; 2> /dev/null"));
       exit 0
   | [] -> MatitaInit.die_usage ()
   | files ->
-      List.iter
-        (fun suri ->
+     let uris_to_remove =
+      List.fold_left
+        (fun uris_to_remove suri ->
           let uri = 
             try
               UM.buri_of_uri (UM.uri_of_string suri)
             with UM.IllFormedUri _ ->
-              files_to_remove := suri :: !files_to_remove;
-              let u = MatitaMisc.baseuri_of_file suri in
+              let u =
+               DependenciesParser.baseuri_of_script ~include_paths:[] suri in
               if String.length u < 5 || String.sub u 0 5 <> "cic:/" then begin
                 HLog.error (sprintf "File %s defines a bad baseuri: %s"
                   suri u);
@@ -63,11 +68,6 @@ let main () =
               end else
                 u
           in
-          uris_to_remove := uri :: !uris_to_remove)
-        files);
-  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
-
+           uri::uris_to_remove) [] files
+     in
+      LibraryClean.clean_baseuris ~basedir uris_to_remove