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

Remove odoc_html_support_files.ml #1044

Merged
merged 3 commits into from
Dec 6, 2023

Conversation

EmileTrotignon
Copy link
Collaborator

This PR removes the need to promote odoc_html_support_files.ml from the source tree.

It is still present in the build.

I am aware that I might have missed something that make this a bad idea, but I wanted to open that discussion.

Copy link
Collaborator

@Julow Julow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason for this was to avoid having ocaml-crunch as a build-dependency instead of a test-dependency.

I'm in favor of this change as it adds few dependencies and remove a often conflicting file.

@@ -5,34 +5,32 @@
(aliases runtest support-files)
(enabled_if
(> %{ocaml_version} 4.08))
(target odoc_html_support_files.ml)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

odoc.opam is not uptodate as crunch is still listed with-test. It would be nice to test various versions of crunch and find an eventual lower bound.

@Julow
Copy link
Collaborator

Julow commented Nov 24, 2023

This requires a change entry as well as an approval from more than one person.

@Julow
Copy link
Collaborator

Julow commented Dec 5, 2023

@jonludlam As you implemented the ocaml-crunch rule, what do you think of merging this ?

@panglesd
Copy link
Collaborator

panglesd commented Dec 6, 2023

I'm agnostic in this debate (which has... a conflict with odoc_html_support_files.ml!)

Counting the recursive one, this PR adds the following dependencies:

  • ocaml-crunch
  • ptime

which I think is reasonable, although the benefit is not essential. It can easily be revert if needed.

@jonludlam
Copy link
Member

Since we're already having to do some work on release branches (ie, substituting in the version in the crunched files and then updating the generated ml file), we could just as well do the crunching and remove the dependency, if we felt it that important.

@Julow
Copy link
Collaborator

Julow commented Dec 6, 2023

It seems that there's 3 approvals. This just need a rebase and I'd merge.

@jonludlam
Copy link
Member

A rebase and adding the dependency.

@EmileTrotignon EmileTrotignon added the no changelog This pull request does not need a changelog entry label Dec 6, 2023
@Julow Julow merged commit d00f696 into ocaml:master Dec 6, 2023
4 of 5 checks passed
@jonludlam
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no changelog This pull request does not need a changelog entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants