This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6064

setup: include additional packages in py2exe distribution
ClosedPublic

Authored by indygreg on Mar 3 2019, 6:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGed35057421ae: setup: include additional packages in py2exe distribution
Summary

I'm attempting to reproduce the Inno installers on my local
machine. As part of auditing differences between installer output,
I noticed that the existing Inno installers include various 3rd
party packages.

There is no mention of this in the build instructions nor on
the wiki. This must be something that is done by the installer
producer.

This commit teaches setup.py to include these 3rd party packages
in py2exe's library. After this change, I am able to produce
Inno installers that have a nearly identical set of Python
modules.

It's worth noting that pywin32 is included even though it
probably shouldn't be. But including it is necessary in order
to achieve parity with existing Inno installers.

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 3 2019, 6:51 PM
Closed by commit rHGed35057421ae: setup: include additional packages in py2exe distribution (authored by indygreg). · Explain WhyMar 5 2019, 10:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (51 lines)

Diff 14366

setup.py

# unicode on Python 2 still works because it won't contain any # unicode on Python 2 still works because it won't contain any
# non-ascii bytes and will be implicitly converted back to bytes # non-ascii bytes and will be implicitly converted back to bytes
# when operated on. # when operated on.
assert isinstance(version, bytes) assert isinstance(version, bytes)
setupversion = version.decode('ascii') setupversion = version.decode('ascii')
extra = {} extra = {}
py2exepackages = [
'hgdemandimport',
'hgext',
'email',
# implicitly imported per module policy
# (cffi wouldn't be used as a frozen exe)
'mercurial.cext',
#'mercurial.cffi',
'mercurial.pure',
]
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)) build.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'
try:
import dulwich
dulwich.__version__
py2exepackages.append('dulwich')
except ImportError:
pass
try:
import keyring
keyring.util
py2exepackages.append('keyring')
except ImportError:
pass
try:
import pygments
pygments.__version__
py2exepackages.append('pygments')
except ImportError:
pass
try:
import pywintypes
pywintypes.TRUE
py2exepackages.append('pywintypes')
except ImportError:
pass
if os.name == 'nt': if os.name == 'nt':
# Windows binary file versions for exe/dll files must have the # Windows binary file versions for exe/dll files must have the
# form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535 # form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535
setupversion = setupversion.split(r'+', 1)[0] setupversion = setupversion.split(r'+', 1)[0]
if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'): if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[1].splitlines() version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[1].splitlines()
if version: if version:
packages=packages, packages=packages,
ext_modules=extmodules, ext_modules=extmodules,
data_files=datafiles, data_files=datafiles,
package_data=packagedata, package_data=packagedata,
cmdclass=cmdclass, cmdclass=cmdclass,
distclass=hgdist, distclass=hgdist,
options={ options={
'py2exe': { 'py2exe': {
'packages': [ 'packages': py2exepackages,
'hgdemandimport',
'hgext',
'email',
# implicitly imported per module policy
# (cffi wouldn't be used as a frozen exe)
'mercurial.cext',
#'mercurial.cffi',
'mercurial.pure',
],
}, },
'bdist_mpkg': { 'bdist_mpkg': {
'zipdist': False, 'zipdist': False,
'license': 'COPYING', 'license': 'COPYING',
'readme': 'contrib/packaging/macosx/Readme.html', 'readme': 'contrib/packaging/macosx/Readme.html',
'welcome': 'contrib/packaging/macosx/Welcome.html', 'welcome': 'contrib/packaging/macosx/Welcome.html',
}, },
}, },
**extra) **extra)