From 05d3603baf1b58de3476c47f3da567af0bf6ff15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin@tarides.com>
Date: Thu, 23 Nov 2023 10:35:57 +0100
Subject: [PATCH 1/2] Update AppVeyor scripts

- VS 2022
- OCaml 5.1
- FlexDLL 0.43
---
 appveyor.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index aa89a11..90b5c06 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,7 @@ environment:
     CYG_CACHE: C:/cygwin64/var/cache/setup
     OCAML_PORT: msvc64
     ARTEFACTS: no
+    FLEXDLL_VERSION: 0.43
   matrix:
     - OCAMLBRANCH: 3.11
     - OCAMLBRANCH: 3.12
@@ -36,6 +37,8 @@ environment:
       SKIP_OCAML_TEST: no
     - OCAMLBRANCH: 5.0
       OCAML_PORT: mingw64
+    - OCAMLBRANCH: 5.1
+      OCAML_PORT: mingw64
       SKIP_OCAML_TEST: no
     - OCAMLBRANCH: trunk
       OCAML_PORT: mingw64
@@ -56,8 +59,8 @@ install:
   - '%CYG_ROOT%\bin\bash -lc "zip --version" > nul || "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --upgrade-also > nul'
   - '%CYG_ROOT%\bin\bash -lc "cygcheck -dc cygwin"'
   - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
-  - appveyor DownloadFile "https://github.com/alainfrisch/flexdll/archive/0.37.tar.gz" -FileName "flexdll.tar.gz"
-  - appveyor DownloadFile "https://github.com/alainfrisch/flexdll/releases/download/0.37/flexdll-bin-0.37.zip" -FileName "flexdll.zip"
+  - appveyor DownloadFile "https://github.com/ocaml/flexdll/archive/%FLEXDLL_VERSION%.tar.gz" -FileName "flexdll.tar.gz"
+  - appveyor DownloadFile "https://github.com/ocaml/flexdll/releases/download/%FLEXDLL_VERSION%/flexdll-bin-%FLEXDLL_VERSION%.zip" -FileName "flexdll.zip"
   - appveyor DownloadFile "https://raw.githubusercontent.com/ocaml/ocaml/trunk/tools/msvs-promote-path" -FileName "msvs-promote-path"
 
 build_script:

From e4b68ea451177b4251e1aba6360e038eccdd35d9 Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Thu, 23 Nov 2023 18:41:13 +0000
Subject: [PATCH 2/2] Fix trunk build

Presently an upstream issue with building ocamltest with the Unix
library disabled.
---
 appveyor_build.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/appveyor_build.sh b/appveyor_build.sh
index 371be39..27a82a6 100755
--- a/appveyor_build.sh
+++ b/appveyor_build.sh
@@ -33,6 +33,7 @@ function configure_ocaml {
                     --disable-unix-lib \
                     --disable-bigarray-lib \
                     $GRAPHICS_DISABLE \
+                    $OCAMLTEST_DISABLE \
                     --disable-debug-runtime
     else
       # "Classic" configuration
@@ -93,6 +94,7 @@ esac
 MAKEOCAML=make
 CONFIG_DIR=config
 GRAPHICS_DISABLE=
+OCAMLTEST_DISABLE=--disable-ocamltest
 HEADER_DIR=
 FLEXDLL_BOOTSTRAP_WORKS=1
 
@@ -105,9 +107,13 @@ case $OCAML_RELEASE in
   406|407)
     HEADER_DIR=byterun/caml;;
   408)
+    OCAMLTEST_DISABLE=''
     GRAPHICS_DISABLE=--disable-graph-lib
     FLEXDLL_BOOTSTRAP_WORKS=0;;
-  409|410|411|412)
+  409|410)
+    OCAMLTEST_DISABLE=''
+    FLEXDLL_BOOTSTRAP_WORKS=0;;
+  411|412)
     FLEXDLL_BOOTSTRAP_WORKS=0;;
 esac