diff options
| author | Wulian <xiguawulian@gmail.com> | 2024-10-18 12:48:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-18 12:48:18 (GMT) |
| commit | cda0ec8e7c4e9a010e5f73c5afaf18f86cb27b97 (patch) | |
| tree | 1d3a82f9a660fe22f4173f496d6d8fb50f05faf5 /Tools/msi | |
| parent | 10c4c95395771fb37e93811aaace42f026c16de5 (diff) | |
| download | cpython-cda0ec8e7c4e9a010e5f73c5afaf18f86cb27b97.zip cpython-cda0ec8e7c4e9a010e5f73c5afaf18f86cb27b97.tar.gz cpython-cda0ec8e7c4e9a010e5f73c5afaf18f86cb27b97.tar.bz2 | |
gh-124102: Clean up unsupported VS and WiX detections (GH-124784)
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/README.txt | 20 | ||||
| -rw-r--r-- | Tools/msi/wix.props | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Tools/msi/README.txt b/Tools/msi/README.txt index 98e5ba0..8ae1564 100644 --- a/Tools/msi/README.txt +++ b/Tools/msi/README.txt @@ -61,18 +61,20 @@ the initial download size by separating them into their own MSIs. Building the Installer ====================== -Before building the installer, download extra build dependencies using -Tools\msi\get_externals.bat. (Note that this is in addition to the +Before building the installer, download the extra build dependencies +using Tools\msi\get_externals.bat. (Note that this is in addition to the similarly named file in PCbuild.) -One of the dependencies used in builds is WiX, a toolset that lets developers -create installers for Windows Installer, the Windows installation engine. +One of the dependencies used in the build process is WiX, a toolset that +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 -selected under "Desktop Development with C++" in "Visual Studio installer", -even if you are not building on ARM64. This is required because we have -upgraded to WiX-3.14, which requires these tools for Python 3.11 and later -versions. +Additionally, ensure that "MSVC v14x - VS 20xx C++ ARM64/ARM64EC build tools" +is selected under "Desktop Development with C++" in the "Visual Studio Installer", +even if you're not building on ARM64. This is required because we've upgraded +to WiX 3.14, which requires these tools for Python 3.10 and later versions. For testing, the installer should be built with the Tools/msi/build.bat script: diff --git a/Tools/msi/wix.props b/Tools/msi/wix.props index d8ced31..707c8ae 100644 --- a/Tools/msi/wix.props +++ b/Tools/msi/wix.props @@ -5,8 +5,6 @@ <PropertyGroup> <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)' == ''">$(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> </PropertyGroup> </Project>
\ No newline at end of file |