feature(coq): coq macro #6049

Alizter · 2022-08-07T18:50:40Z

This is a continuation of #5967. The difference here is that the extra variables have been removed in a following commit. We now only expose:

Coq configuration variables:

%{coq:coqlib}
%{coq:coq_native_compiler_default}

Version numbers for Coq:

%{coq:version}
%{coq:ocaml-version}
%{coq:version.major}
%{coq:version.minor}
%{coq:version.suffix}

close feature(coq): coq macro #5967
close feature(coq): coq_version variable #5913

Alizter · 2022-09-03T11:58:19Z

@ejgallego ping

ejgallego · 2022-09-04T12:31:35Z

Looks very good to me, thanks! I can do a full code review next week after I'm done with the Sabanci class, but if someone else wants to take over, the interface for this PR looks good to me so you can merge.

Need to update the docs and changelog I think.

ejgallego · 2022-09-04T12:33:15Z

Also %{coq:coq_native_compiler_default} could be maybe named a bit differently? The flag really means that coqc was configured to output native files by default. But still you can use the native compiler when this flag in configure was not passed.

It is a hack so people could have coq_makefile output native files just by recompiling coq.

Alizter · 2022-09-05T08:36:54Z

Also %{coq:coq_native_compiler_default} could be maybe named a bit differently? The flag really means that coqc was configured to output native files by default. But still you can use the native compiler when this flag in configure was not passed.

It is a hack so people could have coq_makefile output native files just by recompiling coq.

We can name it whatever we want, I just kept the env var name from configure.

Alizter · 2022-09-18T21:21:08Z

@ejgallego ping

ejgallego · 2022-09-19T19:24:58Z

test/blackbox-tests/test-cases/coq/coq-config.t/dune

+     (run sed "/^CAMLFLAGS=/d")
+     (run sed "/^WARN=/d")
+     (run sed "/^HASNATDYNLINK=/d")
+     (run sed "/^COQ_SRC_SUBDIRS=/d"))


Maybe you want to use grep to filter out the positive ones instead (use the egrep | pattern for disjunctive regexps)

Grep might not run the same in mac so I stuck to sed

ejgallego

Looks very good to me but I'm not expert on the expander code, so it'd be nice if an expert could have a look, maybe (@rgrinberg ) ?

ejgallego

Actually CHANGES and doc need updating.

Alizter · 2022-09-19T23:25:38Z

@ejgallego I've added a changelog and some doc.

Alizter · 2022-09-19T23:26:36Z

The expander code is originally @rgrinberg's, but if he has some time, I wouldn't mind another pair of eyes.

christinerose

Mostly minor grammar/formatting suggestions. One question at the end about phrasing.

CHANGES.md

doc/coq.rst

test/blackbox-tests/test-cases/coq/coq-config.t/run.t

CHANGES.md

ejgallego

Great, will merge once the conflict is solved.

Signed-off-by: Ali Caglayan <alizter@gmail.com>

@rgrinberg

