This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6086

packaging: move find_vc_runtime_files() into hgpackaging.util
ClosedPublic

Authored by indygreg on Mar 7 2019, 7:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1440dd6164f2: packaging: move find_vc_runtime_files() into hgpackaging.util
Summary

In preparation for moving the bulk of the Inno Setup code into
hgpackaging.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 7 2019, 7:49 PM
Closed by commit rHG1440dd6164f2: packaging: move find_vc_runtime_files() into hgpackaging.util (authored by indygreg). · Explain WhyMar 9 2019, 8:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14441

contrib/packaging/hgpackaging/util.py

# util.py - Common packaging utility code. # util.py - Common packaging utility code.
# #
# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
# no-check-code because Python 3 native. # no-check-code because Python 3 native.
import os
import pathlib import pathlib
import tarfile import tarfile
import zipfile import zipfile
def extract_tar_to_directory(source: pathlib.Path, dest: pathlib.Path): def extract_tar_to_directory(source: pathlib.Path, dest: pathlib.Path):
with tarfile.open(source, 'r') as tf: with tarfile.open(source, 'r') as tf:
tf.extractall(dest) tf.extractall(dest)
def extract_zip_to_directory(source: pathlib.Path, dest: pathlib.Path): def extract_zip_to_directory(source: pathlib.Path, dest: pathlib.Path):
with zipfile.ZipFile(source, 'r') as zf: with zipfile.ZipFile(source, 'r') as zf:
zf.extractall(dest) zf.extractall(dest)
def find_vc_runtime_files(x64=False):
"""Finds Visual C++ Runtime DLLs to include in distribution."""
winsxs = pathlib.Path(os.environ['SYSTEMROOT']) / 'WinSxS'
prefix = 'amd64' if x64 else 'x86'
candidates = sorted(p for p in os.listdir(winsxs)
if p.lower().startswith('%s_microsoft.vc90.crt_' % prefix))
for p in candidates:
print('found candidate VC runtime: %s' % p)
# Take the newest version.
version = candidates[-1]
d = winsxs / version
return [
d / 'msvcm90.dll',
d / 'msvcp90.dll',
d / 'msvcr90.dll',
winsxs / 'Manifests' / ('%s.manifest' % version),
]

contrib/packaging/inno/build.py

import tempfile import tempfile
PRINT_PYTHON_INFO = ''' PRINT_PYTHON_INFO = '''
import platform, sys; print("%s:%d" % (platform.architecture()[0], sys.version_info[0])) import platform, sys; print("%s:%d" % (platform.architecture()[0], sys.version_info[0]))
'''.strip() '''.strip()
def find_vc_runtime_files(x64=False):
"""Finds Visual C++ Runtime DLLs to include in distribution."""
winsxs = pathlib.Path(os.environ['SYSTEMROOT']) / 'WinSxS'
prefix = 'amd64' if x64 else 'x86'
candidates = sorted(p for p in os.listdir(winsxs)
if p.lower().startswith('%s_microsoft.vc90.crt_' % prefix))
for p in candidates:
print('found candidate VC runtime: %s' % p)
# Take the newest version.
version = candidates[-1]
d = winsxs / version
return [
d / 'msvcm90.dll',
d / 'msvcp90.dll',
d / 'msvcr90.dll',
winsxs / 'Manifests' / ('%s.manifest' % version),
]
def build(source_dir: pathlib.Path, build_dir: pathlib.Path, def build(source_dir: pathlib.Path, build_dir: pathlib.Path,
python_exe: pathlib.Path, iscc_exe: pathlib.Path, python_exe: pathlib.Path, iscc_exe: pathlib.Path,
version=None): version=None):
"""Build the Inno installer. """Build the Inno installer.
Build files will be placed in ``build_dir``. Build files will be placed in ``build_dir``.
py2exe's setup.py doesn't use setuptools. It doesn't have modern logic py2exe's setup.py doesn't use setuptools. It doesn't have modern logic
for finding the Python 2.7 toolchain. So, we require the environment for finding the Python 2.7 toolchain. So, we require the environment
to already be configured with an active toolchain. to already be configured with an active toolchain.
""" """
from hgpackaging.downloads import ( from hgpackaging.downloads import (
download_entry, download_entry,
) )
from hgpackaging.util import ( from hgpackaging.util import (
extract_tar_to_directory, extract_tar_to_directory,
extract_zip_to_directory, extract_zip_to_directory,
find_vc_runtime_files,
) )
if not iscc.exists(): if not iscc.exists():
raise Exception('%s does not exist' % iscc) raise Exception('%s does not exist' % iscc)
if 'VCINSTALLDIR' not in os.environ: if 'VCINSTALLDIR' not in os.environ:
raise Exception('not running from a Visual C++ build environment; ' raise Exception('not running from a Visual C++ build environment; '
'execute the "Visual C++ <version> Command Prompt" ' 'execute the "Visual C++ <version> Command Prompt" '