summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2017-02-06 22:12:57 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2017-02-06 22:12:57 (GMT)
commitd947e4da5db3efc2c83ecee115eb1d6d29d59671 (patch)
treed885970a0e6b2ba4f1c022c08027495d3d5ea017
parent0fa47469a9b1fc3436c783b766e07e9d7123f4eb (diff)
parentf007b49eb95b3b713f101008fdd5a1eb39d43443 (diff)
downloadcpython-d947e4da5db3efc2c83ecee115eb1d6d29d59671.zip
cpython-d947e4da5db3efc2c83ecee115eb1d6d29d59671.tar.gz
cpython-d947e4da5db3efc2c83ecee115eb1d6d29d59671.tar.bz2
Includes ensurepip and venv packages in nuget package.
-rw-r--r--Tools/msi/make_zip.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
index 8dbe83e..710e4a5 100644
--- a/Tools/msi/make_zip.py
+++ b/Tools/msi/make_zip.py
@@ -29,12 +29,15 @@ DEBUG_FILES = {
EXCLUDE_FROM_LIBRARY = {
'__pycache__',
- 'ensurepip',
'idlelib',
'pydoc_data',
'site-packages',
'tkinter',
'turtledemo',
+}
+
+EXCLUDE_FROM_EMBEDDABLE_LIBRARY = {
+ 'ensurepip',
'venv',
}
@@ -82,6 +85,12 @@ def include_in_lib(p):
suffix = p.suffix.lower()
return suffix not in {'.pyc', '.pyo', '.exe'}
+def include_in_embeddable_lib(p):
+ if p.is_dir() and p.name.lower() in EXCLUDE_FROM_EMBEDDABLE_LIBRARY:
+ return False
+
+ return include_in_lib(p)
+
def include_in_libs(p):
if not is_not_debug(p):
return False
@@ -114,7 +123,7 @@ EMBED_LAYOUT = [
('/', 'PCBuild/$arch', 'python*.exe', is_not_debug),
('/', 'PCBuild/$arch', '*.pyd', is_not_debug),
('/', 'PCBuild/$arch', '*.dll', is_not_debug),
- ('{}.zip'.format(BASE_NAME), 'Lib', '**/*', include_in_lib),
+ ('{}.zip'.format(BASE_NAME), 'Lib', '**/*', include_in_embeddable_lib),
]
if os.getenv('DOC_FILENAME'):