Skip to content

Commit 470c183

Browse files
authored
WixInstallPath environment variable
1 parent e26e048 commit 470c183

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

Doc/using/windows.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ As specified in :pep:`11`, a Python release only supports a Windows platform
2525
while Microsoft considers the platform under extended support. This means that
2626
Python |version| supports Windows 10 and newer. If you require Windows 7
2727
support, please install Python 3.8. If you require Windows 8.1 support,
28-
please install Python 3.12.
28+
please install Python 3.13.
2929

3030
There are a number of different installers available for Windows, each with
3131
certain benefits and downsides.

Tools/msi/README.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,20 @@ the initial download size by separating them into their own MSIs.
6161
Building the Installer
6262
======================
6363

64-
Before building the installer, download extra build dependencies using
65-
Tools\msi\get_externals.bat. (Note that this is in addition to the
64+
Before building the installer, download the extra build dependencies
65+
using Tools\msi\get_externals.bat. (Note that this is in addition to the
6666
similarly named file in PCbuild.)
6767

68-
One of the dependencies used in builds is WiX, a toolset that lets developers
69-
create installers for Windows Installer, the Windows installation engine.
68+
One of the dependencies used in the build process is WiX, a toolset that
69+
allows developers to create installers for Windows Installer, the
70+
Windows installation engine. If you're not using the copy of WiX
71+
installed by Tools\msi\get_externals.bat, you'll need to set the
72+
"WixInstallPath" environment variable before building.
7073

71-
Additionally, make sure "MSVC v14x - VS 20xx C++ ARM64/ARM64EC build tools" are
72-
selected under "Desktop Development with C++" in "Visual Studio installer",
73-
even if you are not building on ARM64. This is required because we have
74-
upgraded to WiX-3.14, which requires these tools for Python 3.10 and later
75-
versions.
74+
Additionally, ensure that "MSVC v14x - VS 20xx C++ ARM64/ARM64EC build tools"
75+
is selected under "Desktop Development with C++" in the "Visual Studio Installer",
76+
even if you're not building on ARM64. This is required because we've upgraded
77+
to WiX 3.14, which requires these tools for Python 3.10 and later versions.
7678

7779
For testing, the installer should be built with the Tools/msi/build.bat
7880
script:

Tools/msi/wix.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PropertyGroup>
66
<WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(MSBuildThisFileDirectory)\Wix')">$(MSBuildThisFileDirectory)\Wix\</WixInstallPath>
77
<WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(ExternalsDir)\windows-installer\wix-314')">$(ExternalsDir)\windows-installer\wix-314\</WixInstallPath>
8-
<WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.14@InstallRoot)</WixInstallPath>
98
<WixTargetsPath>$(WixInstallPath)\Wix.targets</WixTargetsPath>
109
</PropertyGroup>
1110
</Project>

0 commit comments

Comments
 (0)