|
|
|
@ -76,10 +76,13 @@ before_install:
@@ -76,10 +76,13 @@ before_install:
|
|
|
|
|
|
|
|
|
|
- shopt -s expand_aliases |
|
|
|
|
- alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system) |
|
|
|
|
#- libt_path="$HOME/libt_install" |
|
|
|
|
#- ltconf="$ltconf --prefix="$libt_path" --disable-geoip" |
|
|
|
|
- qbt_path="$HOME/qbt_install" |
|
|
|
|
- qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH" |
|
|
|
|
- | |
|
|
|
|
if [ "$TRAVIS_OS_NAME" = "linux" ]; then |
|
|
|
|
qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH" |
|
|
|
|
else |
|
|
|
|
qbtconf="$qbtconf --prefix="$qbt_path"" |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
# options for specific branches |
|
|
|
|
- if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi |
|
|
|
@ -131,13 +134,13 @@ install:
@@ -131,13 +134,13 @@ install:
|
|
|
|
|
cp "version" $HOME/hombebrew_cache |
|
|
|
|
cd "$HOME/hombebrew_cache" |
|
|
|
|
wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb |
|
|
|
|
wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.11+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz |
|
|
|
|
wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.1.6+git20180101.b45acf28a5+patched-configure.el_capitan.bottle.tar.gz |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
# Copy custom libtorrent bottle to homebrew's cache so it can find and install it |
|
|
|
|
# Also install our custom libtorrent formula by passing the local path to it |
|
|
|
|
# These 2 files are restored from Travis' cache. |
|
|
|
|
cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.11+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz" "$(brew --cache)" |
|
|
|
|
cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.1.6+git20180101.b45acf28a5+patched-configure.el_capitan.bottle.tar.gz" "$(brew --cache)" |
|
|
|
|
brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb" |
|
|
|
|
|
|
|
|
|
if [ "$build_system" = "cmake" ]; then |
|
|
|
@ -168,11 +171,15 @@ script:
@@ -168,11 +171,15 @@ script:
|
|
|
|
|
BUILD_TOOL="ninja" |
|
|
|
|
fi |
|
|
|
|
if [ "$build_system" = "qmake" ]; then |
|
|
|
|
./bootstrap.sh && ./configure $qbtconf |
|
|
|
|
if [ "$TRAVIS_OS_NAME" = "osx" ]; then |
|
|
|
|
# For some reason for RC_1_1 we need to also specify the OpenSSL compiler/linker flags |
|
|
|
|
# Homebrew doesn't symlink OpenSSL for security reasons |
|
|
|
|
./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --cflags openssl)" LDFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --libs openssl)" |
|
|
|
|
sed -i "" -e "s/^\(CC.*&&\).*$/\1 $CC/" src/Makefile # workaround for Qt & ccache: https://bugreports.qt.io/browse/QTBUG-31034 |
|
|
|
|
sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile |
|
|
|
|
sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile |
|
|
|
|
else |
|
|
|
|
./bootstrap.sh && ./configure $qbtconf |
|
|
|
|
fi |
|
|
|
|
BUILD_TOOL="make" |
|
|
|
|
fi |
|
|
|
|