Prepared for VS2022 build

VictorSpirin · VictorSpirin · commit 01c075bdc5ec · 2021-12-29T14:41:20.000+03:00
diff --git a/build/helpers/dependencies.cmd b/build/helpers/dependencies.cmd
@@ -19,6 +19,9 @@ SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
 IF %SDK% == MSVC2019 (
 SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
 )
+IF %SDK% == MSVC2022 (
+SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
+)
 
 rem GOTO :BUILD_ICONV
 rem GOTO :BUILD_ICU
diff --git a/build/helpers/postgres_installer.cmd b/build/helpers/postgres_installer.cmd
@@ -39,6 +39,11 @@ cp "%VCToolsRedistDir%vc_redist.x86.exe" "%BUILD_DIR%\vcredist\vcredist_x86_2019
 cp "%VCToolsRedistDir%vc_redist.x64.exe" "%BUILD_DIR%\vcredist\vcredist_x64_2019.exe"
 )
 
+IF %REDIST_YEAR% == 2022 (
+cp "%VCToolsRedistDir%vc_redist.x86.exe" "%BUILD_DIR%\vcredist\vcredist_x86_2022.exe"
+cp "%VCToolsRedistDir%vc_redist.x64.exe" "%BUILD_DIR%\vcredist\vcredist_x64_2022.exe"
+)
+
 REM Make directory for installers
 MKDIR "%BUILD_DIR%\installers"
 
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -19,7 +19,8 @@ SET PERL64_PATH=C:\Perl64
 SET PERL32_BIN=%PERL32_PATH%\bin
 SET PERL64_BIN=%PERL64_PATH%\bin
 SET PYTHON32_PATH=C:\Python27x86
-SET PYTHON64_PATH=C:\Python27x64
+rem SET PYTHON64_PATH=C:\Python27x64
+SET PYTHON64_PATH=C:\Python310
 SET ZIP_PATH=C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
 SET NSIS_PATH=C:\Program Files (x86)\NSIS
 SET MSYS2_PATH=C:\msys64\usr\bin
@@ -77,6 +78,15 @@ IF %SDK% == MSVC2019 (
   ECHO ON
   IF %ARCH% == X64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 || GOTO :ERROR
 )
+IF %SDK% == MSVC2022 (
+  SET ICU_VER=67_1
+  SET REDIST_YEAR=2022
+  SET PlatformToolset=v143
+  IF %ARCH% == X86 CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 || GOTO :ERROR
+  ECHO ON
+  IF %ARCH% == X64 call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat"  amd64 || GOTO :ERROR
+  SET PlatformToolset=v143
+)
 
 rem vcvarsall of VS 2019 rewrite this variable
 IF %ARCH% == X86 SET Platform=Win32
diff --git a/nsis/unneeded.files b/nsis/unneeded.files
@@ -4,3 +4,4 @@
 ./doc/contrib/README*
 ./doc/extension/README*
 ./share/locale/*/LC_MESSAGES/pltcl-*.mo
+./bin/corrupt_icu_version.exe

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ SET WindowsTargetPlatformVersion=%WindowsSDKVersion%`
`19`	`19`	`IF %SDK% == MSVC2019 (`
`20`	`20`	`SET WindowsTargetPlatformVersion=%WindowsSDKVersion%`
`21`	`21`	`)`
	`22`	`+IF %SDK% == MSVC2022 (`
	`23`	`+SET WindowsTargetPlatformVersion=%WindowsSDKVersion%`
	`24`	`+)`
`22`	`25`
`23`	`26`	`rem GOTO :BUILD_ICONV`
`24`	`27`	`rem GOTO :BUILD_ICU`