diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2020-10-16 17:29:48 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2020-10-16 20:16:26 +0200 |
| commit | ba17370ff58cb029b36088dac74bacd431be51dc (patch) | |
| tree | d1b22f6c68e6a954ab94964e7eab04ecfee212f1 /build-scripts | |
| parent | 30df7c886c98c21e1e1f99d4294a6dbbe19220c5 (diff) | |
| download | qpdf-ba17370ff58cb029b36088dac74bacd431be51dc.tar.zst | |
Make build-scripts portable for GitHub Actions
Diffstat (limited to 'build-scripts')
| -rwxr-xr-x | build-scripts/build-windows | 13 | ||||
| -rw-r--r-- | build-scripts/build-windows.bat | 12 |
2 files changed, 16 insertions, 9 deletions
diff --git a/build-scripts/build-windows b/build-scripts/build-windows index 9e902e52..2ec6a500 100755 --- a/build-scripts/build-windows +++ b/build-scripts/build-windows @@ -6,12 +6,15 @@ tool=$2 if [[ $tool == mingw ]]; then pacman -Sy --noconfirm make base-devel tar zip unzip - if [[ $wordsize == 64 ]]; then - pacman -Sy --noconfirm mingw-w64-x86_64-toolchain - PATH="/c/tools/msys64/mingw64/bin:$PATH" + if [ -d /c/msys64 ]; then + PATH="/c/msys64/mingw$wordsize/bin:$PATH" else - pacman -Sy --noconfirm mingw-w64-i686-toolchain - PATH="/c/tools/msys64/mingw32/bin:$PATH" + if [[ $wordsize == 64 ]]; then + pacman -Sy --noconfirm mingw-w64-x86_64-toolchain + else + pacman -Sy --noconfirm mingw-w64-i686-toolchain + fi + PATH="/c/tools/msys64/mingw$wordsize/bin:$PATH" fi g++ -v elif [[ $tool == msvc ]]; then diff --git a/build-scripts/build-windows.bat b/build-scripts/build-windows.bat index 8be269e9..0f81ebf3 100644 --- a/build-scripts/build-windows.bat +++ b/build-scripts/build-windows.bat @@ -1,5 +1,6 @@ @echo on @rem Usage: build-windows {32|64} {msvc|mingw} +setlocal ENABLEDELAYEDEXPANSION if %2 == msvc ( if %1 == 64 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" @@ -9,8 +10,11 @@ if %2 == msvc ( choco install zip bash ./build-scripts/build-windows %1 %2 ) else ( - @rem The vs2017-win2016 pool has an ancient 64-bit-only mingw. - @rem Install msys2 so we can get current gcc toolchains. - choco install msys2 - C:\tools\msys64\usr\bin\env.exe MSYSTEM=MINGW64 /bin/bash -l %CD%/build-scripts/build-windows %1 %2 + if exist C:\msys64 ( + set MSYS=C:\msys64 + ) else ( + choco install msys2 + set MSYS=C:\tools\msys64 + ) + !MSYS!\usr\bin\env.exe MSYSTEM=MINGW64 /bin/bash -l %CD%/build-scripts/build-windows %1 %2 ) |