From 56d9fe954dd9a3e3372a995ad7fe6552c334f7d5 Mon Sep 17 00:00:00 2001 From: Vesa Karvonen Date: Fri, 21 Jul 2023 14:26:51 +0300 Subject: [PATCH] WIP: Getting MDX tests working on Windows --- .gitattributes | 2 ++ README.md | 7 ++++++- dune | 1 - lib_eio_windows/dune | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a3e24ba82 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# To work around MDX issues +README.md text eol=lf diff --git a/README.md b/README.md index a32e3701d..79826d88e 100644 --- a/README.md +++ b/README.md @@ -752,12 +752,17 @@ Eio.Io Net Connection_failure Refused Unix_error (Connection refused, "connect", ``` If we ran this using another backend, the `Unix_error` part might change. -To avoid this problem, you can use `Eio.Exn.Backend.show` to hide the backend-specific part of errors: +To avoid this problem, you can use `Eio.Exn.Backend.show` ```ocaml # Eio.Exn.Backend.show := false;; - : unit = () +``` + +to hide the backend-specific part of errors: + +```ocaml # Eio_main.run @@ fun env -> let net = Eio.Stdenv.net env in Switch.run @@ fun sw -> diff --git a/dune b/dune index e3e6643d1..60c8c18b0 100644 --- a/dune +++ b/dune @@ -2,5 +2,4 @@ (package eio_main) (deps (package eio_main) (env_var "EIO_BACKEND")) (preludes doc/prelude.ml) - (enabled_if (<> %{os_type} "Win32")) (files README.md)) diff --git a/lib_eio_windows/dune b/lib_eio_windows/dune index cb4d98b69..879134229 100644 --- a/lib_eio_windows/dune +++ b/lib_eio_windows/dune @@ -1,12 +1,13 @@ (library (name eio_windows) (public_name eio_windows) - (library_flags :standard -ccopt -lbcrypt -ccopt -lntdll) + (library_flags :standard -cclib -lbcrypt -cclib -lntdll) (enabled_if (= %{os_type} "Win32")) (foreign_stubs (language c) (include_dirs ../lib_eio/unix/include) (names eio_windows_stubs eio_windows_cstruct_stubs)) + (c_library_flags :standard -lbcrypt -lntdll) (libraries eio eio.unix eio.utils fmt)) (rule