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

[coq_rules] Refactor boot flag handling. #5866

Merged
merged 3 commits into from
Jun 21, 2022

Conversation

ejgallego
Copy link
Collaborator

Instead of doing an special case in Coq_lib, we handle the boot
library directly in the flags.

This allows us to handle coqdoc-specific flags related to -boot, and
is more in line with what we expect the future theory model will be.

Downside is that -boot is now not included in the closure dep, but
that seems fine, actually we should forbid (boot) libraries from
declaring (theories ...) deps, but as we are getting rid of it
eventually maybe it is not worth the effort.

@ejgallego ejgallego marked this pull request as ready for review June 11, 2022 11:06
@ejgallego ejgallego force-pushed the coq_rules+refactor branch from 5411b54 to 19adc78 Compare June 11, 2022 11:06
@ejgallego
Copy link
Collaborator Author

Actually let me enforce that last invariant.

@ejgallego ejgallego force-pushed the coq_rules+refactor branch from 19adc78 to e1c2d47 Compare June 11, 2022 11:17
@ejgallego ejgallego added the coq label Jun 11, 2022
@ejgallego ejgallego force-pushed the coq_rules+refactor branch 3 times, most recently from f1165e9 to 8015d8e Compare June 11, 2022 11:41
@ejgallego ejgallego force-pushed the coq_rules+refactor branch 3 times, most recently from 9c54c71 to d9a9564 Compare June 11, 2022 14:04
@ejgallego
Copy link
Collaborator Author

I think this is ready, let me know folks if you have any further comment.

@ejgallego ejgallego added this to the 3.3.0 milestone Jun 13, 2022
@Alizter
Copy link
Collaborator

Alizter commented Jun 13, 2022

@ejgallego Shouldn't you rebase rather than merge?

@ejgallego
Copy link
Collaborator Author

@Alizter that was github's auto-stuff , let me see.

@ejgallego ejgallego force-pushed the coq_rules+refactor branch 2 times, most recently from 8eb207f to dcf7510 Compare June 15, 2022 09:03
@rgrinberg rgrinberg modified the milestones: 3.3.0, 3.4.0 Jun 17, 2022
Instead of doing an special case in Coq_lib, we handle the boot
library directly in the flags.

This allows us to handle coqdoc-specific flags related to `-boot`, and
is more in line with what we expect the future theory model will be.

Downside is that `-boot` is now not included in the closure dep, but
that seems fine, actually we should forbid `(boot)` libraries from
declaring `(theories ...)` deps, but as we are getting rid of it
eventually maybe it is not worth the effort.

Signed-off-by: Emilio Jesus Gallego Arias <[email protected]>
Signed-off-by: Emilio Jesus Gallego Arias <[email protected]>
@ejgallego ejgallego force-pushed the coq_rules+refactor branch from dcf7510 to 71a5da8 Compare June 21, 2022 10:39
@ejgallego
Copy link
Collaborator Author

Ping @Alizter @rgrinberg , or can I just merge?

@Alizter
Copy link
Collaborator

Alizter commented Jun 21, 2022

@ejgallego I'll take another look.

@Alizter
Copy link
Collaborator

Alizter commented Jun 21, 2022

@ejgallego Looks good to me

@ejgallego ejgallego merged commit d30803b into ocaml:main Jun 21, 2022
@ejgallego ejgallego deleted the coq_rules+refactor branch June 21, 2022 13:14
@ejgallego
Copy link
Collaborator Author

This PR has a bug 🤦 , we forgot to include the ML flags of the boot theory. Will fix boot_lib_flags and add a test.

ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 27, 2022
ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 27, 2022
Should fix a bug introduced in ocaml#5866 , the handling of boot Coq lib
really needs to be done at the top level as coqdep's `source_rule`
etc... need to be aware of it.
ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 27, 2022
ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 27, 2022
Should fix a bug introduced in ocaml#5866 , the handling of boot Coq lib
really needs to be done at the top level as coqdep's `source_rule`
etc... need to be aware of it.
ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 27, 2022
ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 27, 2022
Should fix a bug introduced in ocaml#5866 , the handling of boot Coq lib
really needs to be done at the top level as coqdep's `source_rule`
etc... need to be aware of it.
ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 27, 2022
ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 27, 2022
Should fix a bug introduced in ocaml#5866 , the handling of boot Coq lib
really needs to be done at the top level as coqdep's `source_rule`
etc... need to be aware of it.

Signed-off-by: Emilio Jesus Gallego Arias <[email protected]>
ejgallego added a commit to ejgallego/dune that referenced this pull request Sep 28, 2022
Should fix a bug introduced in ocaml#5866 , the handling of boot Coq lib
really needs to be done at the top level as coqdep's `source_rule`
etc... need to be aware of it.

Signed-off-by: Emilio Jesus Gallego Arias <[email protected]>
ejgallego added a commit that referenced this pull request Sep 28, 2022
ejgallego added a commit that referenced this pull request Sep 28, 2022
Should fix a bug introduced in #5866 , the handling of boot Coq lib
really needs to be done at the top level as coqdep's `source_rule`
etc... need to be aware of it.

Signed-off-by: Emilio Jesus Gallego Arias <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants