File tree Expand file tree Collapse file tree 3 files changed +3
-6
lines changed Expand file tree Collapse file tree 3 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -9,9 +9,7 @@ let index_filename = "index.odoc-index"
9
9
10
10
type compile_deps = { digest : Digest .t ; deps : (string * Digest .t ) list }
11
11
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" )
15
13
16
14
let compile_deps f =
17
15
let cmd = Cmd. (! odoc % " compile-deps" % Fpath. to_string f) in
Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ val id_of_fpath : Fpath.t -> id
5
5
6
6
val index_filename : string
7
7
8
- val default : string
9
8
val odoc : Bos.Cmd .t ref
10
9
11
10
type compile_deps = { digest : Digest .t ; deps : (string * Digest .t ) list }
Original file line number Diff line number Diff line change @@ -499,7 +499,7 @@ let render_stats env nprocs =
499
499
500
500
let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
501
501
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;
503
503
let _ = Voodoo. find_universe_and_version " foo" in
504
504
Eio_main. run @@ fun env ->
505
505
Eio.Switch. run @@ fun sw ->
@@ -594,7 +594,7 @@ let nb_workers =
594
594
595
595
let odoc_bin =
596
596
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 )
598
598
599
599
let packages_dir =
600
600
let doc = " Packages directory under which packages should be output." in
You can’t perform that action at this time.
0 commit comments