mercurial-scm/hg-stable: setup.py comparison

comparison setup.py @ 41290:593718ff5844 stable 4.9rc0

merge default into stable for 4.9 release

author	Augie Fackler <augie@google.com>
date	Fri, 18 Jan 2019 13:28:22 -0500
parents	98ce494e104d
children	8427fea04017

comparison

equal deleted inserted replaced

-:fbd168455b26
+:593718ff5844
 raise SystemExit(
 "Couldn't import standard bz2 (incomplete Python install).")
 ispypy = "PyPy" in sys.version
-iswithrustextensions = 'HGWITHRUSTEXT' in os.environ
+hgrustext = os.environ.get('HGWITHRUSTEXT')
+# TODO record it for proper rebuild upon changes
+# (see mercurial/__modulepolicy__.py)
+if hgrustext != 'cpython' and hgrustext is not None:
+hgrustext = 'direct-ffi'
 import ctypes
+import errno
 import stat, subprocess, time
 import re
 import shutil
 import tempfile
 from distutils import log
 # and disable localization for the same reasons.
 hgenv['HGPLAIN'] = '1'
 hgenv['LANGUAGE'] = 'C'
 hgcmd = ['hg']
 # Run a simple "hg log" command just to see if using hg from the user's
-# path works and can successfully interact with this repository.
+# path works and can successfully interact with this repository.  Windows
+# gives precedence to hg.exe in the current directory, so fall back to the
+# python invocation of local hg, where pythonXY.dll can always be found.
 check_cmd = ['log', '-r.', '-Ttest']
-try:
+if os.name != 'nt':
-retcode, out, err = runcmd(hgcmd + check_cmd, hgenv)
+try:
-except EnvironmentError:
+retcode, out, err = runcmd(hgcmd + check_cmd, hgenv)
-retcode = -1
+except EnvironmentError:
-if retcode == 0 and not filterhgerr(err):
+retcode = -1
-return hgcommand(hgcmd, hgenv)
+if retcode == 0 and not filterhgerr(err):
+return hgcommand(hgcmd, hgenv)
 # Fall back to trying the local hg installation.
 hgenv = localhgenv()
 hgcmd = [sys.executable, 'hg']
 try:
 def initialize_options(self):
 self.zstd = True
 return build_ext.initialize_options(self)
 def build_extensions(self):
+ruststandalones = [e for e in self.extensions
+if isinstance(e, RustStandaloneExtension)]
+self.extensions = [e for e in self.extensions
+if e not in ruststandalones]
 # Filter out zstd if disabled via argument.
 if not self.zstd:
 self.extensions = [e for e in self.extensions
 if e.name != 'mercurial.zstd']
+for rustext in ruststandalones:
+rustext.build('' if self.inplace else self.build_lib)
 return build_ext.build_extensions(self)
 def build_extension(self, ext):
 if isinstance(ext, RustExtension):
 'mercurial.cffi',
 'mercurial.hgweb',
 'mercurial.pure',
 'mercurial.thirdparty',
 'mercurial.thirdparty.attr',
-'mercurial.thirdparty.cbor',
-'mercurial.thirdparty.cbor.cbor2',
 'mercurial.thirdparty.zope',
 'mercurial.thirdparty.zope.interface',
 'mercurial.utils',
 'mercurial.revlogutils',
 'mercurial.testing',
 'hgext.fastannotate',
 'hgext.fsmonitor.pywatchman',
 'hgext.infinitepush',
 'hgext.highlight',
 'hgext.largefiles', 'hgext.lfs', 'hgext.narrow',
+'hgext.remotefilelog',
 'hgext.zeroconf', 'hgext3rd',
 'hgdemandimport']
 if sys.version_info[0] == 2:
 packages.extend(['mercurial.thirdparty.concurrent',
 'mercurial.thirdparty.concurrent.futures'])
 'mercurial/thirdparty/xdiff/xprepare.h',
 'mercurial/thirdparty/xdiff/xtypes.h',
 'mercurial/thirdparty/xdiff/xutils.h',
 ]
+class RustCompilationError(CCompilerError):
+"""Exception class for Rust compilation errors."""
 class RustExtension(Extension):
