This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9857

packaging: include `windows_curses` when building py2exe
ClosedPublic

Authored by mharbison72 on Jan 24 2021, 8:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5b747aa1b2be: packaging: include `windows_curses` when building py2exe
Summary

The _curses.pyd module was previously being included by py2exe's module
search, but it left out _curses_panel.pyd.

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

mharbison72 created this revision.Jan 24 2021, 8:33 PM
mharbison72 added a commit: rHG5b747aa1b2be: packaging: include `windows_curses` when building py2exe.Jan 26 2021, 5:27 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5b747aa1b2be: packaging: include `windows_curses` when building py2exe (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25286

contrib/packaging/hgpackaging/inno.py

EXTRA_PACKAGES = { EXTRA_PACKAGES = {
'dulwich', 'dulwich',
'keyring', 'keyring',
'pygments', 'pygments',
'win32ctypes', 'win32ctypes',
} }
EXTRA_INCLUDES = {
'_curses',
'_curses_panel',
}
EXTRA_INSTALL_RULES = [ EXTRA_INSTALL_RULES = [
('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'), ('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'),
] ]
PACKAGE_FILES_METADATA = { PACKAGE_FILES_METADATA = {
'ReadMe.html': 'Flags: isreadme', 'ReadMe.html': 'Flags: isreadme',
} }
build_py2exe( build_py2exe(
source_dir, source_dir,
build_dir, build_dir,
python_exe, python_exe,
'inno', 'inno',
requirements_txt, requirements_txt,
extra_packages=EXTRA_PACKAGES, extra_packages=EXTRA_PACKAGES,
extra_includes=EXTRA_INCLUDES,
) )
# Purge the staging directory for every build so packaging is # Purge the staging directory for every build so packaging is
# 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)

contrib/packaging/hgpackaging/wix.py

EXTRA_PACKAGES = { EXTRA_PACKAGES = {
'dulwich', 'dulwich',
'distutils', 'distutils',
'keyring', 'keyring',
'pygments', 'pygments',
'win32ctypes', 'win32ctypes',
} }
EXTRA_INCLUDES = {
'_curses',
'_curses_panel',
}
EXTRA_INSTALL_RULES = [ EXTRA_INSTALL_RULES = [
('contrib/packaging/wix/COPYING.rtf', 'COPYING.rtf'), ('contrib/packaging/wix/COPYING.rtf', 'COPYING.rtf'),
('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'), ('contrib/win32/mercurial.ini', 'defaultrc/mercurial.rc'),
] ]
STAGING_REMOVE_FILES = [ STAGING_REMOVE_FILES = [
# We use the RTF variant. # We use the RTF variant.
build_py2exe( build_py2exe(
source_dir, source_dir,
hg_build_dir, hg_build_dir,
python_exe, python_exe,
'wix', 'wix',
requirements_txt, requirements_txt,
extra_packages=EXTRA_PACKAGES, extra_packages=EXTRA_PACKAGES,
extra_packages_script=extra_packages_script, extra_packages_script=extra_packages_script,
extra_includes=EXTRA_INCLUDES,
) )
build_dir = hg_build_dir / ('wix-%s' % arch) build_dir = hg_build_dir / ('wix-%s' % arch)
staging_dir = build_dir / 'stage' staging_dir = build_dir / 'stage'
build_dir.mkdir(exist_ok=True) build_dir.mkdir(exist_ok=True)
# Purge the staging directory for every build so packaging is pristine. # Purge the staging directory for every build so packaging is pristine.