Bits 'n bobs #3900
Merged
Bits 'n bobs #3900
Conversation
This file contains 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
%{exe}% expands to .exe on Windows platforms, and the empty string on
other systems, allowing .install files to be generated correctly.
Signed-off-by: David Allsopp <[email protected]>
Script attempted to write a filename with "?" in it, which is illegal on Windows. "Fixed" by using a dummy name for the download (since the file is only downloaded to obtain its checksum). Signed-off-by: David Allsopp <[email protected]>
Signed-off-by: David Allsopp <[email protected]>
Two problems from the Jbuilder upgrade: 1. opam_admin_top.cmi should be installed 2. Opam_admin_top functions were not available, because Topmain was invoked from within Opam_admin_top. Signed-off-by: David Allsopp <[email protected]>
The repository upgrade automatically adds a dependency on the ocaml package (i.e. the compiler) if none are inferred (through ocaml-version translation, etc.). This is a nuisance if running opam admin upgrade for a second time (e.g. because some older package definitions have been imported) where you have packages which intentionally do not depend on the compiler. Process tweaked so that if the opam file already has opam-version: 2.0, then the automatic dependency is not added. Signed-off-by: David Allsopp <[email protected]>
rjbou
reviewed
Jun 28, 2019
dra27
force-pushed
the
random-bits
branch
3 times, most recently
from
5e4798f
to
f9b0656
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Shedding the weight of some simpler commits:
opam-admin.top- prior to Jbuilder, this was built usingocamlmktop. I converted this badly, because the existing code now works as a toplevel, but you can't run a script by having#!opam-admin.toporopam-admin.top foo.ml. The commit generates thelet _ = Topmain.main ()in a second file which is used to createopam-admin.topand the actualopam_admin_top.mlis now used to generate a library. This means that scripts have two choices - you can either#require "opam-admin.top"in your script, or you can run an.mlfile withopam_admin_top(although you needopam_admin_top.cmiin the same directory as your script).%{exe}%does exactly what it says on the tin. The main reason for making it a global is to standardise the name used (so there's no temptation for%{ext_exe}%, etc. This extension is intentionally blank on Cygwin because Cygwin has its own official handling for automatically adding.exe.ocamldependency kept getting re-added after I'd manually removed it... this legacy commit doesn't do that if theopam-versionof the file is already2.0. The principle may be useful in the future...opam admin upgradewas an attempt to download URLs using their filename. Fine for a lot of things, but troublesome on Windows when you start having?characters, etc., so this patch downloads patches and other referenced files using a safe filename (it's only to compute their checksums).sys-ocaml-arch,sys-ocaml-libcandsys-ocaml-ccto allow accurate selection of the system compiler on Windows (this may prove unnecessary with the other work we've been looking into on switch parameters, but I don't think these variables would ever do any harm in future).