mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #28783: Embedded and nuget packages incorrect reference missing bdist_wininst command.

Browse source
This commit is contained in:
Steve Dower 2016-11-23 11:42:35 -08:00
commit 2a94301911
2 changed files with 48 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Tools/msi/distutils.command.__init__.py Normal file
View file

@ -0,0 +1,32 @@
"""distutils.command
Package containing implementation of all the standard Distutils
commands."""
__all__ = ['build',
'build_py',
'build_ext',
'build_clib',
'build_scripts',
'clean',
'install',
'install_lib',
'install_headers',
'install_scripts',
'install_data',
'sdist',
'register',
'bdist',
'bdist_dumb',
'bdist_rpm',
# This command is not included in this package
#'bdist_wininst',
'check',
'upload',
# These two are reserved for future use:
#'bdist_sdux',
#'bdist_pkgtool',
# Note:
# bdist_packager is not included because it only provides
# an abstract base class
]

19
Tools/msi/make_zip.py
View file

@ -7,6 +7,7 @@ import stat
import os import os
import tempfile import tempfile
from itertools import chain
from pathlib import Path from pathlib import Path
from zipfile import ZipFile, ZIP_DEFLATED from zipfile import ZipFile, ZIP_DEFLATED
import subprocess import subprocess
@ -42,6 +43,7 @@ EXCLUDE_FILE_FROM_LIBRARY = {
} }
EXCLUDE_FILE_FROM_LIBS = { EXCLUDE_FILE_FROM_LIBS = {
'liblzma',
'ssleay', 'ssleay',
'libeay', 'libeay',
'python3stub', 'python3stub',
@ -77,6 +79,10 @@ def include_in_lib(p):
if name in EXCLUDE_FILE_FROM_LIBRARY: if name in EXCLUDE_FILE_FROM_LIBRARY:
return False return False
# Special code is included below to patch this file back in
if [d.lower() for d in p.parts[-3:]] == ['distutils', 'command', '__init__.py']:
return False
suffix = p.suffix.lower() suffix = p.suffix.lower()
return suffix not in {'.pyc', '.pyo', '.exe'} return suffix not in {'.pyc', '.pyo', '.exe'}
@ -173,7 +179,7 @@ def rglob(root, pattern, condition):
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-s', '--source', metavar='dir', help='The directory containing the repository root', type=Path) parser.add_argument('-s', '--source', metavar='dir', help='The directory containing the repository root', type=Path)
parser.add_argument('-o', '--out', metavar='file', help='The name of the output self-extracting archive', type=Path, default=None) parser.add_argument('-o', '--out', metavar='file', help='The name of the output archive', type=Path, default=None)
parser.add_argument('-t', '--temp', metavar='dir', help='A directory to temporarily extract files into', type=Path, default=None) parser.add_argument('-t', '--temp', metavar='dir', help='A directory to temporarily extract files into', type=Path, default=None)
parser.add_argument('-e', '--embed', help='Create an embedding layout', action='store_true', default=False) parser.add_argument('-e', '--embed', help='Create an embedding layout', action='store_true', default=False)
parser.add_argument('-a', '--arch', help='Specify the architecture to use (win32/amd64)', type=str, default="win32") parser.add_argument('-a', '--arch', help='Specify the architecture to use (win32/amd64)', type=str, default="win32")
@ -207,8 +213,15 @@ def main():
try: try:
for t, s, p, c in layout: for t, s, p, c in layout:
s = source / s.replace("$arch", arch) fs = source / s.replace("$arch", arch)
copied = copy_to_layout(temp / t.rstrip('/'), rglob(s, p, c)) files = rglob(fs, p, c)
extra_files = []
if s == 'Lib' and p == '**/*':
extra_files.append((
source / 'tools' / 'msi' / 'distutils.command.__init__.py',
Path('distutils') / 'command' / '__init__.py'
))
copied = copy_to_layout(temp / t.rstrip('/'), chain(files, extra_files))
print('Copied {} files'.format(copied)) print('Copied {} files'.format(copied))
if ns.embed: if ns.embed: