diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-03-11 11:38:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 11:38:18 (GMT) |
| commit | d01c5507e5f9bd5072d94f007d29b37f41c6e6b5 (patch) | |
| tree | 99a292983f1e3e954bc20209278de0d8cf7b968c /Tools | |
| parent | 6ce36ed4a7b731d186e03c88c8c9c057b1cd0e18 (diff) | |
| download | cpython-d01c5507e5f9bd5072d94f007d29b37f41c6e6b5.zip cpython-d01c5507e5f9bd5072d94f007d29b37f41c6e6b5.tar.gz cpython-d01c5507e5f9bd5072d94f007d29b37f41c6e6b5.tar.bz2 | |
bpo-39930: Ensure vcruntime140.dll is included in all Windows packages (GH-18918)
Also adds GitHub CI test for Windows installer changes
(cherry picked from commit 2dd41740c97bd77695ddcc590caa7f53e76dc35a)
Co-authored-by: Steve Dower <steve.dower@python.org>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/exe/exe.wixproj | 3 | ||||
| -rw-r--r-- | Tools/msi/exe/exe_files.wxs | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Tools/msi/exe/exe.wixproj b/Tools/msi/exe/exe.wixproj index 326766b..be44f44 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -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" /> diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index 483d06c..15bf6a0 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -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> |