X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fbinaries%2Fprobe%2FmatitaList.ml;h=ee6cb417afeede5fe163439af7b57352e68c7aa7;hb=bbb6dd07ecb430bf06bb52c2506626106449a5af;hp=7af98d59c8f92d3343d0a1146debebe3a16722e9;hpb=243d091f23f8338e155cdde14969a6043b8c89af;p=helm.git

diff --git a/matita/components/binaries/probe/matitaList.ml b/matita/components/binaries/probe/matitaList.ml
index 7af98d59c..ee6cb417a 100644
--- a/matita/components/binaries/probe/matitaList.ml
+++ b/matita/components/binaries/probe/matitaList.ml
@@ -17,11 +17,35 @@ module Y = Sys
 
 module U  = NUri
 module US = U.UriSet
+module H  = HExtlib
 
 module O = Options
 module E = Engine
 
-let src_exists path = !O.no_devel ||  Y.file_exists path
+let chop_extension file =
+   try F.chop_extension file
+   with Invalid_argument("Filename.chop_extension") -> file
+
+let script devel = chop_extension devel ^ ".ma"
+
+let src_exists path = !O.no_devel || Y.file_exists path
+
+let is_obj base path = 
+   if H.is_regular (F.concat base path) then
+      F.check_suffix path ".con.ng" ||
+      F.check_suffix path ".ind.ng" ||
+      F.check_suffix path ".var.ng"
+  else false
+
+let is_src base path = 
+   H.is_regular (F.concat base path) &&
+   F.check_suffix path ".ng"
+
+let is_dir base path =
+   H.is_dir (F.concat base path)
+
+let is_script devel =
+   src_exists (script devel)
 
 let mk_file path =
    if F.check_suffix path "/" then S.sub path 0 (pred (S.length path))
@@ -33,20 +57,26 @@ let add_obj path =
    O.objs := US.add (U.uri_of_string str) !O.objs
 
 let add_src devel path =
-   if src_exists (F.chop_extension devel ^ ".ma") then
-      let path = F.chop_extension path in   
-      let str = F.concat "cic:" path ^ "/" in
-      O.srcs := US.add (U.uri_of_string str) !O.srcs
-
-let rec scan_entry base devel path =
-   if F.check_suffix path ".con.ng" then add_obj path else
-   if F.check_suffix path ".ind.ng" then add_obj path else
-   if F.check_suffix path ".var.ng" then add_obj path else 
-   if F.check_suffix path ".ng" then add_src devel path else
-   if src_exists devel || src_exists (devel ^ ".ma") then   
-      let files = Y.readdir (F.concat base path) in
-      let map base file = scan_entry base (F.concat devel file) (F.concat path file) in
-      A.iter (map base) files
+   let path = F.chop_extension path in   
+   let str = F.concat "cic:" path ^ "/" in
+   O.srcs := US.add (U.uri_of_string str) !O.srcs;
+   E.mac (script devel)
+
+let add_remove base path =
+   O.remove := F.concat base path :: !O.remove
+
+let rec scan_entry inner base devel path =
+(*   Printf.eprintf "%b %s %s%!\n" inner devel path; *)
+   if is_obj base path && inner then add_obj path else
+   if is_src base path && is_script devel then add_src devel path else 
+   if is_dir base path && is_script devel then scan_dir true base devel path else
+   if is_dir base path && src_exists devel then scan_dir false base devel path else
+   add_remove base path
+
+and scan_dir inner base devel path =
+   let files = Y.readdir (F.concat base path) in
+   let map base file = scan_entry inner base (F.concat devel file) (F.concat path file) in
+   A.iter (map base) files
 
 let from_uri base devel uri =
    O.no_devel := devel = "";
@@ -56,7 +86,8 @@ let from_uri base devel uri =
    if protocol = "cic:" then 
       let path = S.sub str (succ i) (S.length str - succ i) in
       let file = mk_file path in
-      if Y.file_exists (F.concat base file) then scan_entry base devel file
+      if Y.file_exists (F.concat base file) then
+         scan_entry (is_script devel) base devel file 
       else E.missing path
    else E.unsupported protocol