Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-124102: Update internal PCbuild docs and correct WiX registry #124784

Merged
merged 6 commits into from
Oct 18, 2024
Merged

gh-124102: Update internal PCbuild docs and correct WiX registry #124784

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c738e9f
Update Dependency Information for PCBuild to Correct Information
Wulian233 Sep 30, 2024
d857f57
remove win8.1
Wulian233 Oct 1, 2024
96a6a88
finish
Wulian233 Oct 1, 2024
e26e048
Merge branch 'python:main' into pcbuild
Wulian233 Oct 2, 2024
470c183
WixInstallPath environment variable
Wulian233 Oct 2, 2024
31bfa66
update windows.rst
Wulian233 Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions PCbuild/pyproject.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,6 @@ public override bool Execute() {


<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 -->
<ItemGroup Condition="$(VCRedistDir) == '' and $(VCToolsRedistVersion) == ''">
<_RedistFiles Include="$(VCInstallDir)\Redist\MSVC\*\*.*" />
Expand Down
4 changes: 2 additions & 2 deletions Tools/msi/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ 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.

Additionally, make sure "MSVC v14x - VS 20xx C++ ARM64 build tools" are
Additionally, make sure "MSVC v14x - VS 20xx C++ ARM64/ARM64EC 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
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
Expand Down
3 changes: 1 addition & 2 deletions Tools/msi/wix.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<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>
<WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.14@InstallRoot)</WixInstallPath>
<WixTargetsPath>$(WixInstallPath)\Wix.targets</WixTargetsPath>
</PropertyGroup>
</Project>
Loading