Mercurial > hg
comparison setup.py @ 27222:511a4384b033
setup: refactor handling of modules with C/Python implementations
Previously, .py files under mercurial/pure/ were copied to mercurial/*
during installation if we were performing a pure Python installation.
Now that the new import hooks and module load policy are in place, this
hackery from the past is no longer necessary.
With this patch, we stop copying modules from mercurial/pure/* to
mercurial/*. Instead, we preserve the files at their original
hierarchy, mirroring the source repository structure.
In addition, we always install the pure modules. Before, we would only
include the pure modules in the distribution/installation if the
install-time settings requested a pure Python installation. The upside
of this change is that CPython and PyPy can run from the same Mercurial
installation, making packaging and distribution of Mercurial simpler.
The inclusion of pure Python modules in the installation sounds
risky, as it could lead to inadvertent loading of non-C modules.
This shouldn't be a problem. The default module load policy is "C
only" (or at least will be shortly) and the only way to load pure
modules from an installation is if a) pure installation was requested
b) the HGMODULELOADPOLICY overrides the requirement for C modules.
The default module load policy as defined in source is a special string
whose default value from the checkout is equivalent to the "C only"
policy (again, not exactly the state right now). For pure
installations, this default policy is not appropriate and will not
work. This patch adds support for rewriting __init__.py during
installation to reflect the module load policy that should be in
place accoding to the installation settings. For default CPython
installs, the value in the source file will change but there will
be no functional change. For pure installations, the default policy
will be set to "py," allowing them to work without having to set
environment variables.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 03 Dec 2015 21:48:12 -0800 |
parents | 4374d819ccd5 |
children | ed1660ce99d9 |
comparison
equal
deleted
inserted
replaced
27221:ab776610fc6d | 27222:511a4384b033 |
---|---|
311 | 311 |
312 def finalize_options(self): | 312 def finalize_options(self): |
313 build_py.finalize_options(self) | 313 build_py.finalize_options(self) |
314 | 314 |
315 if self.distribution.pure: | 315 if self.distribution.pure: |
316 if self.py_modules is None: | |
317 self.py_modules = [] | |
318 for ext in self.distribution.ext_modules: | |
319 if ext.name.startswith("mercurial."): | |
320 self.py_modules.append("mercurial.pure.%s" % ext.name[10:]) | |
321 self.distribution.ext_modules = [] | 316 self.distribution.ext_modules = [] |
322 else: | 317 else: |
323 h = os.path.join(get_python_inc(), 'Python.h') | 318 h = os.path.join(get_python_inc(), 'Python.h') |
324 if not os.path.exists(h): | 319 if not os.path.exists(h): |
325 raise SystemExit('Python headers are required to build ' | 320 raise SystemExit('Python headers are required to build ' |
326 'Mercurial but weren\'t found in %s' % h) | 321 'Mercurial but weren\'t found in %s' % h) |
327 | 322 |
328 def find_modules(self): | 323 def copy_file(self, *args, **kwargs): |
329 modules = build_py.find_modules(self) | 324 dst, copied = build_py.copy_file(self, *args, **kwargs) |
330 for module in modules: | 325 |
331 if module[0] == "mercurial.pure": | 326 if copied and dst.endswith('__init__.py'): |
332 if module[1] != "__init__": | 327 if self.distribution.pure: |
333 yield ("mercurial", module[1], module[2]) | 328 modulepolicy = 'py' |
334 else: | 329 else: |
335 yield module | 330 modulepolicy = 'c' |
331 content = open(dst, 'rb').read() | |
332 content = content.replace(b'@MODULELOADPOLICY@', | |
333 modulepolicy.encode(libdir_escape)) | |
334 with open(dst, 'wb') as fh: | |
335 fh.write(content) | |
336 | |
337 return dst, copied | |
336 | 338 |
337 class buildhgextindex(Command): | 339 class buildhgextindex(Command): |
338 description = 'generate prebuilt index of hgext (for frozen package)' | 340 description = 'generate prebuilt index of hgext (for frozen package)' |
339 user_options = [] | 341 user_options = [] |
340 _indexfilename = 'hgext/__index__.py' | 342 _indexfilename = 'hgext/__index__.py' |
476 'install_scripts': hginstallscripts, | 478 'install_scripts': hginstallscripts, |
477 'build_hgexe': buildhgexe, | 479 'build_hgexe': buildhgexe, |
478 } | 480 } |
479 | 481 |
480 packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient', | 482 packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient', |
483 'mercurial.pure', | |
481 'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf', | 484 'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf', |
482 'hgext.largefiles'] | 485 'hgext.largefiles'] |
483 | 486 |
484 common_depends = ['mercurial/util.h'] | 487 common_depends = ['mercurial/util.h'] |
485 | 488 |