Skip to content

Commit 40d0b59

Browse files
Julowjonludlam
authored andcommitted
Refer to the 'odoc' binary by default
Refering to './_build/default/src/odoc/bin/main.exe' is not useful when running the driver with 'dune exec'.
1 parent 1004fc0 commit 40d0b59

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/driver/odoc.ml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ let index_filename = "index.odoc-index"
99

1010
type compile_deps = { digest : Digest.t; deps : (string * Digest.t) list }
1111

12-
(* This is the just-built odoc binary *)
13-
let default = "./_build/default/src/odoc/bin/main.exe"
14-
let odoc = ref (Cmd.v default)
12+
let odoc = ref (Cmd.v "odoc")
1513

1614
let compile_deps f =
1715
let cmd = Cmd.(!odoc % "compile-deps" % Fpath.to_string f) in

src/driver/odoc.mli

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ val id_of_fpath : Fpath.t -> id
55

66
val index_filename : string
77

8-
val default : string
98
val odoc : Bos.Cmd.t ref
109

1110
type compile_deps = { digest : Digest.t; deps : (string * Digest.t) list }

src/driver/odoc_driver.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ let render_stats env nprocs =
499499

500500
let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
501501
odoc_bin voodoo package_name blessed dune_style =
502-
Odoc.odoc := Bos.Cmd.v odoc_bin;
502+
Option.iter (fun odoc_bin -> Odoc.odoc := Bos.Cmd.v odoc_bin) odoc_bin;
503503
let _ = Voodoo.find_universe_and_version "foo" in
504504
Eio_main.run @@ fun env ->
505505
Eio.Switch.run @@ fun sw ->
@@ -594,7 +594,7 @@ let nb_workers =
594594

595595
let odoc_bin =
596596
let doc = "Odoc binary to use" in
597-
Arg.(value & opt string Odoc.default & info [ "odoc" ] ~doc)
597+
Arg.(value & opt (some string) None & info [ "odoc" ] ~doc)
598598

599599
let packages_dir =
600600
let doc = "Packages directory under which packages should be output." in

0 commit comments

Comments
 (0)