Patchwork [1,of,6] setup: fix path of rust source dependencies

login
register
mail settings
Submitter Yuya Nishihara
Date Dec. 5, 2018, 1:43 p.m.
Message ID <b5ddfb2991c8c41b2e9e.1544017412@mimosa>
Download mbox | patch
Permalink /patch/36974/
State Accepted
Headers show

Comments

Yuya Nishihara - Dec. 5, 2018, 1:43 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1543754023 -32400
#      Sun Dec 02 21:33:43 2018 +0900
# Node ID b5ddfb2991c8c41b2e9e22e920afd57c80d9153c
# Parent  9cec7a36bab8578d10335fe6df63704cf0722a0e
setup: fix path of rust source dependencies

Appears that they were screwed up while moving the source files around.
Since rust-direct-ffi sources are automatically added to the depends list,
we only need to list hg-core sources.

Patch

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -968,9 +968,8 @@  extmodules = [
                   'hg-direct-ffi',
                   include_dirs=common_include_dirs,
                   depends=common_depends + ['mercurial/cext/charencode.h',
-                                            'mercurial/rust/src/lib.rs',
-                                            'mercurial/rust/src/ancestors.rs',
-                                            '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,