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

ctypes 0.3: run commands in stanza directory #6883

Merged
merged 1 commit into from
Feb 9, 2023
Merged

ctypes 0.3: run commands in stanza directory #6883

merged 1 commit into from
Feb 9, 2023

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented Jan 13, 2023 •
edited
Loading

This creates version 0.3 of the ctypes field.

When used, commands are run in the directory where the corresponding stanza is defined. This makes it possible to use relative directories.

Fixes #5325

@emillon emillon added this to the 3.8.0 milestone Jan 13, 2023
@emillon emillon added the ctypes label Jan 13, 2023
@emillon emillon requested a review from rgrinberg January 13, 2023 17:10
@emillon
Copy link
Collaborator Author

emillon commented Jan 13, 2023

Some additional remarks:

  • I believe that this should mark Ctypes binding doesn't support well local headers #5325 as fixed since it effectively allows using local headers, including in a monorepo (which is not possible in 0.2).
  • I tried to reduce the diff and factor some code between < 0.3 and 0.3 but it's a bit difficult. This is an experimental extension, so I suggest that if 0.3 is released in minor version X, we mark 0.1 and 0.2 deprecated in X+1 and remove that code in X+2.

@emillon emillon modified the milestones: 3.8.0, 3.7.0 Jan 19, 2023
@emillon emillon force-pushed the ctypes-dir-relative branch from 83f0359 to cb6c717 Compare January 30, 2023 09:37
@emillon emillon mentioned this pull request Jan 30, 2023
Closed
@emillon emillon force-pushed the ctypes-dir-relative branch from cb6c717 to f37edc3 Compare January 30, 2023 09:40
@emillon emillon requested a review from rgrinberg January 30, 2023 09:42
@emillon
Copy link
Collaborator Author

emillon commented Jan 30, 2023

This is now ready.

@emillon emillon force-pushed the ctypes-dir-relative branch 2 times, most recently from 77cfb9e to 0594754 Compare February 6, 2023 10:37
@emillon emillon force-pushed the ctypes-dir-relative branch from 0594754 to 0608d91 Compare February 8, 2023 09:55
@emillon
ctypes 0.3: run commands in stanza directory
f829b0d 
This creates version 0.3 of the ctypes field.

When used, commands are run in the directory where the corresponding
stanza is defined. This makes it possible to use relative directories.

Fixes ocaml#5325

Signed-off-by: Etienne Millon <me@emillon.org>
@emillon emillon force-pushed the ctypes-dir-relative branch from 0608d91 to f829b0d Compare February 9, 2023 09:34
@emillon emillon merged commit 584d94c into ocaml:main Feb 9, 2023
@emillon emillon mentioned this pull request Feb 17, 2023
Merged
emillon added a commit to emillon/opam-repository that referenced this pull request Feb 17, 2023
@emillon
[new release] xdg, stdune, ordering, ocamlc-loc, dyn, dune, dune-site…
c5fc79e 
…, dune-rpc, dune-rpc-lwt, dune-private-libs, dune-glob, dune-configurator, dune-build-info, dune-action-plugin and chrome-trace (3.7.0)

CHANGES:

- Allow running `$ dune exec` in watch mode (with the `-w` flag). In watch mode,
  `$ dune exec` the executed binary whenever it is recompiled. (ocaml/dune#6966,
  @gridbugs)

