Rework travis script

.travis.yml

@@ -1,62 +1,53 @@
+language:
+  - cpp
+
+env:
+  # 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 
 
-language:
+before_install:
-# linux
-- cpp
-
-# osx
-# - objective-c
-
-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
-
-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
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
-- export MAKEFLAGS="-j $((`nproc` / 2))"
+  - alias make="colormake -j2 "
 
-- if $debug; then qtc="--enable-debug"; ltc="--enable-debug"; fi
+  # Also setup a virtual display for after_success target when gui == true
-- if ! $gui; then qtc="$qtc --disable-gui"; fi
+  - 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
-- ltc="$ltc --with-libgeoip"
+  - ltconf=" --with-libgeoip=system"
 
   - echo settings
-- echo $lt
+  - echo $lt_source
-- echo $debug
+  - echo $ltconf
   - echo $gui
-- echo $qtc
+  - echo $qbtconf
-- 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
+  # Travis can stall during heavy load if these packages are installed in one step - split the command
-- if [[ "$lt" == "APT" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
+  - sudo apt-get -qq install debhelper qconf colormake libssl-dev libgeoip-dev
-- 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
+  - sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libqt4-dev 
 
-# osx
+install:
-# - export MAKEFLAGS="-j 4"
+  - if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
-# - brew update
+  - 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
-# - brew install libtorrent-rasterbar qt boost
 
 script:
-# linux, osx
+  - qt-qconf
-- mkdir -p build && cd build && mkdir -p install
+  - ./configure $qbtconf && sudo make install
   
-# linux
+after_success:
-- (cd .. && qt-qconf)
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi
-- ../configure $qtc && sudo make install
-
-# osx
-# - qmake ../qbittorrent.pro && make