summaryrefslogtreecommitdiffstats
path: root/Tools/msi
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-09-09 16:17:35 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-09-09 16:17:35 (GMT)
commit4db86bc1b465d6e5fa047ddafb9042fc12787459 (patch)
tree882ef4180040d396c73fd6f40988c3f90cc207d1 /Tools/msi
parent783c9ef84dad5fc136a271ccd7fc30d2e556a58e (diff)
downloadcpython-4db86bc1b465d6e5fa047ddafb9042fc12787459.zip
cpython-4db86bc1b465d6e5fa047ddafb9042fc12787459.tar.gz
cpython-4db86bc1b465d6e5fa047ddafb9042fc12787459.tar.bz2
Changes pyvenv.cfg trick into an actual sys.path file.
Diffstat (limited to 'Tools/msi')
-rw-r--r--Tools/msi/make_zip.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py
index 0e8a4a6..6c43256 100644
--- a/Tools/msi/make_zip.py
+++ b/Tools/msi/make_zip.py
@@ -46,6 +46,10 @@ EXCLUDE_FILE_FROM_LIBS = {
'python3stub',
}
+EXCLUDED_FILES = {
+ 'pyshellext',
+}
+
def is_not_debug(p):
if DEBUG_RE.search(p.name):
return False
@@ -53,7 +57,7 @@ def is_not_debug(p):
if TKTCL_RE.search(p.name):
return False
- return p.stem.lower() not in DEBUG_FILES
+ return p.stem.lower() not in DEBUG_FILES and p.stem.lower() not in EXCLUDED_FILES
def is_not_debug_or_python(p):
return is_not_debug(p) and not PYTHON_DLL_RE.search(p.name)
@@ -209,8 +213,9 @@ def main():
copied = copy_to_layout(temp / t.rstrip('/'), rglob(s, p, c))
print('Copied {} files'.format(copied))
- with open(str(temp / 'pyvenv.cfg'), 'w') as f:
- print('applocal = true', file=f)
+ with open(str(temp / 'sys.path'), 'w') as f:
+ print('python{0.major}{0.minor}.zip'.format(sys.version_info), file=f)
+ print('.', file=f)
if out:
total = copy_to_layout(out, rglob(temp, '**/*', None))