This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8061

packaging: bundle the default mercurial.ini template with Inno also
ClosedPublic

Authored by mharbison72 on Feb 1 2020, 1:48 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa8786727e478: packaging: bundle the default mercurial.ini template with Inno also
Summary

This is a step towards converging on the same installer content on Windows.

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.

Revision Contents
Changeset List

Diff 19821

contrib/packaging/hgpackaging/inno.py

from .py2exe import ( from .py2exe import (
build_py2exe, build_py2exe,
stage_install, stage_install,
) )
from .util import ( from .util import (
find_vc_runtime_files, find_vc_runtime_files,
normalize_windows_version, normalize_windows_version,
process_install_rules,
read_version_py, read_version_py,
) )
EXTRA_PACKAGES = { EXTRA_PACKAGES = {
'dulwich', 'dulwich',
'keyring', 'keyring',
'pygments', 'pygments',
'win32ctypes', 'win32ctypes',
} }
EXTRA_INSTALL_RULES = [
('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'),
]
PACKAGE_FILES_METADATA = { PACKAGE_FILES_METADATA = {
'ReadMe.html': 'Flags: isreadme', 'ReadMe.html': 'Flags: isreadme',
} }
def build( def build(
source_dir: pathlib.Path, source_dir: pathlib.Path,
build_dir: pathlib.Path, build_dir: pathlib.Path,
# pristine. # pristine.
if staging_dir.exists(): if staging_dir.exists():
print('purging %s' % staging_dir) print('purging %s' % staging_dir)
shutil.rmtree(staging_dir) shutil.rmtree(staging_dir)
# Now assemble all the packaged files into the staging directory. # Now assemble all the packaged files into the staging directory.
stage_install(source_dir, staging_dir) stage_install(source_dir, staging_dir)
# We also install some extra files.
process_install_rules(EXTRA_INSTALL_RULES, source_dir, staging_dir)
# 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 = staging_dir / basename dest_path = staging_dir / basename