diff options
| author | Steve Dower <steve.dower@python.org> | 2023-04-05 16:02:04 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-05 16:02:04 (GMT) |
| commit | decf7a7cb7daf76c7495d95f1bfe07962a1851cb (patch) | |
| tree | 8c79f36c8e3ba218b90f90ee93943ae179b97510 | |
| parent | 18d825be8c74f41e62466638c60d2b663dea03b6 (diff) | |
| download | cpython-decf7a7cb7daf76c7495d95f1bfe07962a1851cb.zip cpython-decf7a7cb7daf76c7495d95f1bfe07962a1851cb.tar.gz cpython-decf7a7cb7daf76c7495d95f1bfe07962a1851cb.tar.bz2 | |
gh-103262: Fixes Windows installer build to work with latest compilers (GH-103281)
| -rw-r--r-- | Misc/NEWS.d/next/Build/2023-04-05-15-59-46.gh-issue-103262.nV83ub.rst | 1 | ||||
| -rw-r--r-- | Tools/msi/bundle/bootstrap/pythonba.vcxproj | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Build/2023-04-05-15-59-46.gh-issue-103262.nV83ub.rst b/Misc/NEWS.d/next/Build/2023-04-05-15-59-46.gh-issue-103262.nV83ub.rst new file mode 100644 index 0000000..d4bb955 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-04-05-15-59-46.gh-issue-103262.nV83ub.rst @@ -0,0 +1 @@ +Fixes Windows installer build to work with latest compilers. diff --git a/Tools/msi/bundle/bootstrap/pythonba.vcxproj b/Tools/msi/bundle/bootstrap/pythonba.vcxproj index e40fb44..8b128f6 100644 --- a/Tools/msi/bundle/bootstrap/pythonba.vcxproj +++ b/Tools/msi/bundle/bootstrap/pythonba.vcxproj @@ -21,6 +21,7 @@ <PropertyGroup Label="Globals"> <Configuration Condition="'$(Configuration)' == ''">Release</Configuration> <Platform Condition="'$(Platform)' == ''">Win32</Platform> + <!-- v143 is not supported by the version of WiX Toolset obtained by get_externals.bat --> <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset> <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset> <PlatformToolset Condition="'$(PlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')">v141</PlatformToolset> @@ -49,8 +50,7 @@ </ClCompile> <Link> <AdditionalDependencies>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories Condition="'$(PlatformToolset)' == 'v142'">$(WixInstallPath)sdk\vs2017\lib\x86</AdditionalLibraryDirectories> - <AdditionalLibraryDirectories Condition="'$(PlatformToolset)' == 'v141'">$(WixInstallPath)sdk\vs2017\lib\x86</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories Condition="$(PlatformToolset.StartsWith(`v14`))">$(WixInstallPath)sdk\vs2017\lib\x86</AdditionalLibraryDirectories> <AdditionalLibraryDirectories Condition="'$(PlatformToolset)' == 'v140'">$(WixInstallPath)sdk\vs2015\lib\x86</AdditionalLibraryDirectories> <AdditionalLibraryDirectories Condition="'$(PlatformToolset)' == 'v120'">$(WixInstallPath)sdk\vs2013\lib\x86</AdditionalLibraryDirectories> <ModuleDefinitionFile>pythonba.def</ModuleDefinitionFile> |