diff options
| author | Martin Matuska <martin@matuska.org> | 2020-02-26 00:09:27 +0100 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2020-02-26 00:56:13 +0100 |
| commit | 235c0920ef65be389aefd2f53e3cb5b94558ab57 (patch) | |
| tree | a1224a14c3685e8d3bb71a70d3f280b0e89bbfd7 /build | |
| parent | 25fc8895060e8cfc602a65edb8e5a2e84611f3a7 (diff) | |
| download | libarchive-235c0920ef65be389aefd2f53e3cb5b94558ab57.tar.gz | |
CI: use static CMake build of liblzma
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ci/github_actions/ci.cmd | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/build/ci/github_actions/ci.cmd b/build/ci/github_actions/ci.cmd index f86af590..7f6ee00d 100755 --- a/build/ci/github_actions/ci.cmd +++ b/build/ci/github_actions/ci.cmd @@ -1,7 +1,7 @@ @ECHO OFF SET ZLIB_VERSION=1.2.11 SET BZIP2_VERSION=b7a672291188a6469f71dd13ad14f2f9a7344fc8 -SET XZ_VERSION=5.2.4 +SET XZ_VERSION=292a5c0f9c9b3a66f5a5c652dc46381836d4537f IF NOT "%BE%"=="mingw-gcc" ( IF NOT "%BE%"=="msvc" ( ECHO Environment variable BE must be mingw-gcc or msvc @@ -35,14 +35,13 @@ IF "%1"=="deplibs" ( echo Unpacking bzip2-%BZIP2_VERSION%.zip tar -x -f bzip2-%BZIP2_VERSION%.zip || EXIT /b 1 ) - IF NOT EXIST xz-%XZ_VERSION%-windows.zip ( - echo Downloading https://tukaani.org/xz/xz-%XZ_VERSION%-windows.zip - curl -L -o xz-%XZ_VERSION%-windows.zip https://tukaani.org/xz/xz-%XZ_VERSION%-windows.zip || EXIT /b 1 + IF NOT EXIST xz-%XZ_VERSION%.zip ( + echo Downloading https://github.com/libarchive/xz/archive/%XZ_VERSION%.zip + curl -L -o xz-%XZ_VERSION%.zip https://github.com/libarchive/xz/archive/%XZ_VERSION%.zip || EXIT /b 1 ) - IF NOT EXIST C:\temp\lib\xz ( - mkdir C:\temp\lib\xz - echo Unpacking xz-%XZ_VERSION%-windows.zip - tar -x -C C:\temp\lib\xz -f xz-%XZ_VERSION%-windows.zip || EXIT /b 1 + IF NOT EXIST xz-%XZ_VERSION% ( + echo Unpacking xz-%XZ_VERSION%.zip + tar -x -f xz-%XZ_VERSION%.zip || EXIT /b 1 ) CD zlib-%ZLIB_VERSION% IF "%BE%"=="mingw-gcc" ( @@ -72,16 +71,27 @@ IF "%1"=="deplibs" ( 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 || EXIT /b 1 + mingw32-make install || EXIT /b 1 + ) ELSE IF "%BE%"=="msvc" ( + cmake -G "Visual Studio 16 2019" -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.a" -D BZIP2_INCLUDE_DIR="C:/Program Files (x86)/bzip2/include" -D LIBLZMA_LIBRARY="C:/temp/lib/xz/bin_x86-64/liblzma.a" -D LIBLZMA_INCLUDE_DIR="C:/temp/lib/xz/include" ..\.. || EXIT /b 1 + 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.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" ..\.. || EXIT /b 1 ) ELSE IF "%BE%"=="msvc" ( MKDIR build_ci\cmake CD build_ci\cmake - cmake -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE="Release" -D ZLIB_LIBRARY="C:/Program Files (x86)/zlib/lib/zlibstatic.lib" -D ZLIB_INCLUDE_DIR="C:/Program Files (x86)/zlib/include" -D BZIP2_LIBRARIES="C:/Program Files (x86)/bzip2/lib/bz2.lib" -D BZIP2_INCLUDE_DIR="C:/Program Files (x86)/bzip2/include" -D LIBLZMA_LIBRARY="C:/temp/lib/xz/bin_x86-64/liblzma.a" -D LIBLZMA_INCLUDE_DIR="C:/temp/lib/xz/include" ..\.. || EXIT /b 1 + cmake -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE="Release" -D ZLIB_LIBRARY="C:/Program Files (x86)/zlib/lib/zlibstatic.lib" -D ZLIB_INCLUDE_DIR="C:/Program Files (x86)/zlib/include" -D BZIP2_LIBRARIES="C:/Program Files (x86)/bzip2/lib/bz2.lib" -D BZIP2_INCLUDE_DIR="C:/Program Files (x86)/bzip2/include" -D LIBLZMA_LIBRARY="C:/Program Files (x86)/xz/lib/liblzma.lib" -D LIBLZMA_INCLUDE_DIR="C:/Program Files (x86)/xz/include" ..\.. || EXIT /b 1 ) ) ELSE IF "%1%"=="build" ( IF "%BE%"=="mingw-gcc" ( |