X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Flibrary%2FlibraryClean.ml;h=6f72ff495b77edf2389397863bf56bd7de3778b3;hb=782253ebe87375f52c07899c1501db5a665a457f;hp=5da9507fc6509f1e8cd2ca955047592362a93f01;hpb=827e35d6058ebba3a4a4fa6eb3c160f0cd0fd1e8;p=helm.git diff --git a/helm/ocaml/library/libraryClean.ml b/helm/ocaml/library/libraryClean.ml index 5da9507fc..6f72ff495 100644 --- a/helm/ocaml/library/libraryClean.ml +++ b/helm/ocaml/library/libraryClean.ml @@ -23,6 +23,8 @@ * http://helm.cs.unibo.it/ *) +(* $Id$ *) + open Printf let debug = false @@ -138,7 +140,7 @@ let moo_root_dir = lazy ( match Str.split (Str.regexp "[ \t\r\n]+") (HExtlib.trim_blanks pair) with - | [a;b] -> a, b + | a::b::_ -> a, b | _ -> assert false) (Helm_registry.get_list Helm_registry.string "getter.prefix")) in @@ -147,15 +149,15 @@ let moo_root_dir = lazy ( let close_nodb ~basedir buris = let rev_deps = Hashtbl.create 97 in - let all_moos = - HExtlib.find ~test:(fun name -> Filename.check_suffix name ".moo") + let all_metadata = + HExtlib.find ~test:(fun name -> Filename.check_suffix name ".metadata") (Lazy.force moo_root_dir) in List.iter (fun path -> let metadata = LibraryNoDb.load_metadata ~fname:path in - let baseuri_of_current_moo = - let dirname = Filename.chop_extension (Filename.dirname path) in + let baseuri_of_current_metadata = + let dirname = Filename.dirname path in let basedirlen = String.length basedir in assert (String.sub dirname 0 basedirlen = basedir); "cic:" ^ @@ -168,8 +170,8 @@ let close_nodb ~basedir buris = metadata in List.iter - (fun buri -> Hashtbl.add rev_deps buri baseuri_of_current_moo) deps) - all_moos; + (fun buri -> Hashtbl.add rev_deps buri baseuri_of_current_metadata) deps) + all_metadata; let buris_to_remove = HExtlib.list_uniq (List.fast_sort Pervasives.compare