Skip to content
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

Support Microsoft CL.EXE compiler #137

Merged
merged 7 commits into from
Feb 22, 2024
Merged

Support Microsoft CL.EXE compiler #137

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d086ab2
Support Microsoft CL.EXE compiler
jonahbeckford Aug 26, 2021
f9075a4
MSVC fix for rng/unix/mc_getrandom_stubs
jonahbeckford Aug 27, 2021
d475557
MSVC fix for ec/native
jonahbeckford Aug 27, 2021
4f236b3
Merge branch 'main' into main
jonahbeckford Feb 9, 2024
b5b1c91
ci: Remove mirage-crypto-pk on Windows MSVC
jonahbeckford Feb 9, 2024
18c4ced
MSVC feedback responses
jonahbeckford Feb 16, 2024
ae4d82e
Update config/cfg.ml
jonahbeckford Feb 21, 2024
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: 3 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
*.ml linguist-language=OCaml

# Shell scripts are required to be LF
*.sh text eol=lf

# https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_character_encoding?view=powershell-7.1
*.ps1 text working-tree-encoding=UTF-16 eol=crlf
*.psm1 text working-tree-encoding=UTF-16 eol=crlf
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dkml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
workflow_dispatch:

jobs:
build:
build:
jonahbeckford marked this conversation as resolved.
Show resolved Hide resolved
strategy:
matrix:
include: #
Expand Down
24 changes: 20 additions & 4 deletions ci/build-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,23 @@ opamrun exec -- ocamlc -config
# Update
opamrun update

# Make your own build logic!
opamrun install --yes --deps-only -t mirage-crypto mirage-crypto-rng mirage-crypto-rng-lwt mirage-crypto-rng-mirage mirage-crypto-pk mirage-crypto-ec
opamrun exec -- dune build -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-lwt,mirage-crypto-rng-mirage,mirage-crypto-pk,mirage-crypto-ec
opamrun exec -- dune runtest -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-lwt,mirage-crypto-rng-mirage,mirage-crypto-pk,mirage-crypto-ec
# Build logic
# 2024-02-09: Remove mirage-crypto-pk on Windows since no portable GMP library (used by Zarith).
# mirage-crypto-ec has a test dependency on mirage-crypto-pk.
packages_INSTALL="mirage-crypto mirage-crypto-rng mirage-crypto-rng-lwt mirage-crypto-rng-mirage"
packages_BUILD_TOPOLOGICALSORT="mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-lwt,mirage-crypto-rng-mirage"
packages_TEST_TOPOLOGICALSORT="mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-lwt,mirage-crypto-rng-mirage"
case "$dkml_host_abi" in
windows_*)
packages_INSTALL="$packages_INSTALL mirage-crypto-ec"
packages_BUILD_TOPOLOGICALSORT="$packages_BUILD_TOPOLOGICALSORT,mirage-crypto-ec"
hannesm marked this conversation as resolved.
Show resolved Hide resolved
;;
*)
packages_INSTALL="$packages_INSTALL mirage-crypto-pk mirage-crypto-ec"
packages_BUILD_TOPOLOGICALSORT="$packages_BUILD_TOPOLOGICALSORT,mirage-crypto-pk,mirage-crypto-ec"
packages_TEST_TOPOLOGICALSORT="$packages_TEST_TOPOLOGICALSORT,mirage-crypto-pk,mirage-crypto-ec"
esac
# shellcheck disable=SC2086
opamrun install --yes --deps-only --with-test $packages_INSTALL
opamrun exec -- dune build -p "$packages_BUILD_TOPOLOGICALSORT"
opamrun exec -- dune runtest -p "$packages_TEST_TOPOLOGICALSORT"
Loading