summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-05-19 17:47:55 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-05-19 17:47:55 (GMT)
commit7fa6378747dfffb983f14b9f6e760ab65a112fe3 (patch)
tree9fc4c22304b8b537aaf9cd37544042a2b15bf7ad
parent4a3443be43986c4b8c59a6127c04a44e5caf66f1 (diff)
parentd8bf09c6cd1137b148a06a0283c060e3e1e6cc46 (diff)
downloadcpython-7fa6378747dfffb983f14b9f6e760ab65a112fe3.zip
cpython-7fa6378747dfffb983f14b9f6e760ab65a112fe3.tar.gz
cpython-7fa6378747dfffb983f14b9f6e760ab65a112fe3.tar.bz2
Issue #27053: Updates make_zip.py to correctly generate library ZIP file.
-rw-r--r--Misc/NEWS2
-rw-r--r--Tools/msi/make_zip.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index f10ad24..9f07e3e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1221,6 +1221,8 @@ Build
Windows
-------
+- Issue #27053: Updates make_zip.py to correctly generate library ZIP file.
+
- Issue #26268: Update the prepare_ssl.py script to handle OpenSSL releases
that don't include the contents of the include directory (that is, 1.0.2e
and later).
diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
index d49b5b4..753ba0f 100644
--- a/Tools/msi/make_zip.py
+++ b/Tools/msi/make_zip.py
@@ -89,7 +89,7 @@ EMBED_LAYOUT = [
('/', 'PCBuild/$arch', 'python*.exe', is_not_debug),
('/', 'PCBuild/$arch', '*.pyd', is_not_debug),
('/', 'PCBuild/$arch', '*.dll', is_not_debug),
- ('python35.zip', 'Lib', '**/*', include_in_lib),
+ ('python{0.major}{0.minor}.zip'.format(sys.version_info), 'Lib', '**/*', include_in_lib),
]
if os.getenv('DOC_FILENAME'):