X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fbinaries%2Fprobe%2FmatitaList.ml;h=d4ea3e584e6c10d90e46ef17b644e071d835a842;hb=076439def28e649ec384fae038ed021dadd5f75c;hp=a2ce7d9087b3fc472cf1566d655b4e5475ac7086;hpb=cbbbc763dc971b43fe74f1d08b797de5d1dc4f17;p=helm.git

diff --git a/matita/components/binaries/probe/matitaList.ml b/matita/components/binaries/probe/matitaList.ml
index a2ce7d908..d4ea3e584 100644
--- a/matita/components/binaries/probe/matitaList.ml
+++ b/matita/components/binaries/probe/matitaList.ml
@@ -1,12 +1,12 @@
 (*
-    ||M||  This file is part of HELM, an Hypertextual, Electronic        
-    ||A||  Library of Mathematics, developed at the Computer Science     
-    ||T||  Department, University of Bologna, Italy.                     
-    ||I||                                                                
-    ||T||  HELM is free software; you can redistribute it and/or         
-    ||A||  modify it under the terms of the GNU General Public License   
-    \   /  version 2 or (at your option) any later version.      
-     \ /   This software is distributed as is, NO WARRANTY.     
+    ||M||  This file is part of HELM, an Hypertextual, Electronic
+    ||A||  Library of Mathematics, developed at the Computer Science
+    ||T||  Department, University of Bologna, Italy.
+    ||I||
+    ||T||  HELM is free software; you can redistribute it and/or
+    ||A||  modify it under the terms of the GNU General Public License
+    \   /  version 2 or (at your option) any later version.
+     \ /   This software is distributed as is, NO WARRANTY.
       V_______________________________________________________________ *)
 
 module A = Array
@@ -15,49 +15,81 @@ module P = Printf
 module S = String
 module Y = Sys
 
-module U = NUri
+module U  = NUri
+module US = U.UriSet
+module H  = HExtlib
 
 module O = Options
+module E = Engine
 
-let unsupported protocol =
-   failwith (P.sprintf "probe: unsupported protocol: %s" protocol)
+let chop_extension file =
+  try F.chop_extension file
+  with Invalid_argument _ -> file
 
-let missing path =
-   failwith (P.sprintf "probe: missing path: %s" path)
+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))
-   else path ^ ".ng"
+  if F.check_suffix path "/" then S.sub path 0 (pred (S.length path))
+  else path ^ ".ng"
 
 let add_obj path =
-   let path = F.chop_extension path in   
-   let str = F.concat "cic:" path in
-   O.objs := U.uri_of_string str :: !O.objs
-
-let add_src path =
-   let path = F.chop_extension path in   
-   let str = F.concat "cic:" path ^ "/" in
-   O.srcs := U.uri_of_string str :: !O.srcs
-
-let rec scan_entry base 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 path else
-   let files = Y.readdir (F.concat base path) in
-   let map base file = scan_entry base (F.concat path file) in
-   A.iter (map base) files
-
-let from_uri base uri =
-   let str = U.string_of_uri uri in
-   let i = S.index str '/' in
-   let protocol = S.sub str 0 i in
-   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 file
-      else missing path
-   else unsupported protocol
-
-let from_string base s =
-   from_uri base (U.uri_of_string s)
+  let path = F.chop_extension path in
+  let str = F.concat "cic:" path in
+  O.objs := US.add (U.uri_of_string str) !O.objs
+
+let add_src devel path =
+  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 = "";
+  let str = U.string_of_uri uri in
+  let i = S.index str '/' in
+  let protocol = S.sub str 0 i in
+  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 (is_script devel) base devel file
+    else E.missing path
+  else E.unsupported protocol
+
+let from_string base devel s =
+  from_uri base devel (U.uri_of_string s)