Skip to content

Fixes to build and install opam master in Windows #143

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

Merged
MisterDA merged 1 commit into from
Feb 14, 2023
Merged

Fixes to build and install opam master in Windows #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
unreleased
----------

- Build and install opam master from source in Windows images. (@MisterDA #140, #142)
- Build and install opam master from source in Windows images.
(@MisterDA #140, #142, #143)
- Include the ocaml-beta-repository in the images. (@kit-ty-kate #132, review by @MisterDA)
- Add OpenSUSE 15.4, deprecate OpenSUSE 15.3. (@MisterDA #138)
- Update to bubblewrap 0.7.0. (@MisterDA #131)
Expand Down
5 changes: 2 additions & 3 deletions src-opam/opam.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ let install_opam_from_source_windows ?cyg ?prefix
(* Docker doesn't allow copying executables from /usr/local/bin
(why??), so tar the opam installation. *)
@@ Windows.Cygwin.run_sh ?cyg
{|cd /usr/local/bin && tar -cf /cygdrive/c/TEMP/opam.tar .|}
{|cd /usr/local/bin && tar -cf /cygdrive/c/opam.tar .|}

let bubblewrap_minimum = (0, 4, 1)
let bubblewrap_latest = (0, 7, 0)
Expand Down Expand Up @@ -276,8 +276,7 @@ let copy_opams ~src ~dst opam_branches =
(* FIXME: only support building opam master for now *)
let copy_opams_windows = function
| [ { public_name; aliases; _ } ] ->
copy ~from:"opam-builder" ~src:[ {|C:\TEMP\opam.tar|} ] ~dst:{|C:\TEMP\|}
()
copy ~from:"opam-builder" ~src:[ {|C:\opam.tar|} ] ~dst:{|C:\TEMP\|} ()
@@ run
{|C:\cygwin64\bin\tar.exe -xf /cygdrive/c/TEMP/opam.tar -C /usr/local/bin && del C:\TEMP\opam.tar|}
@@ run
Expand Down