From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 19 May 2016 17:47:47 +0000 (-0700)
Subject: Issue #27053: Updates make_zip.py to correctly generate library ZIP file.
X-Git-Tag: v3.5.2rc1~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8bf09c6cd1137b148a06a0283c060e3e1e6cc46;p=thirdparty%2FPython%2Fcpython.git

Issue #27053: Updates make_zip.py to correctly generate library ZIP file.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index fcfcd4f5514e..d42f1e804b8e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -556,6 +556,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 d49b5b48b3ba..753ba0f78766 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'):