diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-03-08 15:26:40 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-03-08 18:32:06 +0100 |
| commit | 09a36ad62bfa787642778b8076ae5b4ba4a64fcc (patch) | |
| tree | 5d9984bce31784cb83305ab20361e2dc9a20793a | |
| parent | 6b114684c2414d224de4bc49c4849ab641491bf4 (diff) | |
| download | qpdf-10.6.tar.zst | |
Run Windows build on Windows 2022 runnerrelease-qpdf-10.6.310.6
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | build-scripts/build-windows | 6 | ||||
| -rw-r--r-- | build-scripts/build-windows.bat | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6375cf92..2bc5d217 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,7 @@ jobs: name: distribution path: distribution Windows: - runs-on: windows-2019 + runs-on: windows-latest needs: Prebuild strategy: fail-fast: false @@ -2,6 +2,11 @@ * 10.6.3: release + * Use Windows 2022 github runners and therefore Visual Studio 2022 + to create Windows distributions + + * Fix DLL export issue with mingw (Windows) + 2022-03-07 Jay Berkenbilt <ejb@ql.org> * Minor internal changes to assist with building in other diff --git a/build-scripts/build-windows b/build-scripts/build-windows index 81543668..e08b653e 100755 --- a/build-scripts/build-windows +++ b/build-scripts/build-windows @@ -6,16 +6,14 @@ tool=$2 if [[ $tool == mingw ]]; then pacman -Sy --noconfirm make base-devel tar zip unzip - if [ -d /c/msys64 ]; then - PATH="/c/msys64/mingw$wordsize/bin:$PATH" - else + if [ ! -x /c/msys64/mingw$wordsize/bin/g++.exe ]; then 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 + PATH="/c/msys64/mingw$wordsize/bin:$PATH" g++ -v elif [[ $tool == msvc ]]; then cl diff --git a/build-scripts/build-windows.bat b/build-scripts/build-windows.bat index 0f81ebf3..e82e0f71 100644 --- a/build-scripts/build-windows.bat +++ b/build-scripts/build-windows.bat @@ -3,9 +3,9 @@ setlocal ENABLEDELAYEDEXPANSION if %2 == msvc ( if %1 == 64 ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" ) else ( - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat" ) choco install zip bash ./build-scripts/build-windows %1 %2 |