This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7169

packaging: remove hg-ssh.8.html from Inno installer
ClosedPublic

Authored by indygreg on Oct 23 2019, 9:54 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa2f28a8746bf: packaging: remove hg-ssh.8.html from Inno installer
Summary

We don't ship hg-ssh because it requires a python.exe to
run, which we don't ship. So it doesn't make sense to ship
the HTML documentation for this tool.

This change makes the Inno install layout more consistent
with WiX, which doesn't ship this file.

Functionality for removing files has been made generic,
in anticipation of future expansion.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Oct 23 2019, 9:54 PM
indygreg updated this revision to Diff 17403.Oct 24 2019, 11:34 PM
indygreg added a commit: rHGa2f28a8746bf: packaging: remove hg-ssh.8.html from Inno installer.Nov 11 2019, 4:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGa2f28a8746bf: packaging: remove hg-ssh.8.html from Inno installer (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 17403

contrib/packaging/hgpackaging/py2exe.py

('mercurial/help/**/*.txt', 'help/'), ('mercurial/help/**/*.txt', 'help/'),
('mercurial/default.d/*.rc', 'hgrc.d/'), ('mercurial/default.d/*.rc', 'hgrc.d/'),
('mercurial/locale/**/*', 'locale/'), ('mercurial/locale/**/*', 'locale/'),
('mercurial/templates/**/*', 'Templates/'), ('mercurial/templates/**/*', 'Templates/'),
('CONTRIBUTORS', 'Contributors.txt'), ('CONTRIBUTORS', 'Contributors.txt'),
('COPYING', 'Copying.txt'), ('COPYING', 'Copying.txt'),
] ]
# List of paths to exclude from the staging area.
STAGING_EXCLUDES = [
'doc/hg-ssh.8.html',
]
def build_py2exe( def build_py2exe(
source_dir: pathlib.Path, source_dir: pathlib.Path,
build_dir: pathlib.Path, build_dir: pathlib.Path,
python_exe: pathlib.Path, python_exe: pathlib.Path,
build_name: str, build_name: str,
venv_requirements_txt: pathlib.Path, venv_requirements_txt: pathlib.Path,
extra_packages=None, extra_packages=None,
def stage_install(source_dir: pathlib.Path, staging_dir: pathlib.Path): def stage_install(source_dir: pathlib.Path, staging_dir: pathlib.Path):
"""Copy all files to be installed to a directory. """Copy all files to be installed to a directory.
This allows packaging to simply walk a directory tree to find source This allows packaging to simply walk a directory tree to find source
files. files.
""" """
process_install_rules(STAGING_RULES, source_dir, staging_dir) process_install_rules(STAGING_RULES, source_dir, staging_dir)
# Purge any files we don't want to be there.
for f in STAGING_EXCLUDES:
p = staging_dir / f
if p.exists():
print('removing %s' % p)
p.unlink()