diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-01-09 08:14:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 08:14:46 (GMT) |
| commit | d135f20ae8887acc7716561bc8f4c7eb6d58d24c (patch) | |
| tree | 8c988503dc2f0f2dc757442a073c06b7a9a16078 /Tools/msi/ucrt | |
| parent | ca0c5f26563349ed761af13590acef80e1064eab (diff) | |
| download | cpython-d135f20ae8887acc7716561bc8f4c7eb6d58d24c.zip cpython-d135f20ae8887acc7716561bc8f4c7eb6d58d24c.tar.gz cpython-d135f20ae8887acc7716561bc8f4c7eb6d58d24c.tar.bz2 | |
bpo-32507: Change Windows install to include app-local UCRT (#5119)
Diffstat (limited to 'Tools/msi/ucrt')
| -rw-r--r-- | Tools/msi/ucrt/ucrt.wixproj | 28 | ||||
| -rw-r--r-- | Tools/msi/ucrt/ucrt.wxs | 14 | ||||
| -rw-r--r-- | Tools/msi/ucrt/ucrt_en-US.wxl | 5 |
3 files changed, 47 insertions, 0 deletions
diff --git a/Tools/msi/ucrt/ucrt.wixproj b/Tools/msi/ucrt/ucrt.wixproj new file mode 100644 index 0000000..52a7e0e --- /dev/null +++ b/Tools/msi/ucrt/ucrt.wixproj @@ -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>
\ No newline at end of file diff --git a/Tools/msi/ucrt/ucrt.wxs b/Tools/msi/ucrt/ucrt.wxs new file mode 100644 index 0000000..76e5682 --- /dev/null +++ b/Tools/msi/ucrt/ucrt.wxs @@ -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> diff --git a/Tools/msi/ucrt/ucrt_en-US.wxl b/Tools/msi/ucrt/ucrt_en-US.wxl new file mode 100644 index 0000000..f42dd5f --- /dev/null +++ b/Tools/msi/ucrt/ucrt_en-US.wxl @@ -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> |