[Python-checkins] bpo-37288: Fix Windows build when --no-tkinter is specified (GH-14096)

Steve Dower webhook-mailer at python.org
Mon Jun 17 11:21:36 EDT 2019


https://github.com/python/cpython/commit/00f6493084c385033fe5574314223217d9a26672
commit: 00f6493084c385033fe5574314223217d9a26672
branch: master
author: Paul Monson <paulmon at users.noreply.github.com>
committer: Steve Dower <steve.dower at python.org>
date: 2019-06-17T08:21:28-07:00
summary:

bpo-37288: Fix Windows build when --no-tkinter is specified (GH-14096)

files:
M PCbuild/python.vcxproj

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



More information about the Python-checkins mailing list