New html-generate-impl command: update driver

Author: panglesd

src/driver/compile.ml

@@ -236,7 +236,7 @@ let html_generate output_dir linked =
     match l.kind with
     | `Intf { hidden = true; _ } -> ()
     | `Impl { src_path; _ } ->
-        Odoc.html_generate ~search_uris:[] ~output_dir ~input_file
+        Odoc.html_generate_impl ~search_uris:[] ~output_dir ~input_file
           ~source:src_path ();
         Atomic.incr Stats.stats.generated_units
     | _ ->

src/driver/odoc.ml

@@ -130,11 +130,8 @@ let compile_index ?(ignore_output = false) ~output_file ~json ~docs ~libs () =
       add_prefixed_output cmd link_output (Fpath.to_string output_file) lines)
 
 let html_generate ~output_dir ?index ?(ignore_output = false) ?(assets = [])
-    ?source ?(search_uris = []) ~input_file:file () =
+    ?(search_uris = []) ~input_file:file () =
   let open Cmd in
-  let source =
-    match source with None -> empty | Some source -> v "--source" % p source
-  in
   let index =
     match index with None -> empty | Some idx -> v "--index" % p idx
   in
@@ -147,8 +144,29 @@ let html_generate ~output_dir ?index ?(ignore_output = false) ?(assets = [])
       empty search_uris
   in
   let cmd =
-    !odoc % "html-generate" %% source % p file %% assets %% index %% search_uris
-    % "-o" % output_dir
+    !odoc % "html-generate" % p file %% assets %% index %% search_uris % "-o"
+    % output_dir
+  in
+  let desc = Printf.sprintf "Generating HTML for %s" (Fpath.to_string file) in
+  let lines = Cmd_outputs.submit desc cmd None in
+  if not ignore_output then
+    Cmd_outputs.(
+      add_prefixed_output cmd generate_output (Fpath.to_string file) lines)
+
+let html_generate_impl ~output_dir ?(ignore_output = false) ?source
+    ?(search_uris = []) ~input_file:file () =
+  let open Cmd in
+  let source =
+    match source with None -> empty | Some source -> v "--source" % p source
+  in
+  let search_uris =
+    List.fold_left
+      (fun acc filename -> acc % "--search-uri" % p filename)
+      empty search_uris
+  in
+  let cmd =
+    !odoc % "html-generate-impl" %% source % p file %% search_uris % "-o"
+    % output_dir
   in
   let desc = Printf.sprintf "Generating HTML for %s" (Fpath.to_string file) in
   let lines = Cmd_outputs.submit desc cmd None in

src/driver/odoc.mli

@@ -49,11 +49,20 @@ val html_generate :
   ?index:Fpath.t ->
   ?ignore_output:bool ->
   ?assets:string list ->
+  ?search_uris:Fpath.t list ->
+  input_file:Fpath.t ->
+  unit ->
+  unit
+
+val html_generate_impl :
+  output_dir:string ->
+  ?ignore_output:bool ->
   ?source:Fpath.t ->
   ?search_uris:Fpath.t list ->
   input_file:Fpath.t ->
   unit ->
   unit
+
 val support_files : Fpath.t -> string list
 
 val count_occurrences : Fpath.t -> string list