Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-124102: Clean up unsupported VS and WiX detections (GH-124784)

This commit is contained in:
Wulian 2024-10-18 20:48:18 +08:00 committed by GitHub
parent 10c4c95395
commit cda0ec8e7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PCbuild/pyproject.props
View File

@ -217,11 +217,6 @@ public override bool Execute() {
<Target Name="FindVCRedistDir"> <Target Name="FindVCRedistDir">
<!-- Hard coded path for VS 2015 -->
<PropertyGroup Condition="$(PlatformToolset) == 'v140'">
<VCRedistDir>$(VCInstallDir)\redist\</VCRedistDir>
</PropertyGroup>
<!-- Search for version number in some broken Build Tools installs --> <!-- Search for version number in some broken Build Tools installs -->
<ItemGroup Condition="$(VCRedistDir) == '' and $(VCToolsRedistVersion) == ''"> <ItemGroup Condition="$(VCRedistDir) == '' and $(VCToolsRedistVersion) == ''">
<_RedistFiles Include="$(VCInstallDir)\Redist\MSVC\*\*.*" /> <_RedistFiles Include="$(VCInstallDir)\Redist\MSVC\*\*.*" />

20
Tools/msi/README.txt
View File

@ -61,18 +61,20 @@ the initial download size by separating them into their own MSIs.
Building the Installer Building the Installer
====================== ======================
Before building the installer, download extra build dependencies using Before building the installer, download the extra build dependencies
Tools\msi\get_externals.bat. (Note that this is in addition to the using Tools\msi\get_externals.bat. (Note that this is in addition to the
similarly named file in PCbuild.) similarly named file in PCbuild.)
One of the dependencies used in builds is WiX, a toolset that lets developers One of the dependencies used in the build process is WiX, a toolset that
create installers for Windows Installer, the Windows installation engine. allows developers to create installers for Windows Installer, the
Windows installation engine. If you're not using the copy of WiX
installed by Tools\msi\get_externals.bat, you'll need to set the
"WixInstallPath" environment variable before building.
Additionally, make sure "MSVC v14x - VS 20xx C++ ARM64 build tools" are Additionally, ensure that "MSVC v14x - VS 20xx C++ ARM64/ARM64EC build tools"
selected under "Desktop Development with C++" in "Visual Studio installer", is selected under "Desktop Development with C++" in the "Visual Studio Installer",
even if you are not building on ARM64. This is required because we have even if you're not building on ARM64. This is required because we've upgraded
upgraded to WiX-3.14, which requires these tools for Python 3.11 and later to WiX 3.14, which requires these tools for Python 3.10 and later versions.
versions.
For testing, the installer should be built with the Tools/msi/build.bat For testing, the installer should be built with the Tools/msi/build.bat
script: script:

2
Tools/msi/wix.props
View File

@ -5,8 +5,6 @@
<PropertyGroup> <PropertyGroup>
<WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(MSBuildThisFileDirectory)\Wix')">$(MSBuildThisFileDirectory)\Wix\</WixInstallPath> <WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(MSBuildThisFileDirectory)\Wix')">$(MSBuildThisFileDirectory)\Wix\</WixInstallPath>
<WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(ExternalsDir)\windows-installer\wix-314')">$(ExternalsDir)\windows-installer\wix-314\</WixInstallPath> <WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(ExternalsDir)\windows-installer\wix-314')">$(ExternalsDir)\windows-installer\wix-314\</WixInstallPath>
<WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.10@InstallRoot)</WixInstallPath>
<WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10@InstallRoot)</WixInstallPath>
<WixTargetsPath>$(WixInstallPath)\Wix.targets</WixTargetsPath> <WixTargetsPath>$(WixInstallPath)\Wix.targets</WixTargetsPath>
</PropertyGroup> </PropertyGroup>
</Project> </Project>