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

Fix #2499 #2514

Merged
2 commits merged into from Aug 7, 2019
Merged

Fix #2499 #2514

2 commits merged into from Aug 7, 2019

Conversation

ghost
Copy link

@ghost ghost commented Aug 6, 2019

Signed-off-by: Jeremie Dimino jeremie@dimino.org

@ghost ghost changed the title Add a reproduction case for #2499 Fix #2499 Aug 6, 2019
@ghost
Copy link
Author

ghost commented Aug 6, 2019

There was an issue with the interpretation of (source_tree x): for directories without files, we would load the rules/cleanup stale files and directories. This PR fixes that by forcing the build system to look at directories without files.

Copy link
Member

@rgrinberg rgrinberg left a comment

Choose a reason for hiding this comment

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

Looking good. Needs a CHANGES entry as well :)

src/build.ml Outdated Show resolved Hide resolved
@ghost
Copy link
Author

ghost commented Aug 7, 2019

Oops, indeed. I added an entry

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
@ghost ghost merged commit a7c9bdf into ocaml:master Aug 7, 2019
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Aug 9, 2019
CHANGES:

- Fix config file dependencies of ocamlformat (ocaml/dune#2471, fixes ocaml/dune#2646,
  @nojb)

- Cleanup stale directories when using `(source_tree ...)` in the
  presence of directories with only sub-directories and no files
  (ocaml/dune#2514, fixes ocaml/dune#2499, @diml)
This pull request was closed.
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