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

zooba · zooba · commit d8bf09c6cd11 · 2016-05-19T10:47:47.000-07:00
diff --git 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
@@ -89,7 +89,7 @@ def include_in_tools(p):
     ('/', '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'):

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ def include_in_tools(p):`
`89`	`89`	`('/', 'PCBuild/$arch', 'python*.exe', is_not_debug),`
`90`	`90`	`('/', 'PCBuild/$arch', '*.pyd', is_not_debug),`
`91`	`91`	`('/', 'PCBuild/$arch', '*.dll', is_not_debug),`
`92`		`- ('python35.zip', 'Lib', '*/', include_in_lib),`
	`92`	`+ ('python{0.major}{0.minor}.zip'.format(sys.version_info), 'Lib', '*/', include_in_lib),`
`93`	`93`	`]`
`94`	`94`
`95`	`95`	`if os.getenv('DOC_FILENAME'):`