| hg-reviewers |
Before this changeset, the shared library objects suffixes
were both (rustc output and Python input) hardcoded to '.so',
which is wrong for Python3 and non Linux targets.
Also, MacOSX needs special link flags, as stated in
the README of rust-cpython.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| //! >>> ancestor.__doc__ | //! >>> ancestor.__doc__ | ||||
| //! 'Generic DAG ancestor algorithms - Rust implementation' | //! 'Generic DAG ancestor algorithms - Rust implementation' | ||||
| //! ``` | //! ``` | ||||
| #[macro_use] | #[macro_use] | ||||
| extern crate cpython; | extern crate cpython; | ||||
| extern crate hg; | extern crate hg; | ||||
| extern crate libc; | extern crate libc; | ||||
| extern crate python27_sys; | |||||
| pub mod ancestors; | pub mod ancestors; | ||||
| mod cindex; | mod cindex; | ||||
| mod conversion; | mod conversion; | ||||
| pub mod dagops; | pub mod dagops; | ||||
| pub mod discovery; | pub mod discovery; | ||||
| pub mod exceptions; | pub mod exceptions; | ||||
| pub mod dirstate; | pub mod dirstate; | ||||
| '!=3.5.0', | '!=3.5.0', | ||||
| '!=3.5.1', | '!=3.5.1', | ||||
| '!=3.5.2', | '!=3.5.2', | ||||
| '!=3.6.0', | '!=3.6.0', | ||||
| '!=3.6.1', | '!=3.6.1', | ||||
| ]) | ]) | ||||
| import sys, platform | import sys, platform | ||||
| import sysconfig | |||||
| if sys.version_info[0] >= 3: | if sys.version_info[0] >= 3: | ||||
| printf = eval('print') | printf = eval('print') | ||||
| libdir_escape = 'unicode_escape' | libdir_escape = 'unicode_escape' | ||||
| def sysstr(s): | def sysstr(s): | ||||
| return s.decode('latin-1') | return s.decode('latin-1') | ||||
| else: | else: | ||||
| libdir_escape = 'string_escape' | libdir_escape = 'string_escape' | ||||
| def printf(*args, **kwargs): | def printf(*args, **kwargs): | ||||
| See https://www.mercurial-scm.org/wiki/Python3 for more on Mercurial's | See https://www.mercurial-scm.org/wiki/Python3 for more on Mercurial's | ||||
| Python 3 support. | Python 3 support. | ||||
| """.format(py='.'.join('%d' % x for x in sys.version_info[0:2])) | """.format(py='.'.join('%d' % x for x in sys.version_info[0:2])) | ||||
| printf(error, file=sys.stderr) | printf(error, file=sys.stderr) | ||||
| sys.exit(1) | sys.exit(1) | ||||
| if sys.version_info[0] >= 3: | |||||
| DYLIB_SUFFIX = sysconfig.get_config_vars()['EXT_SUFFIX'] | |||||
| else: | |||||
| # deprecated in Python 3 | |||||
| DYLIB_SUFFIX = sysconfig.get_config_vars()['SO'] | |||||
| # Solaris Python packaging brain damage | # Solaris Python packaging brain damage | ||||
| try: | try: | ||||
| import hashlib | import hashlib | ||||
| sha = hashlib.sha1() | sha = hashlib.sha1() | ||||
| except ImportError: | except ImportError: | ||||
| try: | try: | ||||
| import sha | import sha | ||||
| sha.sha # silence unused import warning | sha.sha # silence unused import warning | ||||
| cargo_lock = os.path.join(srcdir, 'Cargo.lock') | cargo_lock = os.path.join(srcdir, 'Cargo.lock') | ||||
| if os.path.exists(cargo_lock): | if os.path.exists(cargo_lock): | ||||
| self.depends.append(cargo_lock) | self.depends.append(cargo_lock) | ||||
| for dirpath, subdir, fnames in os.walk(os.path.join(srcdir, 'src')): | for dirpath, subdir, fnames in os.walk(os.path.join(srcdir, 'src')): | ||||
| self.depends.extend(os.path.join(dirpath, fname) | self.depends.extend(os.path.join(dirpath, fname) | ||||
| for fname in fnames | for fname in fnames | ||||
| if os.path.splitext(fname)[1] == '.rs') | if os.path.splitext(fname)[1] == '.rs') | ||||
| @staticmethod | |||||
| def rustdylibsuffix(): | |||||
| """Return the suffix for shared libraries produced by rustc. | |||||
| See also: https://doc.rust-lang.org/reference/linkage.html | |||||
| """ | |||||
| if sys.platform == 'darwin': | |||||
| return '.dylib' | |||||
| elif os.name == 'nt': | |||||
| return '.dll' | |||||
| else: | |||||
| return '.so' | |||||
| def rustbuild(self): | def rustbuild(self): | ||||
| if hgrustext is None: | if hgrustext is None: | ||||
| return | return | ||||
| env = os.environ.copy() | env = os.environ.copy() | ||||
| if 'HGTEST_RESTOREENV' in env: | if 'HGTEST_RESTOREENV' in env: | ||||
| # Mercurial tests change HOME to a temporary directory, | # Mercurial tests change HOME to a temporary directory, | ||||
| # but, if installed with rustup, the Rust toolchain needs | # but, if installed with rustup, the Rust toolchain needs | ||||
| # HOME to be correct (otherwise the 'no default toolchain' | # HOME to be correct (otherwise the 'no default toolchain' | ||||
| # error message is issued and the build fails). | # error message is issued and the build fails). | ||||
| # This happens currently with test-hghave.t, which does | # This happens currently with test-hghave.t, which does | ||||
| # invoke this build. | # invoke this build. | ||||
| # Unix only fix (os.path.expanduser not really reliable if | # Unix only fix (os.path.expanduser not really reliable if | ||||
| # HOME is shadowed like this) | # HOME is shadowed like this) | ||||
| import pwd | import pwd | ||||
| env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir | env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir | ||||
| cargocmd = ['cargo', 'build', '-vv', '--release'] | cargocmd = ['cargo', 'build', '-vv', '--release'] | ||||
| if sys.version_info[0] == 3 and self.py3_features is not None: | if sys.version_info[0] == 3 and self.py3_features is not None: | ||||
| cargocmd.extend(('--features', self.py3_features, | cargocmd.extend(('--features', self.py3_features, | ||||
| '--no-default-features')) | '--no-default-features')) | ||||
| if sys.platform == 'darwin': | |||||
| env['RUSTFLAGS'] = ("-C link-arg=-undefined " | |||||
| "-C link-arg=dynamic_lookup") | |||||
| try: | try: | ||||
| subprocess.check_call(cargocmd, env=env, cwd=self.rustsrcdir) | subprocess.check_call(cargocmd, env=env, cwd=self.rustsrcdir) | ||||
| except OSError as exc: | except OSError as exc: | ||||
| if exc.errno == errno.ENOENT: | if exc.errno == errno.ENOENT: | ||||
| raise RustCompilationError("Cargo not found") | raise RustCompilationError("Cargo not found") | ||||
| elif exc.errno == errno.EACCES: | elif exc.errno == errno.EACCES: | ||||
| raise RustCompilationError( | raise RustCompilationError( | ||||
| "Cargo found, but permisssion to execute it is denied") | "Cargo found, but permisssion to execute it is denied") | ||||
| RustExtension.__init__(self, pydottedname, [], dylibname, rustcrate, | RustExtension.__init__(self, pydottedname, [], dylibname, rustcrate, | ||||
| **kw) | **kw) | ||||
| self.dylibname = dylibname | self.dylibname = dylibname | ||||
| def build(self, target_dir): | def build(self, target_dir): | ||||
| self.rustbuild() | self.rustbuild() | ||||
| target = [target_dir] | target = [target_dir] | ||||
| target.extend(self.name.split('.')) | target.extend(self.name.split('.')) | ||||
| ext = '.so' # TODO Unix only | target[-1] += DYLIB_SUFFIX | ||||
| target[-1] += ext | shutil.copy2(os.path.join(self.rusttargetdir, | ||||
| shutil.copy2(os.path.join(self.rusttargetdir, self.dylibname + ext), | self.dylibname + self.rustdylibsuffix()), | ||||
| os.path.join(*target)) | os.path.join(*target)) | ||||
| extmodules = [ | extmodules = [ | ||||
| Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'], | Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'], | ||||
| include_dirs=common_include_dirs, | include_dirs=common_include_dirs, | ||||
| depends=common_depends), | depends=common_depends), | ||||
| Extension('mercurial.cext.bdiff', ['mercurial/bdiff.c', | Extension('mercurial.cext.bdiff', ['mercurial/bdiff.c', | ||||