Don't pass lib_name if lib is already passed
We can easily get the library name
This commit is contained in:
parent
290bcceb17
commit
3fd3d5b44c
|
@ -122,10 +122,11 @@ let to_html sctx (m : Module_or_mld.t) odoc_file ~doc_dir ~odoc ~dir ~includes
|
||||||
);
|
);
|
||||||
html_file
|
html_file
|
||||||
|
|
||||||
let all_mld_files sctx ~(lib : Library.t) ~lib_name ~modules ~dir files =
|
let all_mld_files sctx ~(lib : Library.t) ~modules ~dir files =
|
||||||
let all_files =
|
let all_files =
|
||||||
if List.mem "index.mld" ~set:files then files else "index.mld" :: files
|
if List.mem "index.mld" ~set:files then files else "index.mld" :: files
|
||||||
in
|
in
|
||||||
|
let lib_name = Library.best_name lib in
|
||||||
let doc_dir = SC.Doc.dir sctx lib in
|
let doc_dir = SC.Doc.dir sctx lib in
|
||||||
List.map all_files ~f:(fun file ->
|
List.map all_files ~f:(fun file ->
|
||||||
let name = Filename.chop_extension file in
|
let name = Filename.chop_extension file in
|
||||||
|
@ -178,7 +179,6 @@ let setup_library_rules sctx (lib : Library.t) ~dir ~scope ~modules ~mld_files
|
||||||
in
|
in
|
||||||
(obj_dir, name)
|
(obj_dir, name)
|
||||||
in
|
in
|
||||||
let lib_name = Library.best_name lib in
|
|
||||||
let odoc = get_odoc sctx in
|
let odoc = get_odoc sctx in
|
||||||
let includes =
|
let includes =
|
||||||
let ctx = SC.context sctx in
|
let ctx = SC.context sctx in
|
||||||
|
@ -188,7 +188,7 @@ let setup_library_rules sctx (lib : Library.t) ~dir ~scope ~modules ~mld_files
|
||||||
>>^ Lib.L.include_flags ~stdlib_dir:ctx.stdlib_dir)
|
>>^ Lib.L.include_flags ~stdlib_dir:ctx.stdlib_dir)
|
||||||
in
|
in
|
||||||
let mld_files =
|
let mld_files =
|
||||||
all_mld_files sctx ~dir ~lib ~lib_name ~modules mld_files
|
all_mld_files sctx ~dir ~lib ~modules mld_files
|
||||||
in
|
in
|
||||||
let mld_and_odoc_files =
|
let mld_and_odoc_files =
|
||||||
List.map mld_files ~f:(fun m ->
|
List.map mld_files ~f:(fun m ->
|
||||||
|
|
Loading…
Reference in New Issue