mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-39930: Ensure vcruntime140.dll is included in all Windows packages (GH-18918)

Browse source 
Also adds GitHub CI test for Windows installer changes
This commit is contained in:
Steve Dower 2020-03-11 11:18:12 +00:00 • committed by GitHub
parent 39c34933fc
commit 2dd41740c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 67 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Tools/msi/exe/exe.wixproj
View file

@ -11,6 +11,9 @@
<SuppressICEs>ICE43</SuppressICEs>
</PropertyGroup>
<Import Project="..\msi.props" />
<PropertyGroup Condition="exists('$(BuildPath)vcruntime140_1.dll')">
<DefineConstants>$(DefineConstants);Include_Vcruntime140_1_dll=1</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="exe.wxs" />
<Compile Include="exe_files.wxs" />

7
Tools/msi/exe/exe_files.wxs
View file

@ -30,8 +30,13 @@
</RegistryKey>
</Component>
<Component Id="vcruntime140.dll" Directory="InstallDirectory" Guid="*">
<File Name="vcruntime140.dll" Source="!(bindpath.redist)vcruntime140.dll" KeyPath="yes" />
<File Name="vcruntime140.dll" Source="vcruntime140.dll" KeyPath="yes" />
</Component>
<?ifdef Include_Vcruntime140_1_dll ?>
<Component Id="vcruntime140_1.dll" Directory="InstallDirectory" Guid="*">
<File Name="vcruntime140_1.dll" Source="vcruntime140_1.dll" KeyPath="yes" />
</Component>
<?endif ?>
</ComponentGroup>
</Fragment>