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

Install Changes, LICENSE, and READMEs #10669

Merged
merged 11 commits into from
Oct 1, 2021
Merged

Install Changes, LICENSE, and READMEs #10669

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8b458c5
Install Changes
nojb Sep 30, 2021
2dc83d2
Fix
nojb Sep 30, 2021
ff6bb64
Use Autoconf default
nojb Sep 30, 2021
791232d
Move variable to Makefile.build_config
nojb Sep 30, 2021
fd42adf
Update Makefile.build_config.in
nojb Sep 30, 2021
1de2196
Install READMEs, LICENSE
nojb Oct 1, 2021
0640438
Rename DOCS_TO_INSTALL => DOC_FILES
nojb Oct 1, 2021
f682f71
Update opam file
nojb Oct 1, 2021
f4ff24b
Changes
nojb Oct 1, 2021
46eb9ff
Fix
nojb Oct 1, 2021
f1d4f46
One more time
nojb Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocaml-variants.opam
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ depends: [
conflict-class: "ocaml-core-compiler"
flags: compiler
build: [
["./configure" "--prefix=%{prefix}%"]
["./configure" "--prefix=%{prefix}%" "--docdir=%{prefix}%/doc/ocaml"]
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be --docdir=%{ocaml:doc}%(or --docdir=%{_:doc}% but I can't find it in the documentation, I'm no longer sure if that's the right syntax to not mention the package name in the opam file).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, fixed. The doc for the %{_:var}% syntax seems to be https://opam.ocaml.org/doc/Manual.html#Scopes, I didn't see anything that would make me believe that one should not use this syntax in the opam file.

Copy link
Member

Choose a reason for hiding this comment

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

What's the actual path which is wanted? %{_:doc}% should install it to doc/ocaml-variants in the switch (so it would be doc/ocaml-base-compiler in a released compiler). Does this difference matter? I'm not sure if %{ocaml:doc}% works at this stage (it shouldn't, because the ocaml package is installed after ocaml-variants, but it might because post dependencies are weird).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oof, I'm so ignorant about opam :(

I think that what we want is to install it in ${prefix}/doc/ocaml. This last change was an attempt at producing this exact path without hardcoding it. @dbuenzli do you agree?

Copy link
Contributor

Choose a reason for hiding this comment

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

What's the actual path which is wanted?

You really want them in opam var ocaml:doc, I didn't know about these packaging convolutions. So maybe what @nojb had written in the first place is best. (Sorry for the noise).

Copy link
Contributor

Choose a reason for hiding this comment

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

So maybe what @nojb had written in the first place is best. (Sorry for the noise).

Actually rather than what he wrote originally %{doc}%/ocaml/ would be better.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good, amended.

Copy link
Member

Choose a reason for hiding this comment

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

Not ignorance - it's a really obscure opam corner!

[make "-j%{jobs}%"]
]
install: [make "install"]
Expand Down