Skip to content

fix an unintended change of library installation directory for ocamldoc#1877

Merged
damiendoligez merged 1 commit intoocaml:4.07from
gasche:fix-ocamldoc-libdir-4.07
Jul 3, 2018
Merged

fix an unintended change of library installation directory for ocamldoc#1877
damiendoligez merged 1 commit intoocaml:4.07from
gasche:fix-ocamldoc-libdir-4.07

Conversation

@gasche
Copy link
Copy Markdown
Member

@gasche gasche commented Jul 2, 2018

The error comes from #1680, which changed the install scripts for
ocamldoc, and was caught and reported by Valentin "sliquister"
Gatien-Baron, presumably as part of his own work on #1569.

@gasche
Copy link
Copy Markdown
Member Author

gasche commented Jul 2, 2018 •
edited
Loading

@sliquister: this should fix the issue. (I checked that all LIBDIR uses in Makefile/ocamldoc are covered.)

After running an 'install' from this branch, here is the content from PREFIX/lib/ocaml/ocamldoc on my machine:

ocamldoc.hva              odoc_gen.cmx          odoc_ocamlhtml.cmx
odoc_analyse.cmi          odoc_global.cmi       odoc_parameter.cmi
odoc_analyse.cmx          odoc_global.cmx       odoc_parameter.cmx
odoc_args.cmi             odoc_html.cmi         odoc_parser.cmi
odoc_args.cmx             odoc_html.cmx         odoc_parser.cmx
odoc_ast.cmi              odoc_info.a           odoc_print.cmi
odoc_ast.cmx              odoc_info.cma         odoc_print.cmx
odoc_class.cmi            odoc_info.cmi         odoc_scan.cmi
odoc_class.cmx            odoc_info.cmt         odoc_scan.cmx
odoc.cmi                  odoc_info.cmti        odoc_search.cmi
odoc.cmx                  odoc_info.cmx         odoc_search.cmx
odoc_comments.cmi         odoc_info.cmxa        odoc_see_lexer.cmi
odoc_comments.cmx         odoc_info.mli         odoc_see_lexer.cmx
odoc_comments_global.cmi  odoc_inherit.cmi      odoc_sig.cmi
odoc_comments_global.cmx  odoc_inherit.cmx      odoc_sig.cmx
odoc_config.cmi           odoc_latex.cmi        odoc_str.cmi
odoc_config.cmx           odoc_latex.cmx        odoc_str.cmx
odoc_control.cmi          odoc_latex_style.cmi  odoc_test.cmi
odoc_control.cmx          odoc_latex_style.cmx  odoc_texi.cmi
odoc_cross.cmi            odoc_lexer.cmi        odoc_texi.cmx
odoc_cross.cmx            odoc_lexer.cmx        odoc_text.cmi
odoc_dag2html.cmi         odoc_man.cmi          odoc_text.cmx
odoc_dag2html.cmx         odoc_man.cmx          odoc_text_lexer.cmi
odoc_dep.cmi              odoc_merge.cmi        odoc_text_lexer.cmx
odoc_dep.cmx              odoc_merge.cmx        odoc_text_parser.cmi
odoc_dot.cmi              odoc_messages.cmi     odoc_text_parser.cmx
odoc_dot.cmx              odoc_messages.cmx     odoc_to_text.cmi
odoc_env.cmi              odoc_misc.cmi         odoc_to_text.cmx
odoc_env.cmx              odoc_misc.cmx         odoc_type.cmi
odoc_exception.cmi        odoc_module.cmi       odoc_type.cmx
odoc_exception.cmx        odoc_module.cmx       odoc_types.cmi
odoc_extension.cmi        odoc_name.cmi         odoc_types.cmx
odoc_extension.cmx        odoc_name.cmx         odoc_value.cmi
odoc_gen.cmi              odoc_ocamlhtml.cmi    odoc_value.cmx

@gasche
fix an unintended change of library installation directory for ocamldoc
c9b2df8 
The error comes from ocaml#1680, which changed the install scripts for
ocamldoc, and was caught and reported by Valentin "sliquister"
Gatien-Baron, presumably as part of his own work on ocaml#1569.
@v-gb
Copy link
Copy Markdown
Contributor

v-gb commented Jul 2, 2018 •
edited
Loading

Looks good. Between 4.06 and this, the set of filenames installed in lib/ocaml directory with "doc" in its name is unchanged.

@gasche gasche requested a review from damiendoligez July 2, 2018 17:10
v-gb added a commit to v-gb/ocaml that referenced this pull request Jul 2, 2018
@v-gb
temporary commit to apply fix from ocaml#1877
9e3d85e
damiendoligez
damiendoligez approved these changes Jul 3, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@damiendoligez damiendoligez left a comment

Choose a reason for hiding this comment

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

Looks good.

@damiendoligez damiendoligez merged commit 9c9be40 into ocaml:4.07 Jul 3, 2018
@damiendoligez
Copy link
Copy Markdown
Member

damiendoligez commented Jul 3, 2018

@gasche don't forget to cherry-pick to trunk.

gasche added a commit that referenced this pull request Jul 3, 2018
@gasche
fix an unintended change of library installation directory for ocamldoc
dfc8bd0 
The error comes from #1680, which changed the install scripts for
ocamldoc, and was caught and reported by Valentin "sliquister"
Gatien-Baron, presumably as part of his own work on #1569.

This is the trunk counterpart of #1877 in 4.07, commit
  9c9be40
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull request Jan 12, 2024
@sabine
fix my mistakes in papers.yml (ocaml#1877)
3895307
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@damiendoligez damiendoligez damiendoligez approved these changes

+1 more reviewer

@v-gb v-gb v-gb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@gasche @v-gb @damiendoligez