Minor changes to code filling/reading the installation directory#1875
Merged
nojb merged 4 commits intoocaml:trunkfrom Jul 2, 2018
Merged
Minor changes to code filling/reading the installation directory#1875nojb merged 4 commits intoocaml:trunkfrom
nojb merged 4 commits intoocaml:trunkfrom
Conversation
Here is the diff in the installation directory, limited to the condition module: -./lib/ocaml/condition.mli ./lib/ocaml/threads/condition.cmi ./lib/ocaml/threads/condition.cmti ./lib/ocaml/threads/condition.cmx +./lib/ocaml/threads/condition.mli ./lib/ocaml/vmthreads/condition.cmi ./lib/ocaml/vmthreads/condition.cmti ./lib/ocaml/vmthreads/condition.mli and overall: @@ -1300,7 +1300,6 @@ ./lib/ocaml/complex.mli ./lib/ocaml/complex.p.cmt ./lib/ocaml/complex.p.cmx -./lib/ocaml/condition.mli ./lib/ocaml/digest.cmi ./lib/ocaml/digest.cmt ./lib/ocaml/digest.cmti @@ -1324,7 +1323,6 @@ ./lib/ocaml/ephemeron.mli ./lib/ocaml/ephemeron.p.cmt ./lib/ocaml/ephemeron.p.cmx -./lib/ocaml/event.mli ./lib/ocaml/expunge ./lib/ocaml/extract_crc ./lib/ocaml/filename.cmi @@ -1471,7 +1469,6 @@ ./lib/ocaml/moreLabels.mli ./lib/ocaml/moreLabels.p.cmt ./lib/ocaml/moreLabels.p.cmx -./lib/ocaml/mutex.mli ./lib/ocaml/nativeint.cmi ./lib/ocaml/nativeint.cmt ./lib/ocaml/nativeint.cmti @@ -1774,27 +1771,30 @@ ./lib/ocaml/sys.p.cmx ./lib/ocaml/target_camlheaderd ./lib/ocaml/target_camlheaderi -./lib/ocaml/thread.mli ./lib/ocaml/threads ./lib/ocaml/threads/condition.cmi ./lib/ocaml/threads/condition.cmti ./lib/ocaml/threads/condition.cmx +./lib/ocaml/threads/condition.mli ./lib/ocaml/threads/event.cmi ./lib/ocaml/threads/event.cmti ./lib/ocaml/threads/event.cmx +./lib/ocaml/threads/event.mli ./lib/ocaml/threads/mutex.cmi ./lib/ocaml/threads/mutex.cmti ./lib/ocaml/threads/mutex.cmx +./lib/ocaml/threads/mutex.mli ./lib/ocaml/threads/thread.cmi ./lib/ocaml/threads/thread.cmti ./lib/ocaml/threads/thread.cmx +./lib/ocaml/threads/thread.mli ./lib/ocaml/threads/threads.a ./lib/ocaml/threads/threads.cma ./lib/ocaml/threads/threads.cmxa ./lib/ocaml/threads/threadUnix.cmi ./lib/ocaml/threads/threadUnix.cmti ./lib/ocaml/threads/threadUnix.cmx -./lib/ocaml/threadUnix.mli +./lib/ocaml/threads/threadUnix.mli ./lib/ocaml/topdirs.cmi ./lib/ocaml/topdirs.cmt ./lib/ocaml/topdirs.cmti
- store what was passed on the command line, before expanding +foo into path-to-stdlib/foo, instead of randomly doing either - the toplevel libraries were not expanding the leading + from OCAMLPARAM - make the native toplevel slightly closer to the bytecode one - remove what looks like duplicated code in ocamldoc
nojb
approved these changes
Jul 2, 2018
Contributor
There was a problem hiding this comment.
LGTM.
In short, this PR:
- installs
middle_endcmxwhen onmake install - Brings the handling of
+inocamldocandtoplevelin line with the rest of the compiler. - Fixes a potential bug in which
+was not being expanded when invoking the C compiler. - Installs
systhreadsmlifiles in$(ocamlc -where)/threads
Contributor
|
Planning to merge later today unless someone speaks up. |
Contributor
|
Thanks! |
EmileTrotignon
pushed a commit
to EmileTrotignon/ocaml
that referenced
this pull request
Jan 12, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A few commits extracted from #1569, see the commits themselves for a description.