Skip to content

Fix dune-package installation with meta templates#3743

Merged
rgrinberg merged 2 commits intoocaml:masterfrom
rgrinberg:meta-template-version
Aug 27, 2020
Merged

Fix dune-package installation with meta templates#3743
rgrinberg merged 2 commits intoocaml:masterfrom
rgrinberg:meta-template-version

Conversation

@rgrinberg
Copy link
Copy Markdown
Member

If (use_meta) is true, a version should not be added. It will be read
from the META file

This bug occurs when a meta template is used with a custom version

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
If (use_meta) is true, a version should not be added. It will be read
from the META file

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg rgrinberg force-pushed the meta-template-version branch from 73cb41a to 4713217 Compare August 26, 2020 17:39
Kakadu added a commit to Kakadu/GT that referenced this pull request Aug 26, 2020
Signed-off-by: Kakadu <Kakadu@pm.me>
@rgrinberg rgrinberg merged commit ea72038 into ocaml:master Aug 27, 2020
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Sep 3, 2020
…lugin, dune-private-libs and dune-glob (2.7.1)

CHANGES:

- configurator: More flexible probing of `#define`. We allow duplicate values in
  the object file, as long as they are the same after parsing. (ocaml/dune#3739, fixes
  ocaml/dune#3736, @rgrinberg)

- Record instrumentation backends in dune-package files. This makes it possible
  to use instrumentation backends defined in installed libraries (eg via OPAM).
  (ocaml/dune#3735, @nojb)

- Add missing `.aux` & `.glob` targets to coq rules (ocaml/dune#3721, fixes ocaml/dune#3437,
  @rgrinberg)

- Fix `dune-package` installation when META templates are present (ocaml/dune#3743, fixes
  ocaml/dune#3746, @rgrinberg)

- Resolve symlinks before running `$ git diff` (ocaml/dune#3750, fixes ocaml/dune#3740, @rgrinberg)

- Cram tests: when checking that all test directories contain a `run.t` file,
  skip empty directories. These can be left around by git. (ocaml/dune#3753, @emillon)
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Sep 5, 2020
…lugin, dune-private-libs and dune-glob (2.7.1)

CHANGES:

- configurator: More flexible probing of `#define`. We allow duplicate values in
  the object file, as long as they are the same after parsing. (ocaml/dune#3739, fixes
  ocaml/dune#3736, @rgrinberg)

- Record instrumentation backends in dune-package files. This makes it possible
  to use instrumentation backends defined in installed libraries (eg via OPAM).
  (ocaml/dune#3735, @nojb)

- Add missing `.aux` & `.glob` targets to coq rules (ocaml/dune#3721, fixes ocaml/dune#3437,
  @rgrinberg)

- Fix `dune-package` installation when META templates are present (ocaml/dune#3743, fixes
  ocaml/dune#3746, @rgrinberg)

- Resolve symlinks before running `$ git diff` (ocaml/dune#3750, fixes ocaml/dune#3740, @rgrinberg)

- Cram tests: when checking that all test directories contain a `run.t` file,
  skip empty directories. These can be left around by git. (ocaml/dune#3753, @emillon)
Kakadu added a commit to Kakadu/GT that referenced this pull request Dec 28, 2020
Signed-off-by: Kakadu <Kakadu@pm.me>
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