Commit01c075b

committed

Prepared for VS2022 build

1 parente4c603b commit01c075bCopy full SHA for 01c075b

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 3 additions & 0 deletions

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

Lines changed: 5 additions & 0 deletions

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`
`39`	`39`	`cp"%VCToolsRedistDir%vc_redist.x64.exe""%BUILD_DIR%\vcredist\vcredist_x64_2019.exe"`
`40`	`40`	`)`
`41`	`41`
	`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`	`+`
`42`	`47`	`REM Make directory for installers`
`43`	`48`	`MKDIR"%BUILD_DIR%\installers"`
`44`	`49`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ SET PERL64_PATH=C:\Perl64`
`19`	`19`	`SETPERL32_BIN=%PERL32_PATH%\bin`
`20`	`20`	`SETPERL64_BIN=%PERL64_PATH%\bin`
`21`	`21`	`SETPYTHON32_PATH=C:\Python27x86`
`22`		`-SETPYTHON64_PATH=C:\Python27x64`
	`22`	`+rem SET PYTHON64_PATH=C:\Python27x64`
	`23`	`+SETPYTHON64_PATH=C:\Python310`
`23`	`24`	`SETZIP_PATH=C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip`
`24`	`25`	`SETNSIS_PATH=C:\Program Files (x86)\NSIS`
`25`	`26`	`SETMSYS2_PATH=C:\msys64\usr\bin`
`@@ -77,6 +78,15 @@ IF %SDK% == MSVC2019 (`
`77`	`78`	`ECHOON`
`78`	`79`	`IF%ARCH%== X64call"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64\|\|GOTO :ERROR`
`79`	`80`	`)`
	`81`	`+IF%SDK%== MSVC2022 (`
	`82`	`+SETICU_VER=67_1`
	`83`	`+SETREDIST_YEAR=2022`
	`84`	`+SETPlatformToolset=v143`
	`85`	`+IF%ARCH%== X86CALL"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86\|\|GOTO :ERROR`
	`86`	`+ECHOON`
	`87`	`+IF%ARCH%== X64call"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64\|\|GOTO :ERROR`
	`88`	`+SETPlatformToolset=v143`
	`89`	`+)`
`80`	`90`
`81`	`91`	`rem vcvarsall of VS 2019 rewrite this variable`
`82`	`92`	`IF%ARCH%== X86SETPlatform=Win32`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,4 @@`
`4`	`4`	`./doc/contrib/README*`
`5`	`5`	`./doc/extension/README*`
`6`	`6`	`./share/locale//LC_MESSAGES/pltcl-.mo`
	`7`	`+./bin/corrupt_icu_version.exe`

Comments

(0)