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

Allow libraries to be enabled/disabled based on the build profile #3344

Merged
merged 1 commit into from
Apr 9, 2020

Conversation

mrmr1993
Copy link
Contributor

@mrmr1993 mrmr1993 commented Apr 9, 2020

This PR exposes the %{profile} variable to (enabled_if ...) stanzas for libraries.

@rgrinberg
Copy link
Member

Would you mind signing your commit per the DCO?

@rgrinberg
Copy link
Member

Also, the tests need a small fix:

File "test/expect-tests/findlib_tests.ml", lines 18-29, characters 4-5:
74618 | ....{ has_native = true
74719 |     ; ext_lib = ".a"
74820 |     ; ext_obj = ".o"
74921 |     ; os_type = Ocaml_config.Os_type.Other ""
75022 |     ; architecture = ""
751...
75226 |     ; ext_dll = ".so"
75327 |     ; stdlib_dir = Path.root
75428 |     ; ccomp_type = Other "gcc"
75529 |     }
756Error: Some record fields are undefined: profile

@mrmr1993 mrmr1993 force-pushed the feature/enabled-if-profile branch from 75e8451 to 8543c70 Compare April 9, 2020 14:49
Signed-off-by: mrmr1993 <mr_1993@hotmail.co.uk>
@mrmr1993 mrmr1993 force-pushed the feature/enabled-if-profile branch from 8543c70 to 1307ba5 Compare April 9, 2020 14:51
@mrmr1993
Copy link
Contributor Author

mrmr1993 commented Apr 9, 2020

Thanks, I've fixed that test, updated CHANGES.md, and corrected the DCO.

@rgrinberg rgrinberg merged commit 3a6a8d0 into ocaml:master Apr 9, 2020
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Apr 10, 2020
…lugin, dune-private-libs and dune-glob (2.5.0)

CHANGES:

- Add a `--release` option meaning the same as `-p` but without the
  package filtering. This is useful for custom `dune` invocation in opam
  files where we don't want `-p` (ocaml/dune#3260, @diml)

- Fix a bug introduced in 2.4.0 causing `.bc` programs to be built
  with `-custom` by default (ocaml/dune#3269, fixes ocaml/dune#3262, @diml)

- Allow contexts to be defined with local switches in workspace files (ocaml/dune#3265,
  fix ocaml/dune#3264, @rgrinberg)

- Delay expansion errors until the rule is used to build something (ocaml/dune#3261, fix
  ocaml/dune#3252, @rgrinberg, @diml)

- [coq] Support for theory dependencies and compositional builds using
  new field `(theories ...)` (ocaml/dune#2053, @ejgallego, @rgrinberg)

- From now on, each version of a syntax extension must be explicitely tied to a
  minimum version of the dune language. Inconsistent versions in a
  `dune-project` will trigger a warning for version <=2.4 and an error for
  versions >2.4 of the dune language. (ocaml/dune#3270, fixes ocaml/dune#2957, @voodoos)

- [coq] Bump coq lang version to 0.2. New coq features presented this release
  require this version of the coq lang. (ocaml/dune#3283, @ejgallego)

- Prevent installation of public executables disabled using the `enabled_if` field.
  Installation will now simply skip such executables instead of raising an
  error. (ocaml/dune#3195, @voodoos)

- `dune upgrade` will now try to upgrade projects using versions <2.0 to version
  2.0 of the dune language. (ocaml/dune#3174, @voodoos)

- Add a `top` command to integrate dune with any toplevel, not just
  utop. It is meant to be used with the new `#use_output` directive of
  OCaml 4.11 (ocaml/dune#2952, @mbernat, @diml)

- Allow per-package `version` in generated `opam` files (ocaml/dune#3287, @toots)

- [coq] Introduce the `coq.extraction` stanza. It can be used to extract OCaml
  sources (ocaml/dune#3299, fixes ocaml/dune#2178, @rgrinberg)

- Load ppx rewriters in dune utop and add pps field to toplevel stanza. Ppx
  extensions will now be usable in the toplevel
  (ocaml/dune#3266, fixes ocaml/dune#346, @stephanieyou)

- Add a `(subdir ..)` stanza to allow evaluating stanzas in sub directories.
  (ocaml/dune#3268, @rgrinberg)

- Fix a bug preventing one from running inline tests in multiple modes
  (ocaml/dune#3352, @diml)

- Allow the use of the `%{profile}` variable in the `enabled_if` field of the
  library stanza. (ocaml/dune#3344, @mrmr1993)

- Allow the use of `%{ocaml_version}` variable in `enabled_if` field of the
  library stanza. (ocaml/dune#3339, @voodoos)

- Fix dune build freezing on MacOS when cache is enabled. (ocaml/dune#3249, fixes #ocaml/dune#2973,
  @artempyanykh)
@mrmr1993 mrmr1993 deleted the feature/enabled-if-profile branch April 18, 2020 15:43
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