Travis: move the before_install step into a script

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-11-08 11:51:24 -08:00
parent 96a3dd0001
commit 35d5d7c8c7
2 changed files with 26 additions and 9 deletions

View file

@ -34,15 +34,7 @@ matrix:
- libicu52
before_install:
- if [ ! -e Qt/5.9.1 ] ; then
rm -rf Qt ; mkdir -p Qt/5.9.1 ;
wget http://subsurface-divelog.org/downloads/Qt-5.9.1.tar.xz ; tar -xJ -C Qt/5.9.1 -f Qt-5.9.1.tar.xz ;
cd Qt/5.9.1 ; ln -s . gcc_64 ; cd .. ; ln -s 5.9.1/* . ; cd .. ;
sed -i -e 's|1.0.1e|1.0.0\x00|g' Qt/lib/libQt5Network.so.5 ;
fi
# TestPreferences uses gui calls, so run a xvfb so it has something to talk to
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- source scripts/${SUBSURFACE_PLATFORM}/before_install.sh
script:
- source scripts/${SUBSURFACE_PLATFORM}/travisbuild.sh

View file

@ -0,0 +1,25 @@
#!/bin/bash
# prep things so we can build for Linux
# we have a custom built Qt some gives us just what we need, including QtWebKit
rm -rf Qt
mkdir -p Qt/5.9.1
wget http://subsurface-divelog.org/downloads/Qt-5.9.1.tar.xz
tar -xJ -C Qt/5.9.1 -f Qt-5.9.1.tar.xz
cd Qt/5.9.1
# this should all be handled in the packaged tar file, for now we hack it here
ln -s . gcc_64
cd ..
ln -s 5.9.1/* .
cd ..
# terrifying hack to fix the OpenSSL dependency issue
sed -i -e 's|1.0.1e|1.0.0\x00|g' Qt/lib/libQt5Network.so.5
# TestPreferences uses gui calls, so run a xvfb so it has something to talk to
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start