…ne-site, dune-rpc, dune-rpc-lwt, dune-private-libs, dune-glob, dune-configurator, dune-build-info, dune-action-plugin and chrome-trace (3.5.0~alpha1) CHANGES: - Sandbox running cinaps actions starting from cinaps 1.1 (ocaml/dune#6176, @rgrinberg) - Add a `runtime_deps` field in the `cinaps` stanza to specify runtime dependencies for running the cinaps preprocessing action (ocaml/dune#6175, @rgrinberg) - Shadow alias module `Foo__` when building a library `Foo` (ocaml/dune#6126, @rgrinberg) - Extend dune describe to include the root path of the workspace and the relative path to the build directory. (ocaml/dune#6136, @reubenrowe) - Allow dune describe workspace to accept directories as arguments. The provided directories restrict the worskpace description to those directories. (ocaml/dune#6107, fixes ocaml/dune#3893, @esope) - Add a terminal persistence mode that attempts to clear the terminal history. It is enabled by setting terminal persistence to `clear-on-rebuild-and-flush-history` (ocaml/dune#6065, @rgrinberg) - Disallow generating targets in sub direcories in inferred rules. The check to forbid this was accidentally done only for manually specified targets (ocaml/dune#6031, @rgrinberg) - Do not ignore rules marked `(promote (until-clean))` when `--ignore-promoted-rules` (or `-p`) is passed. (ocaml/dune#6010, fixes ocaml/dune#4401, @emillon) - Dune no longer considers .aux files as targets during Coq compilation. This means that .aux files are no longer cached. (ocaml/dune#6024, fixes ocaml/dune#6004, @Alizter) - Cinaps actions are now sandboxed by default (ocaml/dune#6062, @rgrinberg) - Allow rules producing directory targets to be not sandboxed (ocaml/dune#6056, @rgrinberg) - Introduce a `dirs` field in the `install` stanza to install entire directories (ocaml/dune#5097, fixes ocaml/dune#5059, @rgrinberg) - Menhir rules are now sandboxed by default (ocaml/dune#6076, @rgrinberg) - Allow rules producing directory targets to create symlinks (ocaml/dune#6077, fixes ocaml/dune#5945, @rgrinberg) - Inline tests are now sandboxed by default (ocaml/dune#6079, @rgrinberg) - Fix build-info version when used with flambda (ocaml/dune#6089, fixes ocaml/dune#6075, @jberdine) - Add an `(include <file>)` term to the `include_dirs` field for adding directories to the include paths sourced from a file. (ocaml/dune#6058, fixes ocaml/dune#3993, @gridbugs) - Support `(extra_objects ...)` field in `(executable ...)` and `(library ...)` stanzas (ocaml/dune#6084, fixes ocaml/dune#4129, @gridbugs) - Fix compilation of Dune under esy on Windows (ocaml/dune#6109, fixes ocaml/dune#6098, @nojb) - Improve error message when parsing several licenses in `(license)` (ocaml/dune#6114, fixes ocaml/dune#6103, @emillon) - odoc rules now about `ODOC_SYNTAX` and will rerun accordingly (ocaml/dune#6010, fixes ocaml/dune#1117, @emillon) - dune install: copy files in an atomic way (ocaml/dune#6150, @emillon) - Add `%{coq:...}` macro for accessing data about the configuration about Coq. For instance `%{coq:version}` (ocaml/dune#6049, @Alizter) - update vendored copy of cmdliner to 1.1.1. This improves the built-in documentation for command groups such as `dune ocaml`. (ocaml/dune#6038, @emillon, ocaml/dune#6169, @shonfeder) - The test suite for Coq now requires Coq >= 8.16 due to changes in the plugin loading mechanism upstream (which now uses findlib). - Starting with Coq build language 0.6, theories can be built without importing Coq's standard library by including `(stdlib no)`. (ocaml/dune#6165 ocaml/dune#6164, fixes ocaml/dune#6163, @ejgallego @Alizter @LasseBlaauwbroek) - on macOS, sign executables produced by artifact substitution (ocaml/dune#6137, fixes ocaml/dune#5650, @emillon) - Added an (aliases ...) field to the (rules ...) stanza which allows the specification of multiple aliases per rule (ocaml/dune#6194, @Alizter)

@rgrinberg

…ne-site, dune-rpc, dune-rpc-lwt, dune-private-libs, dune-glob, dune-configurator, dune-build-info, dune-action-plugin and chrome-trace (3.5.0) CHANGES: - macOS: Handle unknown fsevents without crashing (ocaml/dune#6217, @rgrinberg) - Enable file watching on MacOS SDK < 10.13. (ocaml/dune#6218, @rgrinberg) - Sandbox running cinaps actions starting from cinaps 1.1 (ocaml/dune#6176, @rgrinberg) - Add a `runtime_deps` field in the `cinaps` stanza to specify runtime dependencies for running the cinaps preprocessing action (ocaml/dune#6175, @rgrinberg) - Shadow alias module `Foo__` when building a library `Foo` (ocaml/dune#6126, @rgrinberg) - Extend dune describe to include the root path of the workspace and the relative path to the build directory. (ocaml/dune#6136, @reubenrowe) - Allow dune describe workspace to accept directories as arguments. The provided directories restrict the worskpace description to those directories. (ocaml/dune#6107, fixes ocaml/dune#3893, @esope) - Add a terminal persistence mode that attempts to clear the terminal history. It is enabled by setting terminal persistence to `clear-on-rebuild-and-flush-history` (ocaml/dune#6065, @rgrinberg) - Disallow generating targets in sub direcories in inferred rules. The check to forbid this was accidentally done only for manually specified targets (ocaml/dune#6031, @rgrinberg) - Do not ignore rules marked `(promote (until-clean))` when `--ignore-promoted-rules` (or `-p`) is passed. (ocaml/dune#6010, fixes ocaml/dune#4401, @emillon) - Dune no longer considers .aux files as targets during Coq compilation. This means that .aux files are no longer cached. (ocaml/dune#6024, fixes ocaml/dune#6004, @Alizter) - Cinaps actions are now sandboxed by default (ocaml/dune#6062, @rgrinberg) - Allow rules producing directory targets to be not sandboxed (ocaml/dune#6056, @rgrinberg) - Introduce a `dirs` field in the `install` stanza to install entire directories (ocaml/dune#5097, fixes ocaml/dune#5059, @rgrinberg) - Menhir rules are now sandboxed by default (ocaml/dune#6076, @rgrinberg) - Allow rules producing directory targets to create symlinks (ocaml/dune#6077, fixes ocaml/dune#5945, @rgrinberg) - Inline tests are now sandboxed by default (ocaml/dune#6079, @rgrinberg) - Fix build-info version when used with flambda (ocaml/dune#6089, fixes ocaml/dune#6075, @jberdine) - Add an `(include <file>)` term to the `include_dirs` field for adding directories to the include paths sourced from a file. (ocaml/dune#6058, fixes ocaml/dune#3993, @gridbugs) - Support `(extra_objects ...)` field in `(executable ...)` and `(library ...)` stanzas (ocaml/dune#6084, fixes ocaml/dune#4129, @gridbugs) - Fix compilation of Dune under esy on Windows (ocaml/dune#6109, fixes ocaml/dune#6098, @nojb) - Improve error message when parsing several licenses in `(license)` (ocaml/dune#6114, fixes ocaml/dune#6103, @emillon) - odoc rules now about `ODOC_SYNTAX` and will rerun accordingly (ocaml/dune#6010, fixes ocaml/dune#1117, @emillon) - dune install: copy files in an atomic way (ocaml/dune#6150, @emillon) - Add `%{coq:...}` macro for accessing data about the configuration about Coq. For instance `%{coq:version}` (ocaml/dune#6049, @Alizter) - update vendored copy of cmdliner to 1.1.1. This improves the built-in documentation for command groups such as `dune ocaml`. (ocaml/dune#6038, @emillon, ocaml/dune#6169, @shonfeder) - The test suite for Coq now requires Coq >= 8.16 due to changes in the plugin loading mechanism upstream (which now uses `Findlib`). - Starting with Coq build language 0.6, theories can be built without importing Coq's standard library by including `(stdlib no)`. (ocaml/dune#6165 ocaml/dune#6164, fixes ocaml/dune#6163, @ejgallego @Alizter @LasseBlaauwbroek) - on macOS, sign executables produced by artifact substitution (ocaml/dune#6137, ocaml/dune#6231, fixes ocaml/dune#5650, fixes ocaml/dune#6226, @emillon) - Added an (aliases ...) field to the (rules ...) stanza which allows the specification of multiple aliases per rule (ocaml/dune#6194, @Alizter) - The `(coq.theory ...)` stanza will now ensure that for each declared `(plugin ...)`, the `META` file for it is built before calling `coqdep`. This enables the use of the new `Findlib`-based loading method in Coq 8.16; however as of Coq 8.16.0, Coq itself has some bugs preventing this to work yet. (ocaml/dune#6167 , workarounds ocaml/dune#5767, @ejgallego) - Allow include statement in install stanza (ocaml/dune#6139, fixes ocaml/dune#256, @gridbugs) - Handle CSI n K code in ANSI escape codes from commands. (ocaml/dune#6214, fixes ocaml/dune#5528, @emillon) - Add a new experimental feature `mode_specific_stubs` that allows the specification of different flags and sources for foreign stubs depending on the build mode (ocaml/dune#5649, @voodoos)

We omit the need for native to be specified in the coq.theory stanza and instead allow for Dune to automatically detect whether to enable native compilation via the output of `coqc -config` which was exposed in ocaml#6049. This continues and finishes an earlier attempt to do someting similar in ocaml#4722. Signed-off-by: Ali Caglayan <alizter@gmail.com> ps-id: cc90289d-3063-4b5c-a76e-987bd9f250be

We omit the need for native to be specified in the coq.theory stanza and instead allow for Dune to automatically detect whether to enable native compilation via the output of `coqc -config` which was exposed in ocaml#6049. This continues and finishes an earlier attempt to do someting similar in ocaml#4722. Signed-off-by: Ali Caglayan <alizter@gmail.com> ps-id: cc90289d-3063-4b5c-a76e-987bd9f250be Signed-off-by: Ali Caglayan <alizter@gmail.com>

We omit the need for native to be specified in the coq.theory stanza and instead allow for Dune to automatically detect whether to enable native compilation via the output of `coqc -config` which was exposed in ocaml#6049. This continues and finishes an earlier attempt to do someting similar in ocaml#4722. Signed-off-by: Ali Caglayan <alizter@gmail.com> ps-id: cc90289d-3063-4b5c-a76e-987bd9f250be

We omit the need for native to be specified in the coq.theory stanza and instead allow for Dune to automatically detect whether to enable native compilation via the output of `coqc -config` which was exposed in ocaml#6049. This continues and finishes an earlier attempt to do someting similar in ocaml#4722. Signed-off-by: Ali Caglayan <alizter@gmail.com> ps-id: cc90289d-3063-4b5c-a76e-987bd9f250be Signed-off-by: Ali Caglayan <alizter@gmail.com>

We omit the need for native to be specified in the coq.theory stanza and instead allow for Dune to automatically detect whether to enable native compilation via the output of `coqc -config` which was exposed in ocaml#6049. This continues and finishes an earlier attempt to do someting similar in ocaml#4722. Signed-off-by: Ali Caglayan <alizter@gmail.com> ps-id: cc90289d-3063-4b5c-a76e-987bd9f250be

We omit the need for native to be specified in the coq.theory stanza and instead allow for Dune to automatically detect whether to enable native compilation via the output of `coqc -config` which was exposed in ocaml#6049. This continues and finishes an earlier attempt to do someting similar in ocaml#4722. Signed-off-by: Ali Caglayan <alizter@gmail.com> ps-id: cc90289d-3063-4b5c-a76e-987bd9f250be Signed-off-by: Ali Caglayan <alizter@gmail.com>

We omit the need for native to be specified in the coq.theory stanza and instead allow for Dune to automatically detect whether to enable native compilation via the output of `coqc -config` which was exposed in #6049. This continues and finishes an earlier attempt to do someting similar in #4722. Signed-off-by: Ali Caglayan <alizter@gmail.com> ps-id: cc90289d-3063-4b5c-a76e-987bd9f250be Signed-off-by: Ali Caglayan <alizter@gmail.com>

Alizter force-pushed the coq-macro branch 2 times, most recently from c554b3b to 8dbdbcd Compare August 7, 2022 19:13

Alizter changed the title ~~Coq macro~~ feature(coq): coq macro Aug 7, 2022

ejgallego self-assigned this Aug 7, 2022

Alizter force-pushed the coq-macro branch 3 times, most recently from 503e61b to 70b0eb8 Compare September 3, 2022 12:13

ejgallego reviewed Sep 19, 2022

View reviewed changes

ejgallego approved these changes Sep 19, 2022

View reviewed changes

ejgallego added the coq label Sep 19, 2022

ejgallego requested changes Sep 19, 2022

View reviewed changes

Alizter force-pushed the coq-macro branch from 70b0eb8 to a8f21c6 Compare September 19, 2022 23:25

Alizter requested a review from christinerose as a code owner September 19, 2022 23:25

Alizter requested a review from ejgallego September 19, 2022 23:26

Alizter requested a review from rgrinberg September 19, 2022 23:27

christinerose approved these changes Sep 20, 2022

View reviewed changes

Alizter force-pushed the coq-macro branch from a8f21c6 to 1707697 Compare September 20, 2022 12:51

ejgallego reviewed Sep 23, 2022

View reviewed changes

CHANGES.md Show resolved Hide resolved

ejgallego approved these changes Sep 23, 2022

View reviewed changes

rgrinberg and others added 3 commits September 24, 2022 13:42

feature(coq): coq macro

3c00e98

Signed-off-by: Ali Caglayan <alizter@gmail.com>

Restrict available configuration variables in coq macro

da71ae9

Signed-off-by: Ali Caglayan <alizter@gmail.com>

doc(coq): changelog and doc for Coq macro

6159791

Signed-off-by: Ali Caglayan <alizter@gmail.com>

Alizter force-pushed the coq-macro branch from 1707697 to 6159791 Compare September 24, 2022 11:44

ejgallego merged commit 11a8a4f into ocaml:main Sep 25, 2022

emillon mentioned this pull request Oct 19, 2022

[new release] xdg, stdune, ordering, ocamlc-loc, fiber, dyn, dune, dune-site, dune-rpc, dune-rpc-lwt, dune-private-libs, dune-glob, dune-configurator, dune-build-info, dune-action-plugin and chrome-trace (3.5.0) ocaml/opam-repository#22317

Merged

Alizter mentioned this pull request Nov 8, 2022

[coq] Default for mode vo/native according to coqc configuration #4722

Closed

Alizter mentioned this pull request Nov 8, 2022

feature(coq): automatic detection of native #6409

Merged

Alizter mentioned this pull request Feb 12, 2023

[coq] 1.0 version coq language version meta-issue #1998

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature(coq): coq macro #6049

feature(coq): coq macro #6049

Alizter commented Aug 7, 2022 •

edited

Loading

Alizter commented Sep 3, 2022

ejgallego commented Sep 4, 2022

ejgallego commented Sep 4, 2022

Alizter commented Sep 5, 2022

Alizter commented Sep 18, 2022

ejgallego Sep 19, 2022

Alizter Sep 19, 2022

ejgallego left a comment

ejgallego left a comment

Alizter commented Sep 19, 2022

Alizter commented Sep 19, 2022 •

edited

Loading

christinerose left a comment

ejgallego left a comment

feature(coq): coq macro #6049

feature(coq): coq macro #6049

Conversation

Alizter commented Aug 7, 2022 • edited Loading

Alizter commented Sep 3, 2022

ejgallego commented Sep 4, 2022

ejgallego commented Sep 4, 2022

Alizter commented Sep 5, 2022

Alizter commented Sep 18, 2022

ejgallego Sep 19, 2022

Choose a reason for hiding this comment

Alizter Sep 19, 2022

Choose a reason for hiding this comment

ejgallego left a comment

Choose a reason for hiding this comment

ejgallego left a comment

Choose a reason for hiding this comment

Alizter commented Sep 19, 2022

Alizter commented Sep 19, 2022 • edited Loading

christinerose left a comment

Choose a reason for hiding this comment

ejgallego left a comment

Choose a reason for hiding this comment

Alizter commented Aug 7, 2022 •

edited

Loading

Alizter commented Sep 19, 2022 •

edited

Loading