( )⚙ D6089 packaging: don't use temporary directory

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6089

packaging: don't use temporary directory
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5e923355c595: packaging: don't use temporary directory
Summary

We were no longer doing anything with it after extracting
virtualenv and py2exe to the build directory.

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 rHG5e923355c595: packaging: don't use temporary directory (authored by indygreg). · Explain WhyMar 9 2019, 8:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/hgpackaging/inno.py (110 lines)

Diff 14444

contrib/packaging/hgpackaging/inno.py

# inno.py - Inno Setup functionality. # inno.py - Inno Setup functionality.
# #
# 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 os
import pathlib import pathlib
import shutil import shutil
import subprocess import subprocess
import tempfile
from .downloads import ( from .downloads import (
download_entry, download_entry,
) )
from .util import ( from .util import (
extract_tar_to_directory, extract_tar_to_directory,
extract_zip_to_directory, extract_zip_to_directory,
find_vc_runtime_files, find_vc_runtime_files,
if not virtualenv_src_path.exists(): if not virtualenv_src_path.exists():
extract_tar_to_directory(virtualenv_pkg, build_dir) extract_tar_to_directory(virtualenv_pkg, build_dir)
py2exe_source_path = build_dir / ('py2exe-%s' % py2exe_entry['version']) py2exe_source_path = build_dir / ('py2exe-%s' % py2exe_entry['version'])
if not py2exe_source_path.exists(): if not py2exe_source_path.exists():
extract_zip_to_directory(py2exe_pkg, build_dir) extract_zip_to_directory(py2exe_pkg, build_dir)
with tempfile.TemporaryDirectory() as td:
td = pathlib.Path(td)
if not venv_path.exists(): if not venv_path.exists():
print('creating virtualenv with dependencies') print('creating virtualenv with dependencies')
subprocess.run( subprocess.run(
[str(python_exe), str(virtualenv_py), str(venv_path)], [str(python_exe), str(virtualenv_py), str(venv_path)],
check=True) check=True)
venv_python = venv_path / 'Scripts' / 'python.exe' venv_python = venv_path / 'Scripts' / 'python.exe'
venv_pip = venv_path / 'Scripts' / 'pip.exe' venv_pip = venv_path / 'Scripts' / 'pip.exe'
requirements_txt = (source_dir / 'contrib' / 'packaging' / requirements_txt = (source_dir / 'contrib' / 'packaging' /
'inno' / 'requirements.txt') 'inno' / 'requirements.txt')
subprocess.run([str(venv_pip), 'install', '-r', str(requirements_txt)], subprocess.run([str(venv_pip), 'install', '-r', str(requirements_txt)],
check=True) check=True)
# Force distutils to use VC++ settings from environment, which was # Force distutils to use VC++ settings from environment, which was
# validated above. # validated above.
env = dict(os.environ) env = dict(os.environ)
env['DISTUTILS_USE_SDK'] = '1' env['DISTUTILS_USE_SDK'] = '1'
env['MSSdk'] = '1' env['MSSdk'] = '1'
py2exe_py_path = venv_path / 'Lib' / 'site-packages' / 'py2exe' py2exe_py_path = venv_path / 'Lib' / 'site-packages' / 'py2exe'
if not py2exe_py_path.exists(): if not py2exe_py_path.exists():
print('building py2exe') print('building py2exe')
subprocess.run([str(venv_python), 'setup.py', 'install'], subprocess.run([str(venv_python), 'setup.py', 'install'],
cwd=py2exe_source_path, cwd=py2exe_source_path,
env=env, env=env,
check=True) check=True)
# Register location of msgfmt and other binaries. # Register location of msgfmt and other binaries.
env['PATH'] = '%s%s%s' % ( env['PATH'] = '%s%s%s' % (
env['PATH'], os.pathsep, str(gettext_root / 'bin')) env['PATH'], os.pathsep, str(gettext_root / 'bin'))
print('building Mercurial') print('building Mercurial')
subprocess.run( subprocess.run(
[str(venv_python), 'setup.py', [str(venv_python), 'setup.py',
'py2exe', '-b', '3' if vc_x64 else '2', 'py2exe', '-b', '3' if vc_x64 else '2',
'build_doc', '--html'], 'build_doc', '--html'],
cwd=str(source_dir), cwd=str(source_dir),
env=env, env=env,
check=True) check=True)
# hg.exe depends on VC9 runtime DLLs. Copy those into place. # hg.exe depends on VC9 runtime DLLs. Copy those into place.
for f in find_vc_runtime_files(vc_x64): for f in find_vc_runtime_files(vc_x64):
if f.name.endswith('.manifest'): if f.name.endswith('.manifest'):
basename = 'Microsoft.VC90.CRT.manifest' basename = 'Microsoft.VC90.CRT.manifest'
else: else:
basename = f.name basename = f.name
dest_path = source_dir / 'dist' / basename dest_path = source_dir / 'dist' / basename
print('copying %s to %s' % (f, dest_path)) print('copying %s to %s' % (f, dest_path))
shutil.copyfile(f, dest_path) shutil.copyfile(f, dest_path)
print('creating installer') print('creating installer')
args = [str(iscc_exe)] args = [str(iscc_exe)]
if vc_x64: if vc_x64:
args.append('/dARCH=x64') args.append('/dARCH=x64')
if version: if version:
args.append('/dVERSION=%s' % version) args.append('/dVERSION=%s' % version)
args.append('/Odist') args.append('/Odist')
args.append('contrib/packaging/inno/mercurial.iss') args.append('contrib/packaging/inno/mercurial.iss')
subprocess.run(args, cwd=str(source_dir), check=True) subprocess.run(args, cwd=str(source_dir), check=True)