walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

release-windows.yml: use windows-2022 (#3939)

This commit is contained in:
Oliver Stöneberg 2022-05-13 19:48:17 +02:00 committed by GitHub
parent 52f507d1fb
commit fffb03a242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/release-windows.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
build:
runs-on: windows-2019
runs-on: windows-2022
env:
# see https://www.pcre.org/original/changelog.txt
@ -49,7 +49,7 @@ jobs:
run: |
7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
cmake . -G "Visual Studio 16 2019" -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF || exit /b !errorlevel!
cmake . -G "Visual Studio 17 2022" -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF || exit /b !errorlevel!
msbuild -m PCRE.sln -p:Configuration=Release -p:Platform=x64 || exit /b !errorlevel!
copy pcre.h ..\externals || exit /b !errorlevel!
copy Release\pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!

4
win_installer/config.wxi
View File

@ -10,10 +10,10 @@
<?define QtDllDir = "files" ?>
<?if $(var.Platform) = x64 ?>
<?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x64.msm" ?>
<?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
<?else?>
<?define CrtMergeModule = "$(env.VCToolsRedistDir)\MergeModules\Microsoft_VC142_CRT_x86.msm" ?>
<?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x86.msm" ?>
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?endif?>
</Include>

2
win_installer/readme.txt
View File

@ -32,7 +32,7 @@ Before building the installer make sure all the components are build:
And that runtime files are available:
- Qt runtimes:
Qt5Core.dll, Qt5PrintSupport.dll, Qt5Widgets.dll, Qt5Gui.dll and platforms/qwindows.dll
- MS CRT merge module (Microsoft_VC140_CRT_x86.msm or Microsoft_VC140_CRT_x64.msm)
- MS CRT merge module (Microsoft_VC143_CRT_x86.msm or Microsoft_VC143_CRT_x64.msm)
Build installer by giving this command line in VS command prompt (or run
vcvars32.bat in DOS prompt first to setup environment):