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.

Sign up for GitHub

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

Jump to bottom

[2.9] fix sites installation with opam #4774

Merged
merged 5 commits into from
Jun 29, 2021
Merged

[2.9] fix sites installation with opam #4774

merged 5 commits into from
Jun 29, 2021

Conversation

bobot
Copy link
Collaborator

@bobot bobot commented Jun 24, 2021

cherry-pick of #4730 not present in #4645

@bobot
Add reproduction case for ocaml#4682
f5d4f82 
Signed-off-by: François Bobot <francois.bobot@cea.fr>
@bobot
[Cmdliner] Add alias option
ceb30e0 
           options that expand to others. Uses it for `--release` and `-p`.

           Fixes ocaml#4682 , the options are really used

Signed-off-by: François Bobot <francois.bobot@cea.fr>
@bobot
Replace --no-promote-install-files to --promote-install-files
8c9b15c 
Signed-off-by: François Bobot <francois.bobot@cea.fr>
@bobot
Disable ocamlformat for cmdliner
f003af1 
Signed-off-by: François Bobot <francois.bobot@cea.fr>
@bobot bobot requested a review from ejgallego June 24, 2021 17:41
@ejgallego ejgallego added this to the 2.9 milestone Jun 25, 2021
ejgallego
ejgallego approved these changes Jun 25, 2021
View reviewed changes
Copy link
Collaborator

@ejgallego ejgallego left a comment

Choose a reason for hiding this comment

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

Thanks a lot @bobot , and sorry for the inconveniences.

I understand that we don't need to update the CHANGES file in this cherry-pick, is that correct @bobot ?

If so, we 2.9.0 is here!

@bobot
Copy link
Collaborator Author

bobot commented Jun 25, 2021

I should have added a changelog for all the fixes. I'm doing it now.

ejgallego
ejgallego requested changes Jun 27, 2021
View reviewed changes
Copy link
Collaborator

@ejgallego ejgallego left a comment

Choose a reason for hiding this comment

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

It seems to me that you need to commit the CHANGES update to main too, please do so first, then we can proceed to merge this PR.

[by the way, we usually add changes entries to the end of the list, right?]

@bobot bobot force-pushed the 2_9_fix_sites_installation_with_opam branch from 6dad4e6 to c2378c4 Compare June 28, 2021 08:23
@bobot bobot mentioned this pull request Jun 28, 2021
Merged
@bobot
Copy link
Collaborator Author

bobot commented Jun 28, 2021

It is perhaps at the end, I don't remember. It is now. The branch for master is created. You could merge both whenever possible.

ejgallego
ejgallego approved these changes Jun 28, 2021
View reviewed changes
Copy link
Collaborator

@ejgallego ejgallego left a comment

Choose a reason for hiding this comment

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

PR merged in main, thanks!

@ejgallego
Copy link
Collaborator

@bobot DCO is missing, sorry to bug you again about it.

@ejgallego ejgallego self-assigned this Jun 28, 2021
@bobot
Update changes
1d9b78e 
Signed-off-by: François Bobot <francois.bobot@cea.fr>
@bobot bobot force-pushed the 2_9_fix_sites_installation_with_opam branch from c2378c4 to 1d9b78e Compare June 29, 2021 08:25
@bobot
Copy link
Collaborator Author

bobot commented Jun 29, 2021

Done, thanks!

@ejgallego ejgallego merged commit b60c008 into ocaml:2.9 Jun 29, 2021
ejgallego added a commit to ejgallego/opam-repository that referenced this pull request Jun 29, 2021
@ejgallego
[new release] dune-action-plugin, dune-glob, dune-site, dune-configur…
a13f842 
…ator, dune-private-libs, dune and dune-build-info (2.9.0)

CHANGES:

