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

Fix getting node for directories #1648

Merged
merged 4 commits into from Dec 12, 2018

Conversation

Projects
None yet
2 participants
@rgrinberg
Copy link
Member

rgrinberg commented Dec 12, 2018

Previously, we would just get the context node without updating the scope.

@rgrinberg rgrinberg requested review from avsm and diml Dec 12, 2018

rgrinberg added some commits Dec 12, 2018

Add pretty printers for dune project files
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Add pretty printers for file bindings
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Fix getting the scope for workspaces with multiple projects
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Fix local_binaries to be called on the correct dir
Previously, it was caused on the associated dir but that was worked by accident.

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>

@rgrinberg rgrinberg force-pushed the rgrinberg:fix-scope-expander branch from 22b58c7 to 6354569 Dec 12, 2018

@diml

diml approved these changes Dec 12, 2018

@diml diml merged commit 01bfd1b into ocaml:master Dec 12, 2018

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
DCO All commits are signed off!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jan 8, 2019

[new release] dune (1.6.3)
CHANGES:

- Fix merlin handling of private module visibility (ocaml/dune#1653 @bobot)

- skip directories when looking up programs in the PATH (ocaml/dune#1628, fixes
  ocaml/dune#1616, @diml)

- Fix preprocessing for libraries with `(include_subdirs ..)` (ocaml/dune#1624, fix ocaml/dune#1626,
  @nojb, @rgrinberg)

- Do not generate targets for archive that don't match the `modes` field.
  (ocaml/dune#1632, fix ocaml/dune#1617, @rgrinberg)

- When executing actions, open files lazily and close them as soon as
  possible in order to reduce the maximum number of file descriptors
  opened by Dune (ocaml/dune#1635, ocaml/dune#1643, fixes ocaml/dune#1633, @jonludlam, @rgrinberg,
  @diml)

- Do not generate targets for archive that don't match the `modes` field.
  (ocaml/dune#1632, fix ocaml/dune#1617, @rgrinberg)

- Get the correct environment node for multi project workspaces (ocaml/dune#1648,
  @rgrinberg)

rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jan 8, 2019

[new release] dune (1.6.3)
CHANGES:

- Fix merlin handling of private module visibility (ocaml/dune#1653 @bobot)

- skip directories when looking up programs in the PATH (ocaml/dune#1628, fixes
  ocaml/dune#1616, @diml)

- Fix preprocessing for libraries with `(include_subdirs ..)` (ocaml/dune#1624, fix ocaml/dune#1626,
  @nojb, @rgrinberg)

- Do not generate targets for archive that don't match the `modes` field.
  (ocaml/dune#1632, fix ocaml/dune#1617, @rgrinberg)

- When executing actions, open files lazily and close them as soon as
  possible in order to reduce the maximum number of file descriptors
  opened by Dune (ocaml/dune#1635, ocaml/dune#1643, fixes ocaml/dune#1633, @jonludlam, @rgrinberg,
  @diml)

- Do not generate targets for archive that don't match the `modes` field.
  (ocaml/dune#1632, fix ocaml/dune#1617, @rgrinberg)

- Get the correct environment node for multi project workspaces (ocaml/dune#1648,
  @rgrinberg)

- Fix an issue causing menhir generated parsers to fail to build in
  some cases. The fix is to systematically use `-short-paths` when
  calling `ocamlc -i` (ocaml/dune#1743, fix ocaml/dune#1504, @diml)

rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jan 9, 2019

[new release] dune (1.6.3)
CHANGES:

- Fix merlin handling of private module visibility (ocaml/dune#1653 @bobot)

- skip directories when looking up programs in the PATH (ocaml/dune#1628, fixes
  ocaml/dune#1616, @diml)

- Fix preprocessing for libraries with `(include_subdirs ..)` (ocaml/dune#1624, fix ocaml/dune#1626,
  @nojb, @rgrinberg)

- Do not generate targets for archive that don't match the `modes` field.
  (ocaml/dune#1632, fix ocaml/dune#1617, @rgrinberg)

- When executing actions, open files lazily and close them as soon as
  possible in order to reduce the maximum number of file descriptors
  opened by Dune (ocaml/dune#1635, ocaml/dune#1643, fixes ocaml/dune#1633, @jonludlam, @rgrinberg,
  @diml)

- Do not generate targets for archive that don't match the `modes` field.
  (ocaml/dune#1632, fix ocaml/dune#1617, @rgrinberg)

- Get the correct environment node for multi project workspaces (ocaml/dune#1648,
  @rgrinberg)

- Fix an issue causing menhir generated parsers to fail to build in
  some cases. The fix is to systematically use `-short-paths` when
  calling `ocamlc -i` (ocaml/dune#1743, fix ocaml/dune#1504, @diml)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment