octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 10:58:58 +00:00
Code Issues Releases Wiki Activity

Run Windows build on Windows 2022 runner

Browse Source
This commit is contained in:
Jay Berkenbilt 2022-03-08 09:26:40 -05:00
parent 6b114684c2
commit 09a36ad62b
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -54,7 +54,7 @@ jobs:
name: distribution
path: distribution
Windows:
runs-on: windows-2019
runs-on: windows-latest
needs: Prebuild
strategy:
fail-fast: false

5
ChangeLog
View File

@ -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

6
build-scripts/build-windows
View File

@ -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

4
build-scripts/build-windows.bat
View File

@ -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