This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6093

setup: properly install build_hgextindex for py2exe builds
ClosedPublic

Authored by indygreg on Mar 8 2019, 1:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGac32e04e887f: setup: properly install build_hgextindex for py2exe builds
Summary

Because the hgbuild class has a private copy of build.sub_commands,
modifying build.sub_commands from this code effectively resulted
in a no-op. Registering the sub-command on hgbuild actually results
in the sub-command running when building Mercurial.

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 8 2019, 1:49 PM
Closed by commit rHGac32e04e887f: setup: properly install build_hgextindex for py2exe builds (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
Msetup.py (6 lines)

Diff 14448

setup.py

if issetuptools: if issetuptools:
extra['python_requires'] = supportedpy extra['python_requires'] = supportedpy
if py2exeloaded: if py2exeloaded:
extra['console'] = [ extra['console'] = [
{'script':'hg', {'script':'hg',
'copyright':'Copyright (C) 2005-2019 Matt Mackall and others', 'copyright':'Copyright (C) 2005-2019 Matt Mackall and others',
'product_version':version}] 'product_version':version}]
# sub command of 'build' because 'py2exe' does not handle sub_commands # Sub command of 'build' because 'py2exe' does not handle sub_commands.
build.sub_commands.insert(0, ('build_hgextindex', None)) # Need to override hgbuild because it has a private copy of
# build.sub_commands.
hgbuild.sub_commands.insert(0, ('build_hgextindex', None))
# put dlls in sub directory so that they won't pollute PATH # put dlls in sub directory so that they won't pollute PATH
extra['zipfile'] = 'lib/library.zip' extra['zipfile'] = 'lib/library.zip'
# We allow some configuration to be supplemented via environment # We allow some configuration to be supplemented via environment
# variables. This is better than setup.cfg files because it allows # variables. This is better than setup.cfg files because it allows
# supplementing configs instead of replacing them. # supplementing configs instead of replacing them.
extrapackages = os.environ.get('HG_PY2EXE_EXTRA_PACKAGES') extrapackages = os.environ.get('HG_PY2EXE_EXTRA_PACKAGES')
if extrapackages: if extrapackages: