build: move library dependencies into mingw install

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e9d6b0768a9c13cff8bcf378973be523fcad00a4..4190a8361f5c9d7fcd0b7149de2c671248977dbc 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -172,6 +172,10 @@ jobs:
           mingw-w64-x86_64-pkgconf
           mingw-w64-x86_64-cmake
           mingw-w64-x86_64-make
+          mingw-w64-x86_64-zlib
+          mingw-w64-x86_64-bzip2
+          mingw-w64-x86_64-xz
+          mingw-w64-x86_64-zstd
     - name: Install library dependencies
       run: ./build/ci/github_actions/ci.cmd deplibs
       shell: cmd

diff --git a/build/ci/github_actions/ci.cmd b/build/ci/github_actions/ci.cmd
index 606965840cc4f5734c55f3c05a48e4c1414168e1..88856ac9bf52f1ab14f80adad50f639ee63d42e7 100755 (executable)
--- a/build/ci/github_actions/ci.cmd
+++ b/build/ci/github_actions/ci.cmd
@@ -26,8 +26,8 @@ IF "%BE%"=="mingw-gcc" (
 )
 
 IF "%1"=="deplibs" (
-  IF "%BE%"=="cygwin-gcc" (
-    ECHO Library dependencies satisfied by Cygwin install
+  IF NOT "%BE%"=="msvc" (
+    ECHO Library dependencies satisfied by Cygwin or MinGW install
     EXIT /b 0
   )
 
@@ -68,62 +68,32 @@ IF "%1"=="deplibs" (
     C:\windows\system32\tar.exe -x -f zstd-%ZSTD_VERSION%.zip || EXIT /b 1
   )
   CD zlib-%ZLIB_VERSION%
-  IF "%BE%"=="mingw-gcc" (
-    SET PATH=%MINGWPATH%
-    cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1
-    mingw32-make -j %NUMBER_OF_PROCESSORS% || EXIT /b 1
-    mingw32-make test || EXIT /b 1
-    mingw32-make install || EXIT /b 1
-  ) ELSE IF "%BE%"=="msvc" (
-    cmake -G "Visual Studio 17 2022" . || EXIT /b 1
-    cmake --build . --target ALL_BUILD --config Release || EXIT /b 1
-    cmake --build . --target RUN_TESTS --config Release || EXIT /b 1
-    cmake --build . --target INSTALL --config Release || EXIT /b 1
-  )
+  cmake -G "Visual Studio 17 2022" . || EXIT /b 1
+  cmake --build . --target ALL_BUILD --config Release || EXIT /b 1
+  cmake --build . --target RUN_TESTS --config Release || EXIT /b 1
+  cmake --build . --target INSTALL --config Release || EXIT /b 1
   CD ..
   CD bzip2-%BZIP2_VERSION%
-  IF "%BE%"=="mingw-gcc" (
-    SET PATH=%MINGWPATH%
-    cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" -D ENABLE_LIB_ONLY=ON -D ENABLE_SHARED_LIB=OFF -D ENABLE_STATIC_LIB=ON . || EXIT /b 1
-    mingw32-make -j %NUMBER_OF_PROCESSORS% || EXIT /b 1
-    REM mingw32-make test || EXIT /b 1
-    mingw32-make install || EXIT /b 1
-  ) ELSE IF "%BE%"=="msvc" (
-    cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" -D ENABLE_LIB_ONLY=ON -D ENABLE_SHARED_LIB=OFF -D ENABLE_STATIC_LIB=ON . || EXIT /b 1
-    cmake --build . --target ALL_BUILD --config Release || EXIT /b 1
-    REM cmake --build . --target RUN_TESTS --config Release || EXIT /b 1
-    cmake --build . --target INSTALL --config Release || EXIT /b 1
-  )
+  cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" -D ENABLE_LIB_ONLY=ON -D ENABLE_SHARED_LIB=OFF -D ENABLE_STATIC_LIB=ON . || EXIT /b 1
+  cmake --build . --target ALL_BUILD --config Release || EXIT /b 1
+  REM cmake --build . --target RUN_TESTS --config Release || EXIT /b 1
+  cmake --build . --target INSTALL --config Release || EXIT /b 1
   CD ..
   CD xz-%XZ_VERSION%
-  IF "%BE%"=="mingw-gcc" (
-    SET PATH=%MINGWPATH%
-    cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1
-    mingw32-make -j %NUMBER_OF_PROCESSORS% || EXIT /b 1
-    mingw32-make install || EXIT /b 1
-  ) ELSE IF "%BE%"=="msvc" (
-    cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1
-    cmake --build . --target ALL_BUILD --config Release || EXIT /b 1
-    cmake --build . --target INSTALL --config Release || EXIT /b 1
-  )
+  cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1
+  cmake --build . --target ALL_BUILD --config Release || EXIT /b 1
+  cmake --build . --target INSTALL --config Release || EXIT /b 1
   CD ..
   CD zstd-%ZSTD_VERSION%\build\cmake
-  IF "%BE%"=="mingw-gcc" (
-    SET PATH=%MINGWPATH%
-    cmake -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1
-    mingw32-make -j %NUMBER_OF_PROCESSORS% || EXIT /b 1
-    mingw32-make install || EXIT /b 1
-  ) ELSE IF "%BE%"=="msvc" (
-    cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1
-    cmake --build . --target ALL_BUILD --config Release || EXIT /b 1
-    cmake --build . --target INSTALL --config Release || EXIT /b 1
-  )
+  cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1
+  cmake --build . --target ALL_BUILD --config Release || EXIT /b 1
+  cmake --build . --target INSTALL --config Release || EXIT /b 1
 ) ELSE IF "%1%"=="configure" (
   IF "%BE%"=="mingw-gcc" (
     SET PATH=%MINGWPATH%
     MKDIR build_ci\cmake
     CD build_ci\cmake
-    cmake -G "MinGW Makefiles" -D ZLIB_LIBRARY="C:/Program Files (x86)/zlib/lib/libzlibstatic.a" -D ZLIB_INCLUDE_DIR="C:/Program Files (x86)/zlib/include" -D BZIP2_LIBRARIES="C:/Program Files (x86)/bzip2/lib/libbz2_static.a" -D BZIP2_INCLUDE_DIR="C:/Program Files (x86)/bzip2/include" -D LIBLZMA_LIBRARY="C:/Program Files (x86)/xz/lib/liblzma.a" -D LIBLZMA_INCLUDE_DIR="C:/Program Files (x86)/xz/include" -D ZSTD_LIBRARY="C:/Program Files (x86)/zstd/lib/libzstd.a" -D ZSTD_INCLUDE_DIR="C:/Program Files (x86)/zstd/include" ..\.. || EXIT /b 1
+    cmake -G "MinGW Makefiles" ..\.. || EXIT /b 1
   ) ELSE IF "%BE%"=="msvc" (
     MKDIR build_ci\cmake
     CD build_ci\cmake