Driver: add interface to the Library_names module (+ improvements)

Removed unused parts:
- The unused list of module field
- The code to compute it
- The unused type `t`

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/driver/library_names.ml

@@ -3,20 +3,14 @@
     1. parse the META file of the package with ocamlfind to see which libraries
     exist and what their archive name (.cma filename) is.
 
-    2. use ocamlobjinfo to get a list of all modules within the archives.
+    2. use ocamlobjinfo to get a list of all modules within the archives. EDIT:
+    it seems this step is now skipped.
 
     This code assumes that the META file lists for every library an archive
     [archive_name], and that for this cma archive exists a corresponsing
     [archive_name].ocamlobjinfo file. *)
 
-type library = {
-  name : string;
-  archive_name : string;
-  mutable modules : string list;
-  dir : string option;
-}
-
-type t = { libraries : library list }
+type library = { name : string; archive_name : string; dir : string option }
 
 let read_libraries_from_pkg_defs ~library_name pkg_defs =
   try
@@ -31,12 +25,12 @@ let read_libraries_from_pkg_defs ~library_name pkg_defs =
       else cma_filename
     in
     if String.length archive_name > 0 then
-      [ { name = library_name; archive_name; modules = []; dir } ]
+      [ { name = library_name; archive_name; dir } ]
     else []
   with Not_found -> []
 
 let process_meta_file file =
-  let _ = Format.eprintf "process_meta_file: %s\n%!" (Fpath.to_string file) in
+  let () = Format.eprintf "process_meta_file: %s\n%!" (Fpath.to_string file) in
   let ic = open_in (Fpath.to_string file) in
   let meta = Fl_metascanner.parse ic in
   let base_library_name =
@@ -72,84 +66,3 @@ let process_meta_file file =
     |> List.filter is_not_private
   in
   libraries
-
-let process_ocamlobjinfo_file ~(libraries : library list) file =
-  let _ =
-    Format.eprintf "process_ocamlobjinfo_file: %s\n%!" (Fpath.to_string file)
-  in
-  let ic = open_in (Fpath.to_string file) in
-  let lines = Util.lines_of_channel ic in
-  let affix = "Unit name: " in
-  let len = String.length affix in
-  close_in ic;
-  let units =
-    List.concat_map
-      (fun line ->
-        if Astring.String.is_prefix ~affix line then
-          [ String.sub line len (String.length line - len) ]
-        else [])
-      lines
-  in
-  let _, archive_name = Fpath.split_base file in
-  let archive_name = archive_name |> Fpath.rem_ext |> Fpath.to_string in
-  let _ =
-    Format.eprintf "trying to look up archive_name: %s\nunits: %s\n%!"
-      archive_name (String.concat "," units)
-  in
-  try
-    let library =
-      List.find (fun l -> l.archive_name = archive_name) libraries
-    in
-    library.modules <- library.modules @ units
-  with Not_found ->
-    Format.eprintf "failed to find archive_name: %s\n%!" archive_name;
-    ()
-
-(* let get_libraries package =
-   let path =  package in
-   let maybe_meta_files =
-     Bos.OS.Dir.fold_contents ~dotfiles:true
-       (fun p acc ->
-         let is_meta = p |> Fpath.basename = "META" in
-         if is_meta then p :: acc else acc)
-       [] path
-   in
-
-   match maybe_meta_files with
-   | Error (`Msg msg) ->
-       failwith
-         ("FIXME: error traversing directories to find the META files: " ^ msg)
-   | Ok meta_files -> (
-       let libraries =
-         meta_files |> List.map process_meta_file |> List.flatten
-       in
-
-       let _ =
-         Format.eprintf "found archive_names: [%s]\n%!"
-           (String.concat ", "
-              (List.map (fun (l : library) -> l.archive_name) libraries))
-       in
-
-       let maybe_ocamlobjinfo_files =
-         Bos.OS.Dir.fold_contents ~dotfiles:true
-           (fun p acc ->
-             let is_ocamlobjinfo = Fpath.get_ext p = ".ocamlobjinfo" in
-             if is_ocamlobjinfo then p :: acc else acc)
-           [] path
-       in
-       match maybe_ocamlobjinfo_files with
-       | Error (`Msg msg) ->
-           failwith
-             ("FIXME: error traversing directories to find the ocamlobjinfo \
-               files: " ^ msg)
-       | Ok ocamlobjinfo_files ->
-           List.iter (process_ocamlobjinfo_file ~libraries) ocamlobjinfo_files;
-           let _ =
-             Format.eprintf "found archive_names: [%s]\n%!"
-               (String.concat ", "
-                  (List.map
-                     (fun (l : library) ->
-                       l.archive_name ^ "/" ^ String.concat "," l.modules)
-                     libraries))
-           in
-           { libraries }) *)

src/driver/library_names.mli

@@ -0,0 +1,5 @@
+type library = { name : string; archive_name : string; dir : string option }
+
+val process_meta_file : Fpath.t -> library list
+(** From a path to a [Meta] file, returns the list of libraries defined in this
+    file. *)

src/driver/voodoo.ml

@@ -134,7 +134,7 @@ let process_package pkg =
           (fun k v -> Logs.debug (fun m -> m "%s,%s\n%!" k v))
           libname_of_archive;
         Some
-          (List.map
+          (List.concat_map
              (fun directory ->
                Format.eprintf "Processing directory: %a\n%!" Fpath.pp directory;
                Packages.Lib.v (top_dir pkg) libname_of_archive pkg.name
@@ -168,7 +168,7 @@ let process_package pkg =
   in
   Printf.eprintf "Found %d metas" (List.length metas);
   let mld_odoc_dir = Packages.parent_of_pkg (top_dir pkg) in
-  let libraries = List.flatten (List.flatten libraries) in
+  let libraries = List.flatten libraries in
   let libraries = List.flatten extra_libraries @ libraries in
   {
     Packages.name = pkg.name;