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

Meta: add support for ocamldoc pseudo-package #4811

Merged
merged 3 commits into from
Jul 15, 2021
Merged

Conversation

nojb
Copy link
Collaborator

@nojb nojb commented Jul 15, 2021

Fixes #4809

cc @talex5

nojb added 2 commits July 15, 2021 05:47
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb
Copy link
Collaborator Author

nojb commented Jul 15, 2021

@talex5 if you want to give this one a try, I created a branch with the fix backported to 2.9 (the last released version of dune): https://github.com/nojb/dune/tree/meta_ocamldoc_29

@talex5
Copy link

talex5 commented Jul 15, 2021

Thanks! This fixes the problem for me.

@nojb
Copy link
Collaborator Author

nojb commented Jul 15, 2021

Thanks! This fixes the problem for me.

Great, thanks for the confirmation.

@ejgallego
Copy link
Collaborator

Worth to ship maybe in 2.9.1 @nojb ?

@nojb
Copy link
Collaborator Author

nojb commented Jul 15, 2021

Worth to ship maybe in 2.9.1 @nojb ?

Indeed, I was going to bring it up :)

@nojb nojb merged commit 48bd29d into ocaml:main Jul 15, 2021
@nojb nojb deleted the meta_ocamldoc branch July 15, 2021 16:58
@ejgallego ejgallego added this to the 2.9.1 milestone Jul 16, 2021
ejgallego pushed a commit to ejgallego/dune that referenced this pull request Sep 7, 2021
Signed-off-by: Emilio Jesus Gallego Arias <e+git@x80.org>
ejgallego added a commit to ejgallego/opam-repository that referenced this pull request Sep 7, 2021
…ator, dune-private-libs, dune and dune-build-info (2.9.1)

CHANGES:

- Don't use `subst --root` in Opam files (ocaml/dune#4806, @MisterDA)

- Fix compilation on Haiku (ocaml/dune#4885, @Sylvain78)

- Allow depending on `ocamldoc` library when `ocamlfind` is not installed.
  (ocaml/dune#4811, fixes ocaml/dune#4809, @nojb)

- Fix `(enabled_if ...)` for installed libraries (ocaml/dune#4824, fixes ocaml/dune#4821, @dra27)

- Create more future-proof opam files using `--promote-install-files=false`
  (ocaml/dune#4860, @bobot)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dune can't find ocamldoc without ocamlfind
3 participants