diff options
author | Steve Dower <steve.dower@python.org> | 2019-06-14 15:29:20 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-14 15:29:20 (GMT) |
commit | 21a92f8cda525d25a165b773fbe1bfffd303a000 (patch) | |
tree | 84d08fcb306ee46d6f5147d734745af0c3f64b7b /Tools/msi/exe | |
parent | f0749da9a535375f05a2015e8960e8ae54877349 (diff) | |
download | cpython-21a92f8cda525d25a165b773fbe1bfffd303a000.zip cpython-21a92f8cda525d25a165b773fbe1bfffd303a000.tar.gz cpython-21a92f8cda525d25a165b773fbe1bfffd303a000.tar.bz2 |
Implement Windows release builds in Azure Pipelines (GH-14065)
Diffstat (limited to 'Tools/msi/exe')
-rw-r--r-- | Tools/msi/exe/crtlicense.txt | 41 | ||||
-rw-r--r-- | Tools/msi/exe/exe.wixproj | 19 | ||||
-rw-r--r-- | Tools/msi/exe/exe_files.wxs | 2 |
3 files changed, 1 insertions, 61 deletions
diff --git a/Tools/msi/exe/crtlicense.txt b/Tools/msi/exe/crtlicense.txt deleted file mode 100644 index f86841f..0000000 --- a/Tools/msi/exe/crtlicense.txt +++ /dev/null @@ -1,41 +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 -is embedded in each .exe, .dll and .pyd file as a result of running -the code through a linker. - -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. - diff --git a/Tools/msi/exe/exe.wixproj b/Tools/msi/exe/exe.wixproj index 071501c..326766b 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -21,25 +21,6 @@ <WxlTemplate Include="*.wxl_template" /> </ItemGroup> - <Target Name="_GenerateLicense" AfterTargets="PrepareForBuild"> - <ItemGroup> - <LicenseFiles Include="$(PySourcePath)LICENSE; - crtlicense.txt; - $(bz2Dir)LICENSE; - $(opensslOutDir)LICENSE; - $(tcltkDir)tcllicense.terms; - $(tcltkDir)tklicense.terms; - $(tcltkDir)tixlicense.terms" /> - <_LicenseFiles Include="@(LicenseFiles)"> - <Content>$([System.IO.File]::ReadAllText(%(FullPath)))</Content> - </_LicenseFiles> - </ItemGroup> - - <WriteLinesToFile File="$(BuildPath)LICENSE" - Overwrite="true" - Lines="@(_LicenseFiles->'%(Content)')" /> - </Target> - <Target Name="_CopyMiscNews" AfterTargets="PrepareForBuild" Condition="Exists('$(PySourcePath)Misc\NEWS')"> <Copy SourceFiles="$(PySourcePath)Misc\NEWS" DestinationFiles="$(BuildPath)NEWS.txt" /> </Target> diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index 394b4de..483d06c 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -3,7 +3,7 @@ <Fragment> <ComponentGroup Id="exe_txt"> <Component Id="LICENSE.txt" Directory="InstallDirectory" Guid="*"> - <File Name="LICENSE.txt" Source="LICENSE" KeyPath="yes" /> + <File Name="LICENSE.txt" Source="LICENSE.txt" KeyPath="yes" /> </Component> <Component Id="NEWS.txt" Directory="InstallDirectory" Guid="*"> <File Name="NEWS.txt" KeyPath="yes" /> |