[Python-checkins] bpo-37326: Include libffi license when available (GH-15921)

Miss Islington (bot) webhook-mailer at python.org
Wed Sep 11 09:31:31 EDT 2019


https://github.com/python/cpython/commit/da38ec1d4862ffb58faec41ed367719e81801766
commit: da38ec1d4862ffb58faec41ed367719e81801766
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-09-11T06:31:27-07:00
summary:

bpo-37326: Include libffi license when available (GH-15921)

(cherry picked from commit 8fcaffb048d2359a4c06ed5d8fbbf46d3ae1a472)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M PCbuild/python.vcxproj

diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index e37bcfb0b6e1..2094420a8df3 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -150,12 +150,13 @@ $(_PGOPath)
       <LicenseFiles Include="$(PySourcePath)LICENSE;
                              $(PySourcePath)PC\crtlicense.txt;
                              $(bz2Dir)LICENSE;
-                             $(opensslOutDir)LICENSE;" />
+                             $(opensslOutDir)LICENSE;
+                             $(libffiDir)LICENSE;" />
       <LicenseFiles Include="$(tcltkDir)tcllicense.terms;
                              $(tcltkDir)tklicense.terms;
                              $(tcltkDir)tixlicense.terms" Condition="$(IncludeTkinter)" />
       <_LicenseFiles Include="@(LicenseFiles)">
-        <Content>$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
+        <Content Condition="Exists(%(FullPath))">$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
       </_LicenseFiles>
     </ItemGroup>
 



More information about the Python-checkins mailing list