diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-09-09 04:39:01 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-09-09 04:39:01 (GMT) |
| commit | fcbe1df4afe10eed49e97bf08ba748f9140a5bf3 (patch) | |
| tree | 24df31883a5d686b9536fa7ad0db07616d2c7aa1 /Tools/msi/make_zip.py | |
| parent | 0130e2991d901d43237d21df47c2adc8222233ba (diff) | |
| download | cpython-fcbe1df4afe10eed49e97bf08ba748f9140a5bf3.zip cpython-fcbe1df4afe10eed49e97bf08ba748f9140a5bf3.tar.gz cpython-fcbe1df4afe10eed49e97bf08ba748f9140a5bf3.tar.bz2 | |
Issue #25027: Reverts partial-static build options and adds vcruntime140.dll to Windows installation.
Diffstat (limited to 'Tools/msi/make_zip.py')
| -rw-r--r-- | Tools/msi/make_zip.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Tools/msi/make_zip.py b/Tools/msi/make_zip.py index ba711c4..09ee491 100644 --- a/Tools/msi/make_zip.py +++ b/Tools/msi/make_zip.py @@ -64,9 +64,6 @@ FULL_LAYOUT = [ ('Tools/', 'Tools', '**/*', include_in_tools), ] -if os.getenv('DOC_FILENAME'): - FULL_LAYOUT.append(('Doc/', 'Doc/build/htmlhelp', os.getenv('DOC_FILENAME'), None)) - EMBED_LAYOUT = [ ('/', 'PCBuild/$arch', 'python*.exe', is_not_debug), ('/', 'PCBuild/$arch', '*.pyd', is_not_debug), @@ -74,6 +71,12 @@ EMBED_LAYOUT = [ ('python35.zip', 'Lib', '**/*', include_in_lib), ] +if os.getenv('DOC_FILENAME'): + FULL_LAYOUT.append(('Doc/', 'Doc/build/htmlhelp', os.getenv('DOC_FILENAME'), None)) +if os.getenv('VCREDIST_PATH'): + FULL_LAYOUT.append(('/', os.getenv('VCREDIST_PATH'), 'vcruntime*.dll', None)) + EMBED_LAYOUT.append(('/', os.getenv('VCREDIST_PATH'), 'vcruntime*.dll', None)) + def copy_to_layout(target, rel_sources): count = 0 |