Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: dune build @doc-json #8178

Merged
merged 4 commits into from
Sep 19, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Inline html_alias
Signed-off-by: Etienne Millon <me@emillon.org>
emillon committed Sep 19, 2023

Unverified

The email in this signature doesn’t match the committer email.
commit ce126dda53d6db40bb862f7684579ee7d9dfeca0
6 changes: 1 addition & 5 deletions src/dune_rules/odoc.ml
Original file line number Diff line number Diff line change
@@ -155,9 +155,6 @@ module Dep : sig
targets produced by odoc for [target] in output format [output]. *)
val format_alias : Output_format.t -> Context.t -> target -> Alias.t

(** [html_alias] is [format_alias Html] *)
val html_alias : Context.t -> target -> Alias.t

(** [deps ctx pkg libraries] returns all odoc dependencies of [libraries]. If
[libraries] are all part of a package [pkg], then the odoc dependencies of
the package are also returned*)
@@ -172,7 +169,6 @@ module Dep : sig
val setup_deps : Context.t -> target -> Path.Set.t -> unit Memo.t
end = struct
let format_alias f ctx m = Output_format.alias f ~dir:(Paths.html ctx m)
let html_alias = format_alias Html
let alias = Alias.make (Alias.Name.of_string ".odoc-all")

let deps ctx pkg requires =
@@ -919,7 +915,7 @@ let setup_private_library_doc_alias sctx ~scope ~dir (l : Dune_file.Library.t) =
let lib = Lib (Lib.Local.of_lib_exn lib) in
Rules.Produce.Alias.add_deps
(Alias.make ~dir Alias0.private_doc)
(lib |> Dep.html_alias ctx |> Dune_engine.Dep.alias |> Action_builder.dep)
(lib |> Dep.format_alias Html ctx |> Dune_engine.Dep.alias |> Action_builder.dep)
;;

let has_rules ?(directory_targets = Path.Build.Map.empty) m =