Comments
Patch
@@ -308,37 +308,23 @@ class hgbuildpy(build_py):
if convert2to3:
fixer_names = sorted(set(getfixers("lib2to3.fixes") +
getfixers("hgfixes")))
def finalize_options(self):
build_py.finalize_options(self)
if self.distribution.pure:
- if self.py_modules is None:
- self.py_modules = []
- for ext in self.distribution.ext_modules:
- if ext.name.startswith("mercurial."):
- self.py_modules.append("mercurial.pure.%s" % ext.name[10:])
self.distribution.ext_modules = []
else:
h = os.path.join(get_python_inc(), 'Python.h')
if not os.path.exists(h):
raise SystemExit('Python headers are required to build '
'Mercurial but weren\'t found in %s' % h)
- def find_modules(self):
- modules = build_py.find_modules(self)
- for module in modules:
- if module[0] == "mercurial.pure":
- if module[1] != "__init__":
- yield ("mercurial", module[1], module[2])
- else:
- yield module
-
class buildhgextindex(Command):
description = 'generate prebuilt index of hgext (for frozen package)'
user_options = []
_indexfilename = 'hgext/__index__.py'
def initialize_options(self):
pass
@@ -395,20 +381,33 @@ class hginstalllib(install_lib):
system has a umask of something like 027, preserving the permissions when
copying will lead to a broken install.
Note that just passing keep_permissions=False to copy_file would be
insufficient, as it might still be applying a umask.
'''
def run(self):
+ if self.distribution.pure:
+ modulepolicy = 'py'
+ else:
+ modulepolicy = 'c'
+
realcopyfile = file_util.copy_file
def copyfileandsetmode(*args, **kwargs):
src, dst = args[0], args[1]
dst, copied = realcopyfile(*args, **kwargs)
+
+ if dst.endswith('__init__.py'):
+ content = open(dst, 'rb').read()
+ content = content.replace(b'@MODULELOADPOLICY@',
+ modulepolicy.encode(libdir_escape))
+ with open(dst, 'wb') as fh:
+ fh.write(content)
+
if copied:
st = os.stat(src)
# Persist executable bit (apply it to group and other if user
# has it)
if st[stat.ST_MODE] & stat.S_IXUSR:
setmode = int('0755', 8)
else:
setmode = int('0644', 8)
@@ -473,16 +472,17 @@ cmdclass = {'build': hgbuild,
'build_py': hgbuildpy,
'build_hgextindex': buildhgextindex,
'install_lib': hginstalllib,
'install_scripts': hginstallscripts,
'build_hgexe': buildhgexe,
}
packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient',
+ 'mercurial.pure',
'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf',
'hgext.largefiles']
common_depends = ['mercurial/util.h']
osutil_ldflags = []
if sys.platform == 'darwin':