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

Add variables %{lib-private} and %{libexec-private} #2901

Merged
merged 10 commits into from
Nov 21, 2019

Conversation

snowleopard
Copy link
Collaborator

This allows to find paths to source files of public and private libraries.

@snowleopard snowleopard changed the title Add %{lib-private} and %{libexec-private} varibles Add variables %{lib-private} and %{libexec-private} Nov 21, 2019
Signed-off-by: Andrey Mokhov <[email protected]>
Signed-off-by: Andrey Mokhov <[email protected]>
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Signed-off-by: Andrey Mokhov <[email protected]>
Signed-off-by: Andrey Mokhov <[email protected]>
src/dune/expander.ml Outdated Show resolved Hide resolved
Signed-off-by: Andrey Mokhov <[email protected]>
Signed-off-by: Andrey Mokhov <[email protected]>
@snowleopard snowleopard merged commit 75826d1 into ocaml:master Nov 21, 2019
@snowleopard snowleopard deleted the fix-findlib branch November 21, 2019 20:53
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Dec 13, 2019
…lugin, dune-private-libs and dune-glob (2.1.0)

CHANGES:

- Attach cinaps stanza actions to both `@runtest` and `@cinaps` aliases
  (ocaml/dune#2831, @NathanReb)

- Add variables `%{lib-private...}` and `%{libexec-private...}` for finding
  build paths of files in public and private libraries within the same
  project. (ocaml/dune#2901, @snowleopard)

- Add `--mandir` option to `$ dune install`. This option allows to override the
  installation directory for man pages. (ocaml/dune#2915, fixes ocaml/dune#2670, @rgrinberg)

- Fix `dune --version`. The bootstrap didn't compute the version
  correctly. (ocaml/dune#2929, fixes ocaml/dune#2911, @diml)

- Do not open the log file in `dune clean`. (ocaml/dune#2965, fixes ocaml/dune#2964 and
  ocaml/dune#2921, @diml)

- Support passing two arguments to `=`, `<>`, ... operators in package
  dependencies so that we can have things such as `(<> :os win32)`
  (ocaml/dune#2965, @diml)
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Dec 21, 2019
…lugin, dune-private-libs and dune-glob (2.1.0)

CHANGES:

- Attach cinaps stanza actions to both `@runtest` and `@cinaps` aliases
  (ocaml/dune#2831, @NathanReb)

- Add variables `%{lib-private...}` and `%{libexec-private...}` for finding
  build paths of files in public and private libraries within the same
  project. (ocaml/dune#2901, @snowleopard)

- Add `--mandir` option to `$ dune install`. This option allows to override the
  installation directory for man pages. (ocaml/dune#2915, fixes ocaml/dune#2670, @rgrinberg)

- Fix `dune --version`. The bootstrap didn't compute the version
  correctly. (ocaml/dune#2929, fixes ocaml/dune#2911, @diml)

- Do not open the log file in `dune clean`. (ocaml/dune#2965, fixes ocaml/dune#2964 and
  ocaml/dune#2921, @diml)

- Support passing two arguments to `=`, `<>`, ... operators in package
  dependencies so that we can have things such as `(<> :os win32)`
  (ocaml/dune#2965, @diml)
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.

2 participants