From 5066ea637b859609a214d44f7f15d677e23c833b Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Tue, 24 Jun 2014 10:53:24 +0200
Subject: [PATCH] Update .travis.yml: remove autotools

---
 .travis.yml | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8eb6064..cd40cae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,56 +4,57 @@ compiler:
   - clang
 
 before_script:
-  #installing libsodium, needed for Core
+  # Installing libsodium, needed for toxcore
   - git clone git://github.com/jedisct1/libsodium.git > /dev/null
   - cd libsodium
   - git checkout tags/0.4.2 > /dev/null
   - ./autogen.sh > /dev/null
   - ./configure > /dev/null
-  - make check -j3 > /dev/null
-  - sudo make install >/dev/null
-  - cd ..
-  #installing yasm, needed for compiling vpx
-  - sudo apt-get install yasm > /dev/null
-  #installing libconfig, needed for DHT_bootstrap_daemon
-  - wget http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz > /dev/null
-  - tar -xvzf libconfig-1.4.9.tar.gz > /dev/null
-  - cd libconfig-1.4.9
-  - ./configure > /dev/null
-  - make -j3 > /dev/null
+  - make check -j2 || make check || exit 1 > /dev/null
   - sudo make install > /dev/null
   - cd ..
-  #installing libopus, needed for audio encoding/decoding
+  # Installing yasm, needed for compiling vpx
+  - sudo apt-get -yq install yasm > /dev/null
+  # Installing libconfig, needed for DHT_bootstrap_daemon
+  #- wget http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz > /dev/null
+  #- tar -xvzf libconfig-1.4.9.tar.gz > /dev/null
+  #- cd libconfig-1.4.9
+  #- ./configure > /dev/null
+  #- make -j2 || make || exit 1 > /dev/null
+  #- sudo make install > /dev/null
+  #- cd ..
+  # Installing libopus, needed for audio encoding/decoding
   - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz > /dev/null
   - tar xzf opus-1.0.3.tar.gz > /dev/null
   - cd opus-1.0.3
   - ./configure > /dev/null
-  - make -j3 > /dev/null
+  - make -j2 || make || exit 1 > /dev/null
   - sudo make install > /dev/null
   - cd ..
-  #installing vpx
+  # Installing vpx
   - git clone http://git.chromium.org/webm/libvpx.git > /dev/null
   - cd libvpx
   - ./configure --enable-shared > /dev/null
-  - make -j3 >/dev/null
+  - make -j2 || make || exit 1 > /dev/null
   - sudo make install > /dev/null
   - cd ..
-  #creating libraries links and updating cache
+  # Creating libraries links and updating cache
   - sudo ldconfig > /dev/null
-# creating librarys' links and updating cache
-  - sudo ldconfig
-  - git clone https://github.com/irungentoo/ProjectTox-Core.git toxcore
+  # Installing toxcore
+  - git clone https://github.com/irungentoo/toxcore.git toxcore
   - cd toxcore
   - autoreconf -i
   - ./configure --disable-tests --disable-ntox --disable-daemon --enable-av
-  - make -j2
+  - make -j2 || make || exit 1
   - sudo make install
   - cd ..
-  - sudo apt-get install libopenal-dev -yq
+  # Installing openal
+  - sudo apt-get -yq install libopenal-dev
 script:
-  - autoreconf -i
-  - ./configure
-  - make -j2
+  #- autoreconf -i
+  #- ./configure
+  - cd src
+  - make -j2 || make || exit 1
 notifications:
   email: false