PR: from dyn to master

.travis.yml

@@ -6,10 +6,11 @@ rust:
   - nightly
 
 before_script:
+  - ./install_dependent_libraries.sh
   - rustup component add clippy-preview
 
 script:
-  - cargo test -- --test-threads=1
+  - cargo test
   - cargo clippy
 
 matrix:
@@ -19,4 +20,6 @@ matrix:
 
 env:
   global:
-  - RUSTFLAGS="-D warnings"
+    - FRUGALOS_DIR=$TRAVIS_BUILD_DIR/frugalos_working_dir
+    - LD_LIBRARY_PATH=$FRUGALOS_DIR/lib
+    - RUSTFLAGS="-D warnings"

Cargo.toml

@@ -2,8 +2,6 @@
 name = "liberasurecode"
 version = "1.0.2"
 authors = ["The FrugalOS Developers"]
-links = "erasurecode"
-build = "build.rs"
 description = "A Rust wrapper for `openstack/liberasurecode`"
 homepage = "https://github.com/frugalos/liberasurecode"
 repository = "https://github.com/frugalos/liberasurecode"

README.md

@@ -29,6 +29,16 @@ For example, on Ubuntu, you can install those by executing the following command
 $ sudo apt install gcc git make automake autoconf libtool
 ```
 
+Before do `cargo build`, please set the two environment variables `FRUGALOS_DIR` and `LD_LIBRARY_PATH`
+```
+FRUGALOS_DIR=/some/path/to/locate/generated/artifacts
+LD_LIBRARY_PATH=$FRUGALOS_DIR/lib
+```
+and do the following shell script to install auxiliary files
+```
+./install_dependent_libraries.sh
+```
+
 
 Examples
 --------

build.rs

@@ -1,37 +1,10 @@
 use std::env;
-use std::fs;
-use std::path::PathBuf;
-use std::process::{Command, Stdio};
 
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
 
-    let outdir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    let build_dir = outdir.join("build");
-    let _ = fs::remove_dir_all(&build_dir);
-    fs::create_dir(&build_dir).unwrap();
+    let frugalos_dir: std::ffi::OsString = env::var_os("FRUGALOS_DIR").unwrap();
+    let frugalos_dir: String = frugalos_dir.into_string().unwrap();
 
-    for file in &["install_deps.sh", "liberasurecode.patch"] {
-        fs::copy(file, build_dir.join(file)).unwrap();
-    }
-
-    match Command::new("./install_deps.sh")
-        .current_dir(&build_dir)
-        .stderr(Stdio::inherit())
-        .output()
-    {
-        Err(e) => {
-            panic!("{}: {}", build_dir.display(), e);
-        }
-        Ok(output) => {
-            if !output.status.success() {
-                panic!(
-                    "./install_deps.sh failed: exit-code={:?}",
-                    output.status.code()
-                );
-            }
-        }
-    }
-
-    println!("cargo:rustc-link-search={}/lib", build_dir.display());
+    println!("cargo:rustc-link-search={}/lib", frugalos_dir);
 }

install_dependent_libraries.sh

@@ -0,0 +1,68 @@
+#! /usr/bin/env bash
+
+set -eux
+
+INSTALL_DIR=""
+
+if [ -z $FRUGALOS_DIR ]
+then
+   echo "Please set the environment FRUGALOS_DIR to install auxiliary artifacts."
+   exit 1
+fi
+
+INSTALL_DIR=$FRUGALOS_DIR
+
+case $INSTALL_DIR in
+    /*)
+	echo "We install dependent artifacts into FRUGALOS_DIR=$FRUGALOS_DIR"
+	;;
+    *)
+	echo "You passed a relative path. Please use an absolute path."
+	exit 1
+	;;
+esac
+
+MAKE_FLAGS=""
+
+# Please try and add other distributions.
+case "$(uname)" in
+    "Linux") MAKE_FLAGS="-j$(nproc)";;
+    "Darwin") MAKE_FLAGS="-j$(sysctl -n hw.ncpu)"
+esac
+
+BUILD_DIR="build_working_directory"
+mkdir $BUILD_DIR
+
+#
+# gf-complete
+#
+git clone https://github.com/ceph/gf-complete.git $BUILD_DIR/gf-complete
+cd $BUILD_DIR/gf-complete
+git checkout a6862d1
+./autogen.sh
+./configure --with-pic --prefix $INSTALL_DIR
+make $MAKE_FLAGS install
+cd ../..
+
+#
+# jerasure
+#
+git clone -b frugalos_dyn https://github.com/frugalos/jerasure.git $BUILD_DIR/jerasure
+cd $BUILD_DIR/jerasure
+autoreconf --force --install
+CFLAGS="-I${INSTALL_DIR}/include" LDFLAGS="-L${INSTALL_DIR}/lib" ./configure --with-pic --prefix $INSTALL_DIR
+make $MAKE_FLAGS install
+cd ../..
+
+#
+# liberasurecode
+#
+git clone -b frugalos_dyn https://github.com/frugalos/openstack_liberasurecode.git $BUILD_DIR/openstack_liberasurecode
+cd $BUILD_DIR/openstack_liberasurecode
+./autogen.sh
+CFLAGS="-I${INSTALL_DIR}/include -I${INSTALL_DIR}/include/jerasure"
+if [ "$(uname)" == "Darwin" ]; then
+    CFLAGS="$CFLAGS -Wno-error=address-of-packed-member"
+fi
+CFLAGS=$CFLAGS LDFLAGS="-L${INSTALL_DIR}/lib" ./configure --with-pic --prefix $INSTALL_DIR
+make $MAKE_FLAGS install

install_deps.sh

@@ -18,32 +18,29 @@ git clone https://github.com/ceph/gf-complete.git
 cd gf-complete/
 git checkout a6862d1
 ./autogen.sh
-./configure --disable-shared --with-pic --prefix $BUILD_DIR
+./configure --with-pic --prefix $BUILD_DIR
 make $MAKE_FLAGS install
 cd ../
 
 #
 # jerasure
 #
-git clone https://github.com/ceph/jerasure.git
+git clone -b frugalos_dyn https://github.com/frugalos/jerasure.git
 cd jerasure/
-git checkout de1739c
 autoreconf --force --install
-CFLAGS="-I${BUILD_DIR}/include" LDFLAGS="-L${BUILD_DIR}/lib" ./configure --disable-shared --enable-static --with-pic --prefix $BUILD_DIR
+CFLAGS="-I${BUILD_DIR}/include" LDFLAGS="-L${BUILD_DIR}/lib" ./configure --with-pic --prefix $BUILD_DIR
 make $MAKE_FLAGS install
 cd ../
 
 #
 # liberasurecode
 #
-git clone https://github.com/openstack/liberasurecode.git
-cd liberasurecode/
-git checkout 1.5.0
+git clone -b frugalos_dyn https://github.com/frugalos/openstack_liberasurecode.git
+cd openstack_liberasurecode/
 ./autogen.sh
 CFLAGS="-I${BUILD_DIR}/jerasure/include -I${BUILD_DIR}/include"
 if [ "$(uname)" == "Darwin" ]; then
     CFLAGS="$CFLAGS -Wno-error=address-of-packed-member"
 fi
-CFLAGS=$CFLAGS LIBS="-lJerasure" LDFLAGS="-L${BUILD_DIR}/lib" ./configure --disable-shared --with-pic --prefix $BUILD_DIR
-patch -p1 < ../liberasurecode.patch # Applies a patch for building static library
+CFLAGS=$CFLAGS LDFLAGS="-L${BUILD_DIR}/lib" ./configure --with-pic --prefix $BUILD_DIR
 make $MAKE_FLAGS install