diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-06-19 17:49:04 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-06-19 17:49:04 (GMT) |
| commit | 6d58f8dc525f2bdf7e6d4d2b4ce1e63a6a166940 (patch) | |
| tree | b7f704e17f47a763f6bbb33ddbb8781d4a049dd0 /Tools/msi/bundle | |
| parent | 4ab4ac8e035060956f71fb73feae567a83bc5fbd (diff) | |
| download | cpython-6d58f8dc525f2bdf7e6d4d2b4ce1e63a6a166940.zip cpython-6d58f8dc525f2bdf7e6d4d2b4ce1e63a6a166940.tar.gz cpython-6d58f8dc525f2bdf7e6d4d2b4ce1e63a6a166940.tar.bz2 | |
Issue 24476: Statically links vcruntime140.dll and removes it from the installer
Diffstat (limited to 'Tools/msi/bundle')
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 2 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.targets | 1 | ||||
| -rw-r--r-- | Tools/msi/bundle/packagegroups/crt.wxs | 19 |
3 files changed, 0 insertions, 22 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 62b9614..1917937 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -2402,8 +2402,6 @@ private: // Check whether at least CRT v10.0.9924.0 is available. // It should only be installed as a Windows Update package, which means // we don't need to worry about 32-bit/64-bit. - // However, since the WU package does not include vcruntime140.dll, we - // still install that ourselves. LPCWSTR crtFile = L"api-ms-win-crt-runtime-l1-1-0.dll"; DWORD cbVer = GetFileVersionInfoSizeW(crtFile, nullptr); diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index cc7e445..363c4e3 100644 --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -61,7 +61,6 @@ </ItemDefinitionGroup> <ItemGroup> <Package Include="..\core\core*.wixproj" /> - <Package Include="..\crt\crt*.wixproj" /> <Package Include="..\dev\dev*.wixproj" /> <Package Include="..\doc\doc*.wixproj" /> <Package Include="..\exe\exe*.wixproj" /> diff --git a/Tools/msi/bundle/packagegroups/crt.wxs b/Tools/msi/bundle/packagegroups/crt.wxs index b079700..32b063f 100644 --- a/Tools/msi/bundle/packagegroups/crt.wxs +++ b/Tools/msi/bundle/packagegroups/crt.wxs @@ -6,25 +6,6 @@ <PackageGroupRef Id="crt_14.0_v6.1" /> <PackageGroupRef Id="crt_14.0_v6.2" /> <PackageGroupRef Id="crt_14.0_v6.3" /> - - <MsiPackage Id="crt_AllUsers" - SourceFile="crt.msi" - Compressed="$(var.CompressMSI)" - DownloadUrl="$(var.DownloadUrl)" - ForcePerMachine="yes" - InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip)"> - <!-- TARGETDIR will be ignored, but must still be provided --> - <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> - </MsiPackage> - - <MsiPackage Id="crt_JustForMe" - SourceFile="crt.msi" - Compressed="$(var.CompressMSI)" - DownloadUrl="$(var.DownloadUrl)" - ForcePerMachine="no" - InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip)"> - <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> - </MsiPackage> </PackageGroup> </Fragment> |