From 03b3cb0bf25cc6e5937152622046c13619575afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Tue, 19 Jul 2016 18:13:25 +0200
Subject: [PATCH] Update travis & install script

---
 .travis.yml        | 29 +++++++++++++++++++++--------
 installing_deps.sh | 21 +++++++++++++++++++--
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e0e50939..0af57bce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ sudo: required
 
 dist: trusty
 
-group: edge
-
 addons:
     apt:
         packages:
@@ -27,6 +25,7 @@ addons:
             # Leveldb
             - libgmp-dev
             - libev-dev
+            - cmake
 
 env:
     - AIL_HOME=$TRAVIS_BUILD_DIR AIL_BIN=$TRAVIS_BUILD_DIR/bin/ \
@@ -45,16 +44,30 @@ install:
     # Redis
     - test ! -d redis/ && git clone https://github.com/antirez/redis.git
     - pushd redis
-    - git checkout 3.0
+    - git checkout 3.2
     - make
     - popd
     # Redis leveldb
     - test ! -d redis-leveldb/ && git clone https://github.com/KDr2/redis-leveldb.git
-    - pushd redis-leveldb/
-    - git submodule init
-    - git submodule update
-    - make
-    - popd
+      pushd redis-leveldb/
+      git submodule init
+      git submodule update
+      make
+      popd
+    # Faup
+    - test ! -d faup && git clone https://github.com/stricaud/faup.git
+      pushd faup/
+      test ! -d build && mkdir build
+      cd build
+      cmake .. && make
+      sudo make install
+      echo '/usr/local/lib' | sudo tee -a /etc/ld.so.conf.d/faup.conf
+      sudo ldconfig
+      popd
+    # PyFaup
+    - pushd faup/src/lib/bindings/python/
+      python setup.py install
+      popd
     # Set config
     - cp bin/packages/config.cfg.sample bin/packages/config.cfg
     - mkdir -p $AIL_HOME/{PASTES,Blooms,dumps}
diff --git a/installing_deps.sh b/installing_deps.sh
index aa84235f..ae4f3fc8 100755
--- a/installing_deps.sh
+++ b/installing_deps.sh
@@ -6,7 +6,7 @@ set -x
 sudo apt-get update
 
 sudo apt-get install python-pip python-virtualenv python-dev libfreetype6-dev \
-    screen g++ python-tk unzip libsnappy-dev
+    screen g++ python-tk unzip libsnappy-dev cmake
 
 #Needed for bloom filters
 sudo apt-get install libssl-dev libfreetype6-dev python-numpy
@@ -24,10 +24,21 @@ sudo easy_install -U distribute
 # REDIS #
 test ! -d redis/ && git clone https://github.com/antirez/redis.git
 pushd redis/
-git checkout 3.0
+git checkout 3.2
 make
 popd
 
+# Faup
+test ! -d faup && git clone https://github.com/stricaud/faup.git
+pushd faup/
+test ! -d build && mkdir build
+cd build
+cmake .. && make
+sudo make install
+echo '/usr/local/lib' | sudo tee -a /etc/ld.so.conf.d/faup.conf
+sudo ldconfig
+popd
+
 # REDIS LEVEL DB #
 test ! -d redis-leveldb/ && git clone https://github.com/KDr2/redis-leveldb.git
 pushd redis-leveldb/
@@ -56,5 +67,11 @@ mkdir -p $AIL_HOME/LEVEL_DB_DATA/2016
 pip install -U pip
 pip install -r pip_packages_requirement.txt
 
+# Pyfaup
+pushd faup/src/lib/bindings/python/
+python setup.py install
+popd
+
+
 # Download the necessary NLTK corpora
 HOME=$(pwd) python -m textblob.download_corpora