- Add `(enabled_if ...)` to `(mdx ...)` (ocaml/dune#4434, @emillon)

- Add support for instrumentation dependencies (ocaml/dune#4210, fixes ocaml/dune#3983, @nojb)

- Add the possibility to use `locks` with the cram tests stanza (ocaml/dune#4480, @voodoos)

- Allow to set up merlin in a variant of the default context
  (ocaml/dune#4145, @TheLortex, @voodoos)

- Add `(package ...)` to `(mdx ...)` (ocaml/dune#4691, fixes ocaml/dune#3756, @emillon)

- Handle renaming of `coq.kernel` library to `coq-core.kernel` in Coq 8.14 (ocaml/dune#4713, @proux01)

- Fix generation of merlin configuration when using `(include_subdirs
  unqualified)` on Windows (ocaml/dune#4745, @nojb)

- Fix bug for the install of Coq native files when using `(include_subdirs qualified)`
  (ocaml/dune#4753, @ejgallego)

- Allow users to specify install target directories for `doc` and
  `etc` sections. We add new options `--docdir` and `--etcdir` to both
  Dune's configure and `dune install` command. (ocaml/dune#4744, fixes ocaml/dune#4723,
  @ejgallego, thanks to @JasonGross for reporting this issue)

- Fix issue where Dune would ignore `(env ... (coq (flags ...)))`
  declarations appearing in `dune` files (ocaml/dune#4749, fixes ocaml/dune#4566, @ejgallego @rgrinberg)

- Disable some warnings on Coq 8.14 and `(lang coq (>= 0.3))` due to
  the rework of the Coq "native" compilation system (ocaml/dune#4760, @ejgallego)

- Fix a bug where instrumentation flags would be added even if the
  instrumentatation was disabled (@nojb, ocaml/dune#4770)

- Fix ocaml/dune#4682: option `-p` takes now precedence on environement variable
  `DUNE_PROFILE` (ocaml/dune#4730, ocaml/dune#4774, @bobot, reported by @dra27 ocaml/dune#4632)

- Fix installation with opam of package with dune sites. The `.install` file is
  now produced by a local `dune install` during the build phase (ocaml/dune#4730, ocaml/dune#4645,
  @bobot, reported by @kit-ty-kate ocaml/dune#4198)

- Fix multiple issues in the sites feature (ocaml/dune#4730, ocaml/dune#4645 @bobot, reported by @Lelio-Brun
  ocaml/dune#4219, by @Kakadu ocaml/dune#4325, by @toots ocaml/dune#4415)
@ejgallego ejgallego mentioned this pull request Jun 29, 2021
Merged
ejgallego added a commit to ejgallego/opam-repository that referenced this pull request Jul 1, 2021
@ejgallego
[new release] dune-action-plugin, dune-glob, dune-site, dune-configur…
96c14a5 
…ator, dune-private-libs, dune and dune-build-info (2.9.0)

CHANGES:

- Add `(enabled_if ...)` to `(mdx ...)` (ocaml/dune#4434, @emillon)

- Add support for instrumentation dependencies (ocaml/dune#4210, fixes ocaml/dune#3983, @nojb)

- Add the possibility to use `locks` with the cram tests stanza (ocaml/dune#4480, @voodoos)

- Allow to set up merlin in a variant of the default context
  (ocaml/dune#4145, @TheLortex, @voodoos)

- Add `(package ...)` to `(mdx ...)` (ocaml/dune#4691, fixes ocaml/dune#3756, @emillon)

- Handle renaming of `coq.kernel` library to `coq-core.kernel` in Coq 8.14 (ocaml/dune#4713, @proux01)

- Fix generation of merlin configuration when using `(include_subdirs
  unqualified)` on Windows (ocaml/dune#4745, @nojb)

- Fix bug for the install of Coq native files when using `(include_subdirs qualified)`
  (ocaml/dune#4753, @ejgallego)

- Allow users to specify install target directories for `doc` and
  `etc` sections. We add new options `--docdir` and `--etcdir` to both
  Dune's configure and `dune install` command. (ocaml/dune#4744, fixes ocaml/dune#4723,
  @ejgallego, thanks to @JasonGross for reporting this issue)

- Fix issue where Dune would ignore `(env ... (coq (flags ...)))`
  declarations appearing in `dune` files (ocaml/dune#4749, fixes ocaml/dune#4566, @ejgallego @rgrinberg)

- Disable some warnings on Coq 8.14 and `(lang coq (>= 0.3))` due to
  the rework of the Coq "native" compilation system (ocaml/dune#4760, @ejgallego)

- Fix a bug where instrumentation flags would be added even if the
  instrumentatation was disabled (@nojb, ocaml/dune#4770)

- Fix ocaml/dune#4682: option `-p` takes now precedence on environement variable
  `DUNE_PROFILE` (ocaml/dune#4730, ocaml/dune#4774, @bobot, reported by @dra27 ocaml/dune#4632)

- Fix installation with opam of package with dune sites. The `.install` file is
  now produced by a local `dune install` during the build phase (ocaml/dune#4730, ocaml/dune#4645,
  @bobot, reported by @kit-ty-kate ocaml/dune#4198)

- Fix multiple issues in the sites feature (ocaml/dune#4730, ocaml/dune#4645 @bobot, reported by @Lelio-Brun
  ocaml/dune#4219, by @Kakadu ocaml/dune#4325, by @toots ocaml/dune#4415)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ejgallego ejgallego ejgallego approved these changes

Assignees

@ejgallego ejgallego

Labels
None yet
Projects
None yet
Milestone
2.9
Development

Successfully merging this pull request may close these issues.
2 participants
@bobot @ejgallego