From da43480dfcc70741055ed72107e452538e612524 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 7 Jun 2018 14:24:01 +0700 Subject: [PATCH] Fix html generation for private libs private-doc should collect html rather than odoc aliases Signed-off-by: Rudi Grinberg --- src/odoc.ml | 2 +- test/blackbox-tests/test-cases/multiple-private-libs/run.t | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/odoc.ml b/src/odoc.ml index 20065b37..a7737cc7 100644 --- a/src/odoc.ml +++ b/src/odoc.ml @@ -534,7 +534,7 @@ module Gen (S : sig val sctx : SC.t end) = struct | _ -> None )) |> List.map ~f:(fun (lib : Lib.t) -> - Build_system.Alias.stamp_file (Dep.alias (Lib lib))) + Build_system.Alias.stamp_file (Dep.html_alias (Lib lib))) |> Path.Set.of_list ) diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/run.t b/test/blackbox-tests/test-cases/multiple-private-libs/run.t index d4ca8166..95d7a978 100644 --- a/test/blackbox-tests/test-cases/multiple-private-libs/run.t +++ b/test/blackbox-tests/test-cases/multiple-private-libs/run.t @@ -1,9 +1,12 @@ This test checks that there is no clash when two private libraries have the same name $ dune build --display short @doc-private + odoc _doc/_html/odoc.css ocamldep a/test.ml.d ocamlc a/.test.objs/test.{cmi,cmo,cmt} odoc _doc/_odoc/lib/test@a/test.odoc + odoc _doc/_html/test@a/Test/.jbuilder-keep,_doc/_html/test@a/Test/index.html ocamldep b/test.ml.d ocamlc b/.test.objs/test.{cmi,cmo,cmt} odoc _doc/_odoc/lib/test@b/test.odoc + odoc _doc/_html/test@b/Test/.jbuilder-keep,_doc/_html/test@b/Test/index.html