File tree Expand file tree Collapse file tree 4 files changed +20
-1
lines changed Expand file tree Collapse file tree 4 files changed +20
-1
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,9 @@ SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
1919IF %SDK% == MSVC2019 (
2020SET WindowsTargetPlatformVersion = %WindowsSDKVersion%
2121)
22+ IF %SDK% == MSVC2022 (
23+ SET WindowsTargetPlatformVersion = %WindowsSDKVersion%
24+ )
2225
2326rem GOTO :BUILD_ICONV
2427rem GOTO :BUILD_ICU
Original file line number Diff line number Diff line change @@ -39,6 +39,11 @@ cp "%VCToolsRedistDir%vc_redist.x86.exe" "%BUILD_DIR%\vcredist\vcredist_x86_2019
3939cp " %VCToolsRedistDir% vc_redist.x64.exe" " %BUILD_DIR% \vcredist\vcredist_x64_2019.exe"
4040)
4141
42+ IF %REDIST_YEAR% == 2022 (
43+ cp " %VCToolsRedistDir% vc_redist.x86.exe" " %BUILD_DIR% \vcredist\vcredist_x86_2022.exe"
44+ cp " %VCToolsRedistDir% vc_redist.x64.exe" " %BUILD_DIR% \vcredist\vcredist_x64_2022.exe"
45+ )
46+
4247REM Make directory for installers
4348MKDIR " %BUILD_DIR% \installers"
4449
Original file line number Diff line number Diff line change @@ -19,7 +19,8 @@ SET PERL64_PATH=C:\Perl64
1919SET PERL32_BIN = %PERL32_PATH% \bin
2020SET PERL64_BIN = %PERL64_PATH% \bin
2121SET PYTHON32_PATH = C:\Python27x86
22- SET PYTHON64_PATH = C:\Python27x64
22+ rem SET PYTHON64_PATH=C:\Python27x64
23+ SET PYTHON64_PATH = C:\Python310
2324SET ZIP_PATH = C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
2425SET NSIS_PATH = C:\Program Files (x86)\NSIS
2526SET MSYS2_PATH = C:\msys64\usr\bin
@@ -77,6 +78,15 @@ IF %SDK% == MSVC2019 (
7778 ECHO ON
7879 IF %ARCH% == X64 call " C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 || GOTO :ERROR
7980)
81+ IF %SDK% == MSVC2022 (
82+ SET ICU_VER = 67_1
83+ SET REDIST_YEAR = 2022
84+ SET PlatformToolset = v143
85+ IF %ARCH% == X86 CALL " C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 || GOTO :ERROR
86+ ECHO ON
87+ IF %ARCH% == X64 call " C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 || GOTO :ERROR
88+ SET PlatformToolset = v143
89+ )
8090
8191rem vcvarsall of VS 2019 rewrite this variable
8292IF %ARCH% == X86 SET Platform = Win32
Original file line number Diff line number Diff line change 44./doc/contrib/README*
55./doc/extension/README*
66./share/locale/*/LC_MESSAGES/pltcl-*.mo
7+ ./bin/corrupt_icu_version.exe
You can’t perform that action at this time.
0 commit comments