appveyor: Also build against newer OpenSSL versions
authorTobias Brunner <tobias@strongswan.org>
Tue, 26 Jan 2021 09:25:03 +0000 (10:25 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 27 Jan 2021 15:32:43 +0000 (16:32 +0100)
The original version is 1.0.2, which we keep as that version is not in
use on other platforms anymore.

.appveyor.yml
scripts/test.sh

index d003680..453a1bf 100644 (file)
@@ -22,6 +22,12 @@ install:
   - set MSYS_SH=C:\msys%BITS%\usr\bin\sh.exe
   - set MSYSTEM=MINGW%BITS%
   - set TEST=win%BITS%
+  - |
+      set IMG=%APPVEYOR_BUILD_WORKER_IMAGE:~-4%
+      set OPENSSL=OpenSSL
+      IF "%IMG%" == "2017" set OPENSSL=OpenSSL-v11
+      IF "%IMG%" == "2019" set OPENSSL=OpenSSL-v111
+      set OPENSSL_DIR=/c/%OPENSSL%-%TEST%
 
 build_script:
   - '%MSYS_SH% --login -c ". /etc/profile && cd $APPVEYOR_BUILD_FOLDER && ./scripts/test.sh deps"'
index 406ed1b..0966dfc 100755 (executable)
@@ -184,8 +184,8 @@ win*)
                TARGET=
        else
                CONFIG="$CONFIG --enable-openssl"
-               CFLAGS="$CFLAGS -I/c/OpenSSL-$TEST/include"
-               LDFLAGS="-L/c/OpenSSL-$TEST"
+               CFLAGS="$CFLAGS -I$OPENSSL_DIR/include"
+               LDFLAGS="-L$OPENSSL_DIR"
                export LDFLAGS
        fi
        CFLAGS="$CFLAGS -mno-ms-bitfields"