- `coqdep` is now called once per theory, instead of one time per Coq
  file. This should significantly speed up some builds, as `coqdep`
  startup time is often heavy (ocaml/dune#7048, @Alizter, @ejgallego)

- Add `map_workspace_root` dune-project stanza to allow disabling of
  mapping of workspace root to `/workspace_root`. (ocaml/dune#6988, fixes ocaml/dune#6929,
  @richardlford)

- Fix handling of support files generated by odoc. (ocaml/dune#6913, @jonludlam)

- Fix parsing of OCaml errors that contain code excerpts with `...` in them.
  (ocaml/dune#7008, @rgrinberg)

- Pre-emptively clear screen in watch mode (ocaml/dune#6987, fixes ocaml/dune#6884, @rgrinberg)

- Fix cross compilation configuration when a context with targets is itself a
  host of another context (ocaml/dune#6958, fixes ocaml/dune#6843, @rgrinberg)

- Fix parsing of the `<=` operator in *blang* expressions of `dune` files.
  Previously, the operator would be interpreted as `<`. (ocaml/dune#6928, @tatchi)

- Fix `--trace-file` output. Dune now emits a single *complete* event for every
  executed process. Unterminated *async* events are no longer written. (ocaml/dune#6892,
  @rgrinberg)

- Fix preprocessing with `staged_pps` (ocaml/dune#6748, fixes ocaml/dune#6644, @rgrinberg)

- Use colored output with MDX when Dune colors are enabled.
  (ocaml/dune#6462, @MisterDA)

- Make `dune describe workspace` return consistent dependencies for
  executables and for libraries. By default, compile-time dependencies
  towards PPX-rewriters are from now not taken into account (but
  runtime dependencies always are). Compile-time dependencies towards
  PPX-rewriters can be taken into account by providing the
  `--with-pps` flag. (ocaml/dune#6727, fixes ocaml/dune#6486, @esope)

- Print missing newline after `$ dune exec`. (ocaml/dune#6821, fixes ocaml/dune#6700, @rgrinberg,
  @Alizter)

- Fix binary corruption when installing or promoting in parallel (ocaml/dune#6669, fixes
  ocaml/dune#6668, @edwintorok)

- Use colored output with GCC and Clang when compiling C stubs. The
  flag `-fdiagnostics-color=always` is added to the `:standard` set of
  flags. (ocaml/dune#4083, @MisterDA)

- Fix the parsing of decimal and hexadecimal escape literals in `dune`,
  `dune-package`, and other dune s-expression based files (ocaml/dune#6710, @shym)

- Report an error if `dune init ...` would create a "dune" file in a location
  which already contains a "dune" directory (ocaml/dune#6705, @gridbugs)

- Fix the parsing of alerts. They will now show up in diagnostics correctly.
  (ocaml/dune#6678, @rginberg)

- Fix the compilation of modules generated at link time when
  `implicit_transitive_deps` is enabled (ocaml/dune#6642, @rgrinberg)

- Allow `$ dune utop` to load libraries defined in data only directories
  defined using `(subdir ..)` (ocaml/dune#6631, @rgrinberg)

- Format dune files when they are named `dune-file`. This occurs when we enable
  the alternative file names project option. (ocaml/dune#6566, @rgrinberg)

- Move `$ dune ocaml-merlin -dump-config=$dir` to `$ dune ocaml merlin
  dump-config $dir`. (ocaml/dune#6547, @rgrinberg)

- Allow compilation rules to be impacted by `(env ..)` stanzas that modify the
  environment or set binaries. (ocaml/dune#6527, @rgrinberg)

- Coq native mode is now automatically detected by Dune starting with Coq lang
  0.7. `(mode native)` has been deprecated in favour of detection from the
  configuration of Coq. (ocaml/dune#6409, @Alizter)

- Print "Leaving Directory" whenever "Entering Directory" is printed. (ocaml/dune#6419,
  fixes ocaml/dune#138, @cpitclaudel, @rgrinberg)

- Allow `$ dune ocaml dump-dot-merlin` to run in watch mode. Also this command
  shouldn't print "Entering Directory" mesages. (ocaml/dune#6497, @rgrinberg)

- `dune clean` should no longer fail under Windows due to the inability to
  remove the `.lock` file. Also, bring the implementation of the global lock
  under Windows closer to that of Unix. (ocaml/dune#6523, @nojb)

- Remove "Entering Directory" messages for `$ dune install`. (ocaml/dune#6513,
  @rgrinberg)

- Stop passing `-q` flag in `dune coq top`, which allows for `.coqrc` to be
  loaded. (ocaml/dune#6848, fixes ocaml/dune#6847, @Alizter)

- Fix missing dependencies when detecting the kind of C compiler we're using
  (ocaml/dune#6610, fixes ocaml/dune#6415, @emillon)

- Allow `(include_subdirs qualified)` for OCaml projects. (ocaml/dune#6594, fixes ocaml/dune#1084,
  @rgrinberg)

- Accurately determine merlin configuration for all sources selected with
  `copy#` and `copy_files#`. The old heuristic of looking for a module in
  parent directories is removed (ocaml/dune#6594, @rgrinberg)

- Fix inline tests with *js_of_ocaml* and whole program compilation mode
  enabled (ocaml/dune#6645, @hhugo)

- Fix *js_of_ocaml* separate compilation rules when `--enable=effects`
  ,`--enable=use-js-string` or `--toplevel` is used. (ocaml/dune#6714, ocaml/dune#6828, ocaml/dune#6920, @hhugo)

- Fix *js_of_ocaml* separate compilation in presence of linkall (ocaml/dune#6832, ocaml/dune#6916, @hhugo)

- Remove spurious build dir created when running `dune init proj ...` (ocaml/dune#6707,
  fixes ocaml/dune#5429, @gridbugs)

- Allow `--sandbox` to affect `ocamldep` invocations. Previously, they were
  wrongly marked as incompatible (ocaml/dune#6749, @rgrinberg)

- Validate the command line arguments for `$ dune ocaml top-module`. This
  command requires one positional argument (ocaml/dune#6796, fixes ocaml/dune#6793, @rgrinberg)

- Add a `dune cache size` command for displaying the size of the cache (ocaml/dune#6638,
  @Alizter)

- Fix dependency cycle when installing files to the bin section with
  `glob_files` (ocaml/dune#6764, fixes ocaml/dune#6708, @gridbugs)

- Handle "Too many links" errors when using Dune cache on Windows (ocaml/dune#6993, @nojb)

- Allow the `cinaps` stanza to set a custom alias. By default, if the alias is
  not set then the cinaps actions will be attached to both `@cinaps` and
  `@runtest` (ocaml/dune#6991, @rgrinberg)

- Add `(using ctypes 0.3)`. When used, paths in `(ctypes)` are interpreted
  relative to where the stanza is defined. (ocaml/dune#6883, fixes ocaml/dune#5325, @emillon)

- Auto-detect `dune-workspace` files as `dune` files in Emacs (ocaml/dune#7061,
  @ilankri)

- Add native support for polling mode on Windows (ocaml/dune#7010, @yams-yams, @nojb)
@TheLortex TheLortex mentioned this pull request Feb 22, 2023
Merged
emillon added a commit to emillon/opam-repository that referenced this pull request Sep 22, 2023
@emillon
Add bounds for removed dune ctypes 0.1 extension
2938421 
The ctypes extension in Dune is documented as experimental (and has
version 0.x) so is not subject to the same compatibility as the rest of
Dune.

Dune 3.11.0 removed versions 0.1 and 0.2 of this extension, so packages
using it need to build with `dune < 3.11`.

Affected packages need to migrate to version 0.3. This should be just a
matter of changing the version of the extension in `dune-project`, but:
- it requires `(lang dune 3.7)`
- if C code refers to local include paths, these are now relative to the
  where the stanza is located. This avoids the need to specify paths
  twice. See ocaml/dune#6883.
@emillon emillon mentioned this pull request Sep 22, 2023
Merged
nberth pushed a commit to nberth/opam-repository that referenced this pull request Jun 18, 2024
@emillon @nberth
Add bounds for removed dune ctypes 0.1 extension
4fb6a3a 
The ctypes extension in Dune is documented as experimental (and has
version 0.x) so is not subject to the same compatibility as the rest of
Dune.

Dune 3.11.0 removed versions 0.1 and 0.2 of this extension, so packages
using it need to build with `dune < 3.11`.

Affected packages need to migrate to version 0.3. This should be just a
matter of changing the version of the extension in `dune-project`, but:
- it requires `(lang dune 3.7)`
- if C code refers to local include paths, these are now relative to the
  where the stanza is located. This avoids the need to specify paths
  twice. See ocaml/dune#6883.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgrinberg rgrinberg rgrinberg approved these changes

Assignees
No one assigned
Labels
ctypes
Projects
None yet
Milestone
3.7.0
Development

Successfully merging this pull request may close these issues.

Ctypes binding doesn't support well local headers
2 participants
@emillon @rgrinberg