-"""A C Extension, conditionnally enhanced with Rust code.
+"""Base classes for concrete Rust Extension classes.
-if iswithrustextensions is False, does nothing else than plain Extension
 """
 rusttargetdir = os.path.join('rust', 'target', 'release')
-def __init__(self, mpath, sources, rustlibname, subcrate, **kw):
+def __init__(self, mpath, sources, rustlibname, subcrate,
+py3_features=None, **kw):
 Extension.__init__(self, mpath, sources, **kw)
-if not iswithrustextensions:
+if hgrustext is None:
 return
 srcdir = self.rustsrcdir = os.path.join('rust', subcrate)
-self.libraries.append(rustlibname)
+self.py3_features = py3_features
-self.extra_compile_args.append('-DWITH_RUST')
 # adding Rust source and control files to depends so that the extension
 # gets rebuilt if they've changed
 self.depends.append(os.path.join(srcdir, 'Cargo.toml'))
 cargo_lock = os.path.join(srcdir, 'Cargo.lock')
 self.depends.extend(os.path.join(dirpath, fname)
 for fname in fnames
 if os.path.splitext(fname)[1] == '.rs')
 def rustbuild(self):
-if not iswithrustextensions:
+if hgrustext is None:
 return
 env = os.environ.copy()
 if 'HGTEST_RESTOREENV' in env:
 # Mercurial tests change HOME to a temporary directory,
 # but, if installed with rustup, the Rust toolchain needs
 # Unix only fix (os.path.expanduser not really reliable if
 # HOME is shadowed like this)
 import pwd
 env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir
-subprocess.check_call(['cargo', 'build', '-vv', '--release'],
+cargocmd = ['cargo', 'build', '-vv', '--release']
-env=env, cwd=self.rustsrcdir)
+if sys.version_info[0] == 3 and self.py3_features is not None:
+cargocmd.extend(('--features', self.py3_features,
+'--no-default-features'))
+try:
+subprocess.check_call(cargocmd, env=env, cwd=self.rustsrcdir)
+except OSError as exc:
+if exc.errno == errno.ENOENT:
+raise RustCompilationError("Cargo not found")
+elif exc.errno == errno.EACCES:
+raise RustCompilationError(
+"Cargo found, but permisssion to execute it is denied")
+else:
+raise
+except subprocess.CalledProcessError:
+raise RustCompilationError(
+"Cargo failed. Working directory: %r, "
+"command: %r, environment: %r" % (self.rustsrcdir, cmd, env))
+class RustEnhancedExtension(RustExtension):
+"""A C Extension, conditionally enhanced with Rust code.
+If the HGRUSTEXT environment variable is set to something else
+than 'cpython', the Rust sources get compiled and linked within the
+C target shared library object.
+"""
+def __init__(self, mpath, sources, rustlibname, subcrate, **kw):
+RustExtension.__init__(self, mpath, sources, rustlibname, subcrate,
+**kw)
+if hgrustext != 'direct-ffi':
+return
+self.extra_compile_args.append('-DWITH_RUST')
+self.libraries.append(rustlibname)
 self.library_dirs.append(self.rusttargetdir)
+class RustStandaloneExtension(RustExtension):
+def __init__(self, pydottedname, rustcrate, dylibname, **kw):
+RustExtension.__init__(self, pydottedname, [], dylibname, rustcrate,
+**kw)
+self.dylibname = dylibname
+def build(self, target_dir):
+self.rustbuild()
+target = [target_dir]
+target.extend(self.name.split('.'))
+ext = '.so'  # TODO Unix only
+target[-1] += ext
+shutil.copy2(os.path.join(self.rusttargetdir, self.dylibname + ext),
+os.path.join(*target))
 extmodules = [
 Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'],
 include_dirs=common_include_dirs,
 depends=common_depends),
 depends=common_depends + ['mercurial/bdiff.h'] + xdiff_headers),
 Extension('mercurial.cext.mpatch', ['mercurial/mpatch.c',
 'mercurial/cext/mpatch.c'],
 include_dirs=common_include_dirs,
 depends=common_depends),
-RustExtension('mercurial.cext.parsers', ['mercurial/cext/charencode.c',
+RustEnhancedExtension(
-'mercurial/cext/dirs.c',
+'mercurial.cext.parsers', ['mercurial/cext/charencode.c',
-'mercurial/cext/manifest.c',
+'mercurial/cext/dirs.c',
-'mercurial/cext/parsers.c',
+'mercurial/cext/manifest.c',
-'mercurial/cext/pathencode.c',
+'mercurial/cext/parsers.c',
-'mercurial/cext/revlog.c'],
+'mercurial/cext/pathencode.c',
-'hgdirectffi',
+'mercurial/cext/revlog.c'],
-'hg-direct-ffi',
+'hgdirectffi',
-include_dirs=common_include_dirs,
+'hg-direct-ffi',
-depends=common_depends + ['mercurial/cext/charencode.h',
+include_dirs=common_include_dirs,
-'mercurial/rust/src/lib.rs',
+depends=common_depends + ['mercurial/cext/charencode.h',
-'mercurial/rust/src/ancestors.rs',
+'mercurial/cext/revlog.h',
-'mercurial/rust/src/cpython.rs']),
+'rust/hg-core/src/ancestors.rs',
+'rust/hg-core/src/lib.rs']),
 Extension('mercurial.cext.osutil', ['mercurial/cext/osutil.c'],
 include_dirs=common_include_dirs,
 extra_compile_args=osutil_cflags,
 extra_link_args=osutil_ldflags,
 depends=common_depends),
 'mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.c',
 ]),
 Extension('hgext.fsmonitor.pywatchman.bser',
 ['hgext/fsmonitor/pywatchman/bser.c']),
 ]
+if hgrustext == 'cpython':
+extmodules.append(
+RustStandaloneExtension('mercurial.rustext', 'hg-cpython', 'librusthg',
+py3_features='python3')
+)
 sys.path.insert(0, 'contrib/python-zstandard')
 import setup_zstd
 extmodules.append(setup_zstd.get_c_extension(
 name='mercurial.zstd',

Mercurial > public > mercurial-scm > hg-stable

comparison setup.py @ 41290:593718ff5844 stable 4.9rc0