mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

bpo-32507: Change Windows install to include app-local UCRT (#5119)

Browse source
This commit is contained in:
Steve Dower 2018-01-09 19:14:46 +11:00 • committed by GitHub
parent ca0c5f2656
commit d135f20ae8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 71 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Tools/msi/ucrt/ucrt.wixproj Normal file
View file

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{E233091D-2EE3-49D8-A7F1-6E266CE1B6B1}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>ucrt</OutputName>
<OutputType>Package</OutputType>
</PropertyGroup>
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="ucrt.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(CRTRedist)\ucrt\*.dll">
<SourceBase>$(CRTRedist)</SourceBase>
<Source>!(bindpath.redist)\</Source>
<TargetBase>$(CRTRedist)\ucrt</TargetBase>
<Target_>InstallDirectory\</Target_>
<Group>ucrt_dll</Group>
<IncludeInCat>false</IncludeInCat>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>

14
Tools/msi/ucrt/ucrt.wxs Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="UpgradeTable" />
<PropertyRef Id="REGISTRYKEY" />
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="ucrt_dll" />
</Feature>
</Product>
</Wix>

5
Tools/msi/ucrt/ucrt_en-US.wxl Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="Descriptor">C Runtime Library</String>
<String Id="ShortDescriptor">ucrt</String>
</WixLocalization>