From 75607bcecceb101b4e2cf79f7c9a7b5df63ba6fc Mon Sep 17 00:00:00 2001 From: Zetok Zalbavar Date: Tue, 26 Jan 2016 07:46:35 +0000 Subject: [PATCH] Add travis (again) Beside making it work again, there are some improvements: Linux side: * use minimal supported Qt version, currently it's 5.3 * use minimal supported GCC version, currently 4.8 * use newer ffmpeg version to compile against - 2.8.5 * compile qTox 2 times, first run without support for optional dependencies * use ubuntu 14.04 for building (less deps needs to be compiled/added from PPAs) OSX: * add osx to build targets --- .travis.yml | 13 ++++ .travis/build-ubuntu_14_04.sh | 101 ++++++++++++++++++++++++++++++ README.md | 2 + osx/qTox-Mac-Deployer-ULTIMATE.sh | 4 +- 4 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 .travis.yml create mode 100755 .travis/build-ubuntu_14_04.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..1d573a497 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +sudo: required +dist: trusty + +language: cpp + +os: + - linux + - osx + +script: +- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash ./.travis/build-ubuntu_14_04.sh; fi +- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash ./osx/qTox-Mac-Deployer-ULTIMATE.sh -i ; fi +- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash ./osx/qTox-Mac-Deployer-ULTIMATE.sh -b ; fi diff --git a/.travis/build-ubuntu_14_04.sh b/.travis/build-ubuntu_14_04.sh new file mode 100755 index 000000000..95da5b4ed --- /dev/null +++ b/.travis/build-ubuntu_14_04.sh @@ -0,0 +1,101 @@ +#!/bin/bash +# +# Copyright © 2014-2015 by The qTox Project +# +# This program is libre software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +# Qt 5.3, since that's the lowest supported version +sudo add-apt-repository -y ppa:beineri/opt-qt532-trusty +sudo apt-get update -qq + +# install needed Qt, OpenAL, opus, qrencode, GTK tray deps, sqlcipher +sudo apt-get install -y build-essential \ + qt53base \ + qt53script \ + qt53svg \ + qt53tools \ + qt53xmlpatterns \ + libopenal-dev \ + libxss-dev qrencode \ + libqrencode-dev \ + libglib2.0-dev \ + libgdk-pixbuf2.0-dev \ + libgtk2.0-dev \ + libsqlcipher-dev \ + libtool \ + autotools-dev \ + automake \ + checkinstall \ + check \ + libopus-dev \ + libvpx-dev + +# Qt +source /opt/qt53/bin/qt53-env.sh + +# ffmpeg +if [ ! -e "libs" ]; then mkdir libs; fi +if [ ! -e "ffmpeg" ]; then mkdir ffmpeg; fi +# +cd libs/ +export PREFIX_DIR="$PWD" +# +cd ../ffmpeg +wget http://ffmpeg.org/releases/ffmpeg-2.8.5.tar.bz2 +tar xf ffmpeg* +cd ffmpeg* +./configure --prefix="$PREFIX_DIR" --enable-shared --disable-static --disable-programs --disable-protocols --disable-doc --disable-sdl --disable-avfilter --disable-avresample --disable-filters --disable-iconv --disable-network --disable-muxers --disable-postproc --disable-swresample --disable-swscale-alpha --disable-dct --disable-dwt --disable-lsp --disable-lzo --disable-mdct --disable-rdft --disable-fft --disable-faan --disable-vaapi --disable-vdpau --disable-zlib --disable-xlib --disable-bzlib --disable-lzma --disable-encoders --disable-yasm --enable-memalign-hack +make -j$(nproc) +make install +cd ../../ +# filter_audio +git clone https://github.com/irungentoo/filter_audio +cd filter_audio +make -j$(nproc) +sudo make install +cd .. +# libsodium +git clone git://github.com/jedisct1/libsodium.git +cd libsodium +git checkout tags/1.0.8 +./autogen.sh +./configure && make -j$(nproc) +sudo checkinstall --install --pkgname libsodium --pkgversion 1.0.8 --nodoc -y +sudo ldconfig +cd .. +# toxcore +git clone https://github.com/irungentoo/toxcore.git +cd toxcore +autoreconf -if +./configure +make -j$(nproc) > /dev/null +sudo make install +echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf +sudo ldconfig +cd .. + +$CC --version +$CXX --version +# first build qTox without support for optional dependencies +echo '*** BUILDING "MINIMAL" VERSION ***' +qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" DISABLE_FILTER_AUDIO=YES ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO DISABLE_PLATFORM_EXT=YES +# ↓ with $(nproc) fails, since travis gives 32 threads, and it leads to OOM +make -j10 +# clean it up, and build normal version +make clean +echo '*** BUILDING "FULL" VERSION ***' +qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" +# ↓ with $(nproc) fails, since travis gives 32 threads, and it leads to OOM +make -j10 diff --git a/README.md b/README.md index 4205546cd..a8a2db2a7 100644 --- a/README.md +++ b/README.md @@ -51,3 +51,5 @@ Note: The screenshots may not always be up to date, but they should give a good - Emoticons - Auto-updates on Windows and Mac, packages on Linux - And many more options! + +[![Build Status](https://travis-ci.org/tux3/qTox.svg)](https://travis-ci.org/tux3/qTox) diff --git a/osx/qTox-Mac-Deployer-ULTIMATE.sh b/osx/qTox-Mac-Deployer-ULTIMATE.sh index 2a87627de..c5027b531 100755 --- a/osx/qTox-Mac-Deployer-ULTIMATE.sh +++ b/osx/qTox-Mac-Deployer-ULTIMATE.sh @@ -23,7 +23,7 @@ # Your home DIR really (Most of this happens in it) {DONT USE: ~ } if [[ $TRAVIS = true ]]; then #travis check - MAIN_DIR="/Users/${USER}/${TRAVIS_BUILD_DIR}" + MAIN_DIR="${TRAVIS_BUILD_DIR}" else MAIN_DIR="/Users/${USER}" fi @@ -245,4 +245,4 @@ if [ "$1" == "-h" ]; then fi fcho "Oh dear! You seemed to of started this script improperly! Use -h to get avilable commands and information!" -exit 0 \ No newline at end of file +exit 0