Rework travis script

.travis.yml

@@ -1,62 +1,53 @@
-notifications:
-  email:
-    on_success: change
-    on_failure: change
-
 language:
-# linux
-- cpp
-
-# osx
-# - objective-c
+  - cpp
 
 env:
-# linux
-# libtorrent 0.15.10
-- lt=APT debug=false gui=true
-- lt=APT debug=false gui=false
-# libtorrent 0.16.x
-- lt=repo debug=false gui=true
-- lt=repo debug=false gui=false
+  # use libtorrent 0.15.10
+  - lt_source=from_dist gui=true
+  - lt_source=from_dist gui=false
+  # use libtorrent 0.16.X from RC_0_16 svn branch
+  - lt_source=from_svn gui=true
+  - lt_source=from_svn gui=false
+
+branches:
+  except:
+    - search_encoding_windows
+    - v2_9_x
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change 
+
+before_install:
+  - shopt -s expand_aliases
+  - alias sudo="sudo "
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
+  - alias make="colormake -j2 "
+
+  # Also setup a virtual display for after_success target when gui == true
+  - if ! $gui; then qbtconf="$qbtconf --disable-gui"; else export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi
+  - ltconf=" --with-libgeoip=system"
+
+  - echo settings
+  - echo $lt_source
+  - echo $ltconf
+  - echo $gui
+  - echo $qbtconf
+
+  - sudo apt-get -qq update
+  # Travis can stall during heavy load if these packages are installed in one step - split the command
+  - sudo apt-get -qq install debhelper qconf colormake libssl-dev libgeoip-dev
+  - sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libqt4-dev 
 
 install:
-# linux, osx
-#- (cd src/geoip && wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz && gzip -d GeoIP.dat.gz)
-
-# linux
-- shopt -s expand_aliases
-- alias sudo="sudo "
-- alias make=colormake
-- export MAKEFLAGS="-j $((`nproc` / 2))"
-
-- if $debug; then qtc="--enable-debug"; ltc="--enable-debug"; fi
-- if ! $gui; then qtc="$qtc --disable-gui"; fi
-- ltc="$ltc --with-libgeoip"
-
-- echo settings
-- echo $lt
-- echo $debug
-- echo $gui
-- echo $qtc
-- echo $ltc
-
-- sudo apt-get -qq update
-- sudo apt-get -qq install debhelper libboost-dev libboost-filesystem-dev libboost-system-dev libqt4-dev qconf colormake libgeoip-dev
-- if [[ "$lt" == "APT" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
-- if [[ "$lt" == "repo" ]]; then sudo apt-get -qq build-dep libtorrent-rasterbar-dev && svn checkout svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 && (cd RC_0_16 && ./autotool.sh && ./configure $ltc && sudo make install); fi
-
-# osx
-# - export MAKEFLAGS="-j 4"
-# - brew update
-# - brew install libtorrent-rasterbar qt boost
+  - if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
+  - if [[ "$lt_source" == "from_svn" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
 
 script:
-# linux, osx
-- mkdir -p build && cd build && mkdir -p install
-
-# linux
-- (cd .. && qt-qconf)
-- ../configure $qtc && sudo make install
-
-# osx
-# - qmake ../qbittorrent.pro && make
+  - qt-qconf
+  - ./configure $qbtconf && sudo make install
+  
+after_success:
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi