Windows bootstrap #3155
Merged
Windows bootstrap #3155
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
dra27
force-pushed
the
windows-bootstrap
branch
from
212da1b to
c32255a
Compare
|
Very nice, thanks! Do you think we should merge as-is, or wait for the releases of mccs and "dune" (and possibly FlexDLL) ? |
|
The 4.06 changes should go in first and I'll then rebase this for 4.06 (I've already tested it with 4.06). I would say this can then be merged - the jbuilder and ocaml-mccs changes are just awaiting releases and the flexdll change only affects one set of Windows ports, not all three sets, so it's all usable work even without the patch. |
Since beta15, jbuilder no longer permits subdirectories in jbuild-ignore files so the sub-directory ones are split off to separate files. Signed-off-by: David Allsopp <david.allsopp@metastack.com>
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
Causing innocuous error message on AppVeyor (conflict with Git's link command)
Allow configure to detect cl from a Windows SDK or Visual Studio installation, even if cl.exe isn't in the PATH. Simplifies the launching of bash for multiple compiler architectures as PATH doesn't require manual editing.
Updates the bootstrap script to build any of the four Windows ports. On non-Windows OSes, no change in behaviour. On Windows, the variable OCAML_PORT will control which native Windows port is built - mingw64, mingw, msvc64 and msvc. If Cygwin's gcc is installed (not recommended when building for native Windows) then OCAML_PORT must be specified, as make cold will build the Cygwin version of OPAM. OCAML_PORT=auto causes the script to auto-detect available compilers in the order given above. Bootstrap compiler also bumped to 4.04.2
Split the cold Makefile target into compiler and cold. Allows a compiler to be bootstrapped before running configure. configure updated so that if the boot strap has been built, PATH is altered to use it. The change is persisted in Makefile.config, along with OCAMLLIB.
Archives downloaded by shell/bootstrap-ocaml.sh may be placed in src_ext/archives and will be cp'd if they exist (as for make lib-ext).
dra27
force-pushed
the
windows-bootstrap
branch
from
c32255a to
b62a7d5
Compare
|
Hopefully correctly rebased for 4.06 - let's see what AppVeyor thinks! |
dra27
force-pushed
the
windows-bootstrap
branch
from
b62a7d5 to
91b10b2
Compare
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
- Need unreleased ocaml-mccs 1.1+5 to build mccs on Windows. - Need unreleased jbuilder beta17 to build mccs on MSVC. - Need unreleased flexdll 0.38 to build mccs on mingw. Signed-off-by: David Allsopp <david.allsopp@metastack.com>
dra27
force-pushed
the
windows-bootstrap
branch
from
91b10b2 to
2a54a90
Compare
Closed
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.
This pull request primarily adds support for Windows to the opam bootstrap scripts and uses these to extend AppVeyor testing to all six Windows ports. The Cygwin ports are switched to use the bootstrap compiler rather than the Cygwin-installed ocaml package.
There are a few minor tweaks included on the way:
jbuild-ignorefiles can no longer contain subdirectories (see Display a warning for bad jbuild-ignore lines dune#389). As it happens, generatingsrc_ext/jbuild-ignoreis helpful for another pull request due to land...MCCS_DISABLEDtoMCCS_ENABLEDthere was a definite need for it, but either way - "if not disabled then do stuff" conditions do read oddly in the Makefile versus "if enabled then do stuff", so I've left it!shell/check_linker(for MSVC building) as I discovered during AppVeyor testing that you get some irritating stderr junk from Git's link command.The major stuff...
Automatic detection of Microsoft Visual Studio
This utilises my MSVS Tools package and means that you don't need to start Cygwin from within a Visual Studio Command Prompt to build an MSVC OCaml. The motivation for this becomes apparent in the full Windows port, since opam needs both a 32-bit and a 64-bit compiler and sadly no one ever told Microsoft about compiler triples...
make coldupdatesWindows support is added for
make cold- it's necessary to be able to specify which port you want built, which is either inferred automatically or specified using theOCAML_PORTvariable passed tomake. The script becomes quite a bit longer since it also supports automatic detection of the Microsoft C compiler, and the Windows ports of OCaml lack a configure script and need FlexDLL to be extracted.The configure script is enhanced so that if a bootstrap compiler has been built then configure always uses it. This means you can develop opam using a bootstrap compiler, which has been quite handy for doing the Windows ports.
The final tweak to the
make coldprocess is that it also supports being run "offline" which meant moving the location of the OCaml and FlexDLL tarballs tosrc_ext/MakefileAppVeyor
I've transferred over some of the scripts I did for OCaml's AppVeyor runs which reduces the time spent in Cygwin setup. Various notes on this:
opam initand installation offindlibis only done on Cygwin, since it won't work on native Windows without more patches (which will follow very, very soon...)make cold(or, rather, the newmake compiler) is used to get OCaml (for uniformity, this is done for the Cygwin ports, rather than using Cygwin-packaged OCaml). The bootstrap folder (and also the src_ext archives) are cached, so each build only takes a couple of minutes, unless the OCaml version has been bumped.Compilation on native Windows is dependent on three external patches which are at present applied using appveyor.patch: