Fix depenedncy to force libra-swarm use local client implementation.

Author: Yucong Sun

.circleci/config.yml

@@ -11,13 +11,18 @@ jobs:
           command: |
             sudo sh -c 'echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list'
             sudo apt-get update
-            sudo apt-get -t stretch-backports install cmake python3-dev python3-venv clang llvm
+            sudo apt-get -t stretch-backports install cmake python3-dev python3-venv clang llvm libjemalloc-dev
       - run:
           name: Build everything
           command: |
             ./build.sh
       - run:
-          name: Build Python stuff
+          name: Test Rust Client
+          command: |
+            cd rust
+            ./test.sh
+      - run:
+          name: Test Python stuff
           command: |
             cd python
             ./test.sh

CMakeLists.txt

@@ -2,5 +2,4 @@ cmake_minimum_required(VERSION 3.7)
 
 project(libra-client-dev)
 
-add_subdirectory(c)
 add_subdirectory(cpp)

build.sh

@@ -18,8 +18,6 @@ mkdir build
 cd build
 cmake ..
 make VERBOSE=1
-
 # Test!
-cd rust && ./test.sh && cd ..
-./c/c-client
-./cpp/cpp-client
+./cpp/cpp-client
+cd ..

c/CMakeLists.txt

@@ -25,8 +25,8 @@ serde = { version = "1.0.96", features = ["derive"] }
 serde_json = "1.0.40"
 structopt = "0.3.2"
 
-# Libra C API, that is all we should need!
-libra-dev = { path="../libra-dev" }
+# TODO: this actually doesn't work, havn't figure out an way to link against an staticlib dependency yet.
+# libra-dev = { path="../libra-dev" }
 
 # All Libra dependencies, The goal is to remove this section down to zero!
 # S0: Core types
@@ -58,4 +58,8 @@ compiler = { git = "https://github.com/libra/libra.git", branch = "testnet" }
 
 [features]
 default = []
-fuzzing = ["proptest", "libra-crypto/fuzzing", "fixme-libra-types/fuzzing"]
+fuzzing = ["proptest", "libra-crypto/fuzzing", "fixme-libra-types/fuzzing"]
+
+# Override depenedency to use local client implementation.
+[patch."https://github.com/libra/libra.git"]
+client = { path = "./" }

c/main.c

@@ -2,7 +2,7 @@ use std::env;
 use std::path::PathBuf;
 
 fn main() {
-    println!("cargo:rustc-link-lib=libra_dev");
+    println!("cargo:rustc-link-lib=static=libra_dev");
     println!("cargo:rustc-link-search=native=../libra-dev/target/debug/");
 
     // Tell cargo to invalidate the built crate whenever the wrapper changes