summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2014-09-12 18:48:13 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2014-09-12 18:48:13 (GMT)
commit144de3152d04a6fab92c1e998d5e6d720fad774a (patch)
tree38de389e7763bdb3e40709ac199e126dc25c620e /PCbuild
parentbf8b0ed5cb45d428709fbd0c6afe6081ec993509 (diff)
downloadcpython-144de3152d04a6fab92c1e998d5e6d720fad774a.zip
cpython-144de3152d04a6fab92c1e998d5e6d720fad774a.tar.gz
cpython-144de3152d04a6fab92c1e998d5e6d720fad774a.tar.bz2
#22398 Tools/msi enhancements for 2.7
Fix build_tkinter.py. Update msi.py to use environment vars and correct tcl/tk paths. Update msilib.py to generate short names for files with multiple dots in the name.
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/build_tkinter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/PCbuild/build_tkinter.py b/PCbuild/build_tkinter.py
index 2d5797f..1241864 100644
--- a/PCbuild/build_tkinter.py
+++ b/PCbuild/build_tkinter.py
@@ -23,7 +23,7 @@ NMAKE = ('nmake /nologo /f %s '
'%s %s')
def nmake(makefile, command="", **kw):
- defines = ' '.join(k+'='+v for k, v in kw.items())
+ defines = ' '.join('%s=%s' % i for i in kw.items())
cmd = NMAKE % (makefile, defines, command)
print("\n\n"+cmd+"\n")
if os.system(cmd) != 0: