diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-08 11:51:24 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-11-09 16:21:46 -0800 |
| commit | 35d5d7c8c7dde9af7c551bc75fc3fdee0ef965da (patch) | |
| tree | 9a004cd265f91cd0dcccbe40a36cf6281a50ec64 | |
| parent | 96a3dd0001747b9acb6c72622b80b84c6f73f50b (diff) | |
| download | subsurface-35d5d7c8c7dde9af7c551bc75fc3fdee0ef965da.tar.gz | |
Travis: move the before_install step into a script
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | scripts/linux/before_install.sh | 25 |
2 files changed, 26 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 3bd09f5d3..9582c3ba9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/scripts/linux/before_install.sh b/scripts/linux/before_install.sh new file mode 100644 index 000000000..95c8527c8 --- /dev/null +++ b/scripts/linux/before_install.sh @@ -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 + |