Install the .v files of Coq theories along with their .vo files #3384
Conversation
| @@ -409,16 +409,20 @@ let install_rules ~sctx ~dir s = | |||
| in | |||
| Dir_contents.coq dir_contents | |||
| |> Coq_sources.library ~name | |||
| |> List.map ~f:(fun (vfile : Coq_module.t) -> | |||
| |> List.concat_map ~f:(fun (vfile : Coq_module.t) -> | |||
| let to_path f = Path.reach ~from:(Path.build dir) (Path.build f) in | |||
There was a problem hiding this comment.
It seems to me that this function could be useful also for OCaml once it gets qualified subdir support?
Should we move it to Path @rgrinberg ?
There was a problem hiding this comment.
For now, let's keep it here. In fact, we are trying to avoid adding dune specific stuff to Path and make it a more general purpose module.
There was a problem hiding this comment.
Ok, I was thinking that'd be a general function tho, "relocate" ? My main gripe is that the current implementation doesn't seem very efficient, but not a big deal indeed.
Great thanks; please add an entry in the CHANGES file, you will also have to update the test-suite, it can be done using make test-coq then make promote once you have reviewed the changes.
We also mimic what Dune does for OCaml so indeed that's more uniform within Dune itself. I didn't look at how the rules are in the OCaml land but they should be pretty straightforward. |
|
Wrt. the test-suite, it looks like rather adding a new case, I shall probably update the one which failed in the CI, right? |
Yes, in this case updating the existing ones should do the trick as your change applies to all public Coq theories, see my comment above on how to do it. |
Signed-off-by: Thomas Letan <lthms@soap.coffee>
lthms
force-pushed
the
install-v-files
branch
2 times, most recently
from
6ea8f5c
to
fea9485
Compare
I can definitely do that, indeed.
I reworded the patch description according to your feedback.
I did what you asked (I actually had to add a missing Anyway, I have updated the PR accordingly. |
lthms
changed the title
|
Looks good to me. Did you run |
With this patch, we mimic the behavior of coq_makefile and of dune itself with OCaml libraries, which is to install not only “interface file” (the .vo files of a Coq theories in our cases) but also the source files (.v file). This is useful for Coq-related tools such a Proof General, which use them to implement “goto definition”-like feature. This fixes ocaml#3383 Signed-off-by: Thomas Letan <lthms@soap.coffee>
|
I just did! |
|
Thanks, it looks good to me! Will merge soon so it can reach 2.5.1. |
|
I’m happy to read that. (: It is fortunate that Travis is also happy with my PR, as all is green! |
…lugin, dune-private-libs and dune-glob (2.5.1) CHANGES: - [coq] Fix install .v files for Coq theories (ocaml/dune#3384, @lthms) - [coq] Fix install path for theory names with level greater than 1 (ocaml/dune#3358, @ejgallego) - Fix a bug introduced in 2.0.0 where the [locks] field in rules with no targets had no effect. (@aalekseyev, report by @CraigFe)
With this patch, we mimic the behavior of coq_makefile, which is to
install not only the .vo files of a Coq theories (produced by coqc)
but also the .v file. This is useful for Coq-related tools such a
Proof General, which use them to implement “goto definition”-like
feature.
Fixes issue #3383