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

Workaround OCaml PR#8857 in Path.touch #4223

Merged
merged 1 commit into from
Feb 17, 2021
Merged

Conversation

dra27
Copy link
Member

@dra27 dra27 commented Feb 13, 2021

Progresses #4167 prior to OCaml 4.13.

The guard must test for the file's presence, as you can't differentiate EACCES and ENOENT without ocaml/ocaml#10220.

@dra27 dra27 force-pushed the progress-4167 branch 2 times, most recently from ad6bdc8 to 71a1f58 Compare February 13, 2021 11:25
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.

Looks good. Please add a CHANGES entry

@rgrinberg
Copy link
Member

@smorimoto does this make the cache work on windows?

@smorimoto
Copy link
Member

@rgrinberg Yes, this makes the cache (only the direct mode) work correctly on Windows.

@rgrinberg
Copy link
Member

@dra27 do you think we can merge this? I'd like to get this fix in 2.8.3

@dra27
Copy link
Member Author

dra27 commented Feb 17, 2021

It's ready to go as far as I'm concerned?

@rgrinberg
Copy link
Member

Sweet. Will rebase and merge.

Signed-off-by: David Allsopp <david.allsopp@metastack.com>
@rgrinberg rgrinberg merged commit bc06d03 into ocaml:main Feb 17, 2021
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Mar 7, 2021
…ne-action-plugin, dune-private-libs and dune-glob (2.8.3)

CHANGES:

- Make `patdiff` show refined diffs (ocaml/dune#4257, fixes ocaml/dune#4254, @hakuch)

- Fixed a bug that could result in needless recompilation under Windows due to
  case differences in the result of `Sys.getcwd` (observed under `emacs`).
  (ocaml/dune#3966, @nojb).

- Restore compatibility with Coq < 8.10 for coq-lang < 0.3 , document
  that `(using coq 0.3)` does require Coq 8.10 at least (ocaml/dune#4224, fixes
  ocaml/dune#4142, @ejgallego)

- Add a META rule for 'compiler-libs.native-toplevel' (ocaml/dune#4175, @AltGr)

- No longer call `chmod` on symbolic links (fixes ocaml/dune#4195, @dannywillems)

- Dune no longer automatically create or edit `dune-project` files
  (ocaml/dune#4239, fixes ocaml/dune#4108, @jeremiedimino)

- Have `dune` communicate the location of the standard library directory to
  `merlin` (ocaml/dune#4211, fixes ocaml/dune#4188, @nojb)

- Workaround incorrect exception raised by Unix.utimes (OCaml PR#8857) in
  Path.touch on Windows (ocaml/dune#4223, @dra27)

- `dune ocaml-merlin` is now able to provide configuration for source files in
  the `_build` directory. (ocaml/dune#4274, @voodoos)

- Automatically delete left-over Merlin files when rebuilding for the first time
  a project previously built with Dune `<= 2.7`. (ocaml/dune#4261, @voodoos, @aalekseyev)

- Fix `ppx.exe` being compiled for the wrong target when cross-compiling
  (ocaml/dune#3751, fixes ocaml/dune#3698, @toots)

- `dune top` correctly escapes the generated toplevel directives, and make it
  easier for `dune top` to locate C stubs associated to concerned libraries.
  (ocaml/dune#4242, fixes ocaml/dune#4231, @nojb)

- Do not pass include directories containing native objects when compiling
  bytecode (ocaml/dune#4200, @nojb)
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.

3 participants