From 5f30eef1ecf21794e5150427976f79081aad5c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 25 Jul 2016 11:38:41 +0200 Subject: [PATCH 1/3] Update travis --- .travis.yml | 66 ++-------------------------------------------- installing_deps.sh | 32 +++++++++++++--------- 2 files changed, 22 insertions(+), 76 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ce79b41..554d0967 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,27 +5,7 @@ python: sudo: required -dist: trusty - -addons: - apt: - packages: - # General dependencies - - python-pip - - python-virtualenv - - python-dev - - g++ - - python-tk - - unzip - - libsnappy-dev - # Needed for bloomfilters - - libssl-dev - - python-numpy - - libfreetype6-dev - # Leveldb - - libgmp-dev - - libev-dev - - cmake +cache: pip env: - AIL_HOME=$TRAVIS_BUILD_DIR AIL_BIN=$TRAVIS_BUILD_DIR/bin/ \ @@ -35,49 +15,7 @@ env: install: - - pip install -U pip - # DNS - - sudo apt-get install -y libadns1 libadns1-dev screen - # required for mathplotlib - - test ! -L /usr/include/ft2build.h && sudo ln -s freetype2/ft2build.h /usr/include/ - - pip install distribute - # Redis - - test ! -d redis/ && git clone https://github.com/antirez/redis.git - - pushd redis - - 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 - # 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} - - mkdir -p $AIL_HOME/LEVEL_DB_DATA/{2016,2015,2014,2013} - - pip install -r pip_packages_requirement.txt - - python -m textblob.download_corpora - - pushd var/www/ - - ./update_thirdparty.sh - - popd - + - ./installing_deps.sh script: - pushd bin diff --git a/installing_deps.sh b/installing_deps.sh index ae4f3fc8..d68a029e 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -29,7 +29,7 @@ make popd # Faup -test ! -d faup && git clone https://github.com/stricaud/faup.git +test ! -d faup/ && git clone https://github.com/stricaud/faup.git pushd faup/ test ! -d build && mkdir build cd build @@ -51,21 +51,29 @@ if [ ! -f bin/packages/config.cfg ]; then cp bin/packages/config.cfg.sample bin/packages/config.cfg fi -virtualenv AILENV - -echo export AIL_HOME=$(pwd) >> ./AILENV/bin/activate -echo export AIL_BIN=$(pwd)/bin/ >> ./AILENV/bin/activate -echo export AIL_FLASK=$(pwd)/var/www/ >> ./AILENV/bin/activate -echo export AIL_REDIS=$(pwd)/redis/src/ >> ./AILENV/bin/activate -echo export AIL_LEVELDB=$(pwd)/redis-leveldb/ >> ./AILENV/bin/activate - -. ./AILENV/bin/activate - mkdir -p $AIL_HOME/{PASTES,Blooms,dumps} mkdir -p $AIL_HOME/LEVEL_DB_DATA/2016 +pushd var/www/ +./update_thirdparty.sh +popd + +if [ -z "$VIRTUAL_ENV" ]; then + + virtualenv AILENV + + echo export AIL_HOME=$(pwd) >> ./AILENV/bin/activate + echo export AIL_BIN=$(pwd)/bin/ >> ./AILENV/bin/activate + echo export AIL_FLASK=$(pwd)/var/www/ >> ./AILENV/bin/activate + echo export AIL_REDIS=$(pwd)/redis/src/ >> ./AILENV/bin/activate + echo export AIL_LEVELDB=$(pwd)/redis-leveldb/ >> ./AILENV/bin/activate + + . ./AILENV/bin/activate + +fi + pip install -U pip -pip install -r pip_packages_requirement.txt +pip install -U -r pip_packages_requirement.txt # Pyfaup pushd faup/src/lib/bindings/python/ From 5d4a02e706b78f403cd97dcafabd8c047e985645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 25 Jul 2016 11:49:29 +0200 Subject: [PATCH 2/3] Fix install script --- installing_deps.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/installing_deps.sh b/installing_deps.sh index d68a029e..63227bdf 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -17,10 +17,6 @@ sudo apt-get install libadns1 libadns1-dev #Needed for redis-lvlDB sudo apt-get install libev-dev libgmp-dev -#needed for mathplotlib -test ! -L /usr/include/ft2build.h && sudo ln -s freetype2/ft2build.h /usr/include/ -sudo easy_install -U distribute - # REDIS # test ! -d redis/ && git clone https://github.com/antirez/redis.git pushd redis/ @@ -51,9 +47,6 @@ if [ ! -f bin/packages/config.cfg ]; then cp bin/packages/config.cfg.sample bin/packages/config.cfg fi -mkdir -p $AIL_HOME/{PASTES,Blooms,dumps} -mkdir -p $AIL_HOME/LEVEL_DB_DATA/2016 - pushd var/www/ ./update_thirdparty.sh popd @@ -72,6 +65,9 @@ if [ -z "$VIRTUAL_ENV" ]; then fi +mkdir -p $AIL_HOME/{PASTES,Blooms,dumps} +mkdir -p $AIL_HOME/LEVEL_DB_DATA/2016 + pip install -U pip pip install -U -r pip_packages_requirement.txt From b8bc9c0f17a22f58100b89016dccb13ad35b6d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Mon, 25 Jul 2016 11:55:14 +0200 Subject: [PATCH 3/3] Add dependency --- installing_deps.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/installing_deps.sh b/installing_deps.sh index 63227bdf..16a68f05 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -17,6 +17,9 @@ sudo apt-get install libadns1 libadns1-dev #Needed for redis-lvlDB sudo apt-get install libev-dev libgmp-dev +# ssdeep +sudo apt-get install libfuzzy-dev + # REDIS # test ! -d redis/ && git clone https://github.com/antirez/redis.git pushd redis/