Build libredisearch.a dependency

Author: gavrie

.circleci/config.yml

@@ -13,7 +13,7 @@ jobs:
 
       - run:
           name: Install prerequisite
-          command: sudo apt-get install -y clang llvm
+          command: sudo apt-get install -y clang llvm cmake
 
       - restore_cache:
           keys:

Cargo.toml

@@ -21,4 +21,4 @@ redismodule = { git = "https://github.com/RedisLabsModules/redismodule-rs.git",
 
 [build-dependencies]
 bindgen = "0.51"
-cc = "1.0"
+cmake = "0.1"

README.md

@@ -12,19 +12,12 @@ TODO:
 
 ## Building
 
-```
-git clone https://github.com/RedisLabsModules/redismodule-rs.git
-git clone https://github.com/RediSearch/redisearch-api-rs.git
-cd redisearch-api-rs
-cargo build
-```
+    cargo build
 
 On macOS:
-- `brew install llvm`
 
-* Make sure you have `libredisearch.a` built. This will be done automatically in the future.
-For more details see: https://github.com/RediSearch/RediSearch
+    brew install llvm
 
 ### Build example
 
-`cargo build --example hello_redisearch`
+    cargo build --example hello_redisearch

build.rs

@@ -1,7 +1,6 @@
 extern crate bindgen;
-extern crate cc;
 
-use std::env;
+use cmake::Config;
 
 fn main() {
     // Generate bindings for RediSearch
@@ -21,21 +20,15 @@ fn main() {
         .expect("failed to write RediSearch bindings to file");
 
     // Find and link statically to libredisearch.a
+    // TODO: Consider splitting the low level libredisearch wrapper off into a separate `-sys` crate.
 
-    // TODO: Instead of relying on a pre-built library,
-    // we should build RediSearch as a static lib, like this:
-    //
-    //    mkdir -p build
-    //    cd build
-    //    cmake -DRS_BUILD_STATIC=ON ..
-    //    make
-    //
-    // Take a look at some `-sys` crates for system library wrappers, and build using the
-    // same methods that they use.
-    // In fact, consider splitting this crate into a `-sys` crate for the low level wrappers
-    // and another one for the high-level bindings.
-
-    let lib_search_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-    println!("cargo:rustc-link-search=native={}", lib_search_dir);
+    let mut dst = Config::new("RediSearch")
+        .define("RS_BUILD_STATIC", "ON")
+        .build_target("redisearchS")
+        .build();
+
+    dst.push("build");
+
+    println!("cargo:rustc-link-search=native={}", dst.display());
     println!("cargo:rustc-link-lib=static=redisearch");
 }