support for msys2 CI under AppVeyor

Author: vsoftco

.appveyor/appveyor_build.bat

@@ -0,0 +1,34 @@
+@echo off
+IF %COMPILER%==msvc2019 (
+    @echo on
+    CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+    cd %APPVEYOR_BUILD_FOLDER%
+    mkdir build
+    cd build
+    cmake .. -DLIBOQS_INCLUDE_DIR="C:\%LIBOQS_INCLUDE_DIR%" -DLIBOQS_LIB_DIR="C:\%LIBOQS_LIB_DIR%"
+    msbuild -verbosity:minimal oqs_cpp.sln
+    cd ../unit_tests
+    mkdir build
+    cd build
+    cmake .. -DLIBOQS_INCLUDE_DIR="C:\%LIBOQS_INCLUDE_DIR%" -DLIBOQS_LIB_DIR="C:\%LIBOQS_LIB_DIR%"
+    msbuild -verbosity:minimal oqs_cpp_testing.sln
+    %APPVEYOR_BUILD_FOLDER%\build\Debug\kem.exe
+    %APPVEYOR_BUILD_FOLDER%\build\Debug\rand.exe
+    %APPVEYOR_BUILD_FOLDER%\build\Debug\sig.exe
+)
+IF %COMPILER%==msys2 (
+    @echo on
+    SET "PATH=C:\msys64\mingw64\bin;%PATH%"
+    cd %APPVEYOR_BUILD_FOLDER%
+    bash -lc 'ls /c/%LIBOQS_INCLUDE_DIR%'
+    mkdir build
+    cd build
+    bash -lc "cmake ..  -DLIBOQS_INCLUDE_DIR=/c/%LIBOQS_INCLUDE_DIR% -DLIBOQS_LIB_DIR=/c/%LIBOQS_LIB_DIR% -GNinja && ninja"
+    cd ../unit_tests 
+    mkdir build 
+    cd build
+    bash -lc "cmake ..  -DLIBOQS_INCLUDE_DIR=/c/%LIBOQS_INCLUDE_DIR% -DLIBOQS_LIB_DIR=/c/%LIBOQS_LIB_DIR% -GNinja && ninja"
+    %APPVEYOR_BUILD_FOLDER%\build\kem.exe
+    %APPVEYOR_BUILD_FOLDER%\build\rand.exe
+    %APPVEYOR_BUILD_FOLDER%\build\sig.exe
+)

.appveyor/appveyor_test.bat

@@ -0,0 +1,7 @@
+@echo off
+IF %COMPILER%==msvc2019 (
+    %APPVEYOR_BUILD_FOLDER%\unit_tests\build\tests\Debug\oqs_cpp_testing.exe
+)
+IF %COMPILER%==msys2 (
+    %APPVEYOR_BUILD_FOLDER%\unit_tests\build\tests\oqs_cpp_testing.exe
+)

README.md

@@ -47,7 +47,13 @@ The examples in the [`examples`](https://github.com/open-quantum-safe/liboqs-cpp
 Building on POSIX (Linux/UNIX-like) platforms
 ---------------------------------------------
 
-First, you must build the master branch of liboqs according to the [liboqs building instructions](https://github.com/open-quantum-safe/liboqs#linuxmacos) with shared library support enabled (add `-DBUILD_SHARED_LIBS=ON` to the `cmake` command), followed (optionally) by a `sudo ninja install` to ensure that the compiled library is visible system-wide (by default it installs under `/usr/local/include` and `/usr/local/lib` on Linux/macOS).
+First, you must build the master branch of liboqs according to the [liboqs building instructions](https://github.com/open-quantum-safe/liboqs#linuxmacos) with shared library support enabled (add `-DBUILD_SHARED_LIBS=ON` to the `cmake` command), followed (optionally) by a `sudo ninja install` to ensure that the shared library is visible system-wide (by default it installs under `/usr/local/include` and `/usr/local/lib` on Linux/macOS). 
+
+You may need to set the `LD_LIBRARY_PATH` (`DYLD_LIBRARY_PATH` on macOS) environment variable to point to the path to liboqs' library directory, e.g.
+
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+
+assuming `liboqs.so.*` were installed in `/usr/local/lib` (true if you ran `sudo ninja install` after building liboqs).
 
 Next, to use the wrapper, you simply `#include "oqs_cpp.h"` in your program. The wrapper contains
 a CMake build system for both examples and unit tests. To compile and run the examples, create a `build` directory inside the root directory of the project, change
@@ -73,11 +79,13 @@ The above commands build `tests/oqs_cpp_testing` suite of unit tests. Again you
 Building on Windows
 -------------------
 
-We provide CMake support for Visual Studio. We recommend using Visual Studio 2017 or later (preferably Visual Studio 2019). For comprehensive details about using CMake with Visual Studio please read [this page](https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=vs-2019).
-
----
+We provide CMake support for Visual Studio. We recommend using Visual Studio 2017 or later (preferably Visual Studio 2019). For comprehensive details about using CMake with Visual Studio please read [this page](https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=vs-2019). 
 
-Note: in case you built `liboqs` as a shared library, add the directory that contains `oqs.dll` (e.g. `C:\Users\yourusername\Documents\GitHub\liboqs\build\bin`) to the `PATH` environment variable.
+Ensure that the liboqs shared library `oqs.dll` is visible system-wide. Use the "Edit the system environment variables" Control Panel tool or type in a Command Prompt
+	
+	set PATH="%PATH%;C:\some\dir\liboqs\build\bin"
+	
+of course replacing the paths with the ones corresponding to your system.
 
 Documentation
 -------------

appveyor.yml

@@ -7,41 +7,26 @@ platform: x64
 environment:
   LIBOQS_INSTALL_PATH: C:\liboqs
   LIBOQS_BUILD_DIR: C:\liboqs\build
-  LIBOQS_INCLUDE_DIR: C:\liboqs\build\include
-  LIBOQS_LIB_DIR: C:\liboqs\build\lib
   LIBOQS_DLL_DIR: C:\liboqs\build\bin
+  LIBOQS_INCLUDE_DIR: liboqs/build/include
+  LIBOQS_LIB_DIR: liboqs/build/lib
+  matrix:
+    - compiler: msvc2019
+    - compiler: msys2
 
-before_build:
+install:
   - cmd: |-
       @echo on
-      set "PATH=C:\Python37;C:\Python37\Scripts;%LIBOQS_DLL_DIR%;%PATH%"
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"  
+      set "PATH=%LIBOQS_DLL_DIR%;%PATH%"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
       git clone https://github.com/open-quantum-safe/liboqs %LIBOQS_INSTALL_PATH%
       mkdir %LIBOQS_BUILD_DIR%
       cd %LIBOQS_BUILD_DIR%
-      cmake -DCMAKE_BUILD_TYPE=Optimized .. -G"Ninja" -DBUILD_SHARED_LIBS=ON
+      cmake .. -DCMAKE_BUILD_TYPE=Optimized -DBUILD_SHARED_LIBS=ON -G"Ninja"
       ninja 1> nul
 
 build_script:
-  - cmd: |-
-      cd %APPVEYOR_BUILD_FOLDER%
-      mkdir build
-      cd build
-      cmake -DLIBOQS_INCLUDE_DIR=%LIBOQS_INCLUDE_DIR% -DLIBOQS_LIB_DIR=%LIBOQS_LIB_DIR% ..
-      msbuild -verbosity:minimal oqs_cpp.sln
-      %APPVEYOR_BUILD_FOLDER%\build\Debug\kem.exe
-      %APPVEYOR_BUILD_FOLDER%\build\Debug\rand.exe
-      %APPVEYOR_BUILD_FOLDER%\build\Debug\sig.exe
-
-before_test:
-  - cmd: |-
-      cd %APPVEYOR_BUILD_FOLDER%\unit_tests
-      mkdir build
-      cd build
-      cmake -DLIBOQS_INCLUDE_DIR=%LIBOQS_INCLUDE_DIR% -DLIBOQS_LIB_DIR=%LIBOQS_LIB_DIR% ..
-      msbuild -verbosity:minimal oqs_cpp_testing.sln
-        
+  - cmd: '%APPVEYOR_BUILD_FOLDER%\.appveyor\appveyor_build.bat'
 
 test_script:
-  - cmd: |-
-      %APPVEYOR_BUILD_FOLDER%\unit_tests\build\tests\Debug\oqs_cpp_testing.exe
+  - cmd: '%APPVEYOR_BUILD_FOLDER%\.appveyor\appveyor_test.bat'