Browse Source
Issue 24476: Statically links vcruntime140.dll and removes it from the installer
pull/9921/head
Issue 24476: Statically links vcruntime140.dll and removes it from the installer
pull/9921/head
Steve Dower
11 years ago
10 changed files with 7 additions and 148 deletions
-
8PCbuild/pyproject.props
-
2Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
-
1Tools/msi/bundle/bundle.targets
-
19Tools/msi/bundle/packagegroups/crt.wxs
-
20Tools/msi/crt/crt.wixproj
-
26Tools/msi/crt/crt.wxs
-
5Tools/msi/crt/crt_en-US.wxl
-
20Tools/msi/crt/crt_files.wxs
-
47Tools/msi/crt/crtlicense.txt
-
7Tools/msi/exe/crtlicense.txt
@ -1,20 +0,0 @@ |
|||
<?xml version="1.0" encoding="utf-8"?> |
|||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|||
<PropertyGroup> |
|||
<ProjectGuid>{91C99298-8E2E-4422-A5AF-CC4FFF9A58D3}</ProjectGuid> |
|||
<SchemaVersion>2.0</SchemaVersion> |
|||
<OutputName>crt</OutputName> |
|||
<OutputType>Package</OutputType> |
|||
<SuppressIces>ICE71</SuppressIces> |
|||
</PropertyGroup> |
|||
<Import Project="..\msi.props" /> |
|||
<ItemGroup> |
|||
<Compile Include="crt.wxs" /> |
|||
<Compile Include="crt_files.wxs" /> |
|||
</ItemGroup> |
|||
<ItemGroup> |
|||
<EmbeddedResource Include="*.wxl" /> |
|||
</ItemGroup> |
|||
|
|||
<Import Project="..\msi.targets" /> |
|||
</Project> |
|||
@ -1,26 +0,0 @@ |
|||
<?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" /> |
|||
|
|||
<?if $(var.Platform)~=x64 ?> |
|||
<?define DirName=System64?> |
|||
<?else ?> |
|||
<?define DirName=System?> |
|||
<?endif ?> |
|||
<DirectoryRef Id="TARGETDIR"> |
|||
<Directory Id="$(var.DirName)Folder" Name="$(var.DirName)"> |
|||
<Directory Id="SystemInstallDirectory" Name="." /> |
|||
</Directory> |
|||
</DirectoryRef> |
|||
<?undef DirName ?> |
|||
|
|||
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> |
|||
<ComponentGroupRef Id="crt_files" /> |
|||
</Feature> |
|||
</Product> |
|||
</Wix> |
|||
|
|||
@ -1,5 +0,0 @@ |
|||
<?xml version="1.0" encoding="utf-8"?> |
|||
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization"> |
|||
<String Id="Descriptor">C Runtime</String> |
|||
<String Id="ShortDescriptor">crt</String> |
|||
</WixLocalization> |
|||
@ -1,20 +0,0 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> |
|||
<Fragment> |
|||
<?if $(var.Platform)~=x64 ?> |
|||
<?define vcruntime140Guid={B33258FD-750C-3B42-8BE4-535B48E97DB4}?> |
|||
<?else ?> |
|||
<?define vcruntime140Guid={E8E39D3B-4F35-36D8-B892-4B28336FE041}?> |
|||
<?endif ?> |
|||
<ComponentGroup Id="crt_files"> |
|||
<Component Id="vcruntime140.dll_LM" Directory="SystemInstallDirectory" Guid="$(var.vcruntime140Guid)" Shared="yes" SharedDllRefCount="yes"> |
|||
<Condition>ALLUSERS=1</Condition> |
|||
<File Id="vcruntime140.dll_LM" Source="!(bindpath.crt)\vcruntime140.dll" /> |
|||
</Component> |
|||
<Component Id="vcruntime140.dll_CU" Directory="InstallDirectory" Guid="*"> |
|||
<Condition>NOT ALLUSERS=1</Condition> |
|||
<File Id="vcruntime140.dll_CU" Source="!(bindpath.crt)\vcruntime140.dll" /> |
|||
</Component> |
|||
</ComponentGroup> |
|||
</Fragment> |
|||
</Wix> |
|||
@ -1,47 +0,0 @@ |
|||
|
|||
|
|||
Additional Conditions for this Windows binary build |
|||
--------------------------------------------------- |
|||
|
|||
This program is linked with and uses Microsoft Distributable Code, |
|||
copyrighted by Microsoft Corporation. The Microsoft Distributable Code |
|||
includes the following files: |
|||
|
|||
appcrt140.dll |
|||
desktopcrt140.dll |
|||
vcruntime140.dll |
|||
msvcp140.dll |
|||
concrt140.dll |
|||
vccorlib140.dll |
|||
|
|||
If you further distribute programs that include the Microsoft |
|||
Distributable Code, you must comply with the restrictions on |
|||
distribution specified by Microsoft. In particular, you must require |
|||
distributors and external end users to agree to terms that protect the |
|||
Microsoft Distributable Code at least as much as Microsoft's own |
|||
requirements for the Distributable Code. See Microsoft's documentation |
|||
(included in its developer tools and on its website at microsoft.com) |
|||
for specific details. |
|||
|
|||
Redistribution of the Windows binary build of the Python interpreter |
|||
complies with this agreement, provided that you do not: |
|||
|
|||
- alter any copyright, trademark or patent notice in Microsoft's |
|||
Distributable Code; |
|||
|
|||
- use Microsoft's trademarks in your programs' names or in a way that |
|||
suggests your programs come from or are endorsed by Microsoft; |
|||
|
|||
- distribute Microsoft's Distributable Code to run on a platform other |
|||
than Microsoft operating systems, run-time technologies or application |
|||
platforms; or |
|||
|
|||
- include Microsoft Distributable Code in malicious, deceptive or |
|||
unlawful programs. |
|||
|
|||
These restrictions apply only to the Microsoft Distributable Code as |
|||
defined above, not to Python itself or any programs running on the |
|||
Python interpreter. The redistribution of the Python interpreter and |
|||
libraries is governed by the Python Software License included with this |
|||
file, or by other licenses as marked. |
|||
|
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue