no reliance on working ocamlfind

Author: jonludlam

src/driver/ocamlfind.ml

@@ -1,17 +1,22 @@
-let init () =
-  let prefix = Opam.prefix () in
-  let env_camllib = Fpath.(v prefix / "lib" / "ocaml" |> to_string) in
-  let config = Fpath.(v prefix / "lib" / "findlib.conf" |> to_string) in
-  Findlib.init ~config ~env_camllib ()
 
-let () = init ()
+
+let init =
+  let initialized = ref false in
+  fun () ->
+    if !initialized then () else
+    let prefix = Opam.prefix () in
+    let env_camllib = Fpath.(v prefix / "lib" / "ocaml" |> to_string) in
+    let config = Fpath.(v prefix / "lib" / "findlib.conf" |> to_string) in
+    Findlib.init ~config ~env_camllib ()
 
 let all () =
+  init ();
   Fl_package_base.list_packages ()
 
 
 let get_dir lib =
   try
+    init ();
     Fl_package_base.query lib |> fun x ->
     Logs.debug (fun m -> m "Package %s is in directory %s@." lib x.package_dir);
     Ok Fpath.(v x.package_dir |> to_dir_path)
@@ -20,6 +25,7 @@ let get_dir lib =
     Error (`Msg "Error getting directory")
 
 let archives pkg =
+  init ();
   let package = Fl_package_base.query pkg in
   let get_1 preds =
     try
@@ -39,6 +45,7 @@ let archives pkg =
       |> List.sort_uniq String.compare
 
 let sub_libraries top =
+  init ();
   let packages = Fl_package_base.list_packages () in
   List.fold_left
     (fun acc lib ->
@@ -47,6 +54,7 @@ let sub_libraries top =
     Util.StringSet.empty packages
 
 let deps pkgs =
+  init ();
   try
     let packages =
       Fl_package_base.requires_deeply ~preds:[ "ppx_driver" ] pkgs

src/driver/odoc_driver.ml

@@ -503,22 +503,24 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers o
   Eio_main.run @@ fun env ->
   Eio.Switch.run @@ fun sw ->
   if verbose then Logs.set_level (Some Logs.Debug);
-  let libs =
-    if libs = [] then Ocamlfind.all ()
-    else libs
-  in
   Logs.set_reporter (Logs_fmt.reporter ());
   let () = Worker_pool.start_workers env sw nb_workers in
-  let libs =
-    List.map Ocamlfind.sub_libraries libs
-    |> List.fold_left Util.StringSet.union Util.StringSet.empty
-  in
+ 
   let all =
     if voodoo then
       match package_name with
       | Some p -> Voodoo.of_voodoo p blessed
       | None -> failwith "Need a package name for voodoo"
-    else Packages.of_libs packages_dir libs in
+    else
+      let libs =
+        if libs = [] then Ocamlfind.all ()
+        else libs
+      in    
+      let libs =
+        List.map Ocamlfind.sub_libraries libs
+        |> List.fold_left Util.StringSet.union Util.StringSet.empty
+      in
+      Packages.of_libs packages_dir libs in
   let partial =
     if voodoo
     then