0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split Travis dependency installation into a shell script

Browse source 
This is a prerequisite for getting an OSX build working,
since a different package manager is used there.
This commit is contained in:
Celtic Minstrel 2016-11-11 17:41:04 -05:00
parent c43651f99b
commit 9322f90b3a
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.travis.yml
View file

@ -46,19 +46,7 @@ before_install:
- if [[ "$OPT" == "-O0" ]] && [[ "$CXX" == "clang++" ]]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-deprecated-declarations -Wno-literal-suffix -Wno-deprecated-register"; fi
install:
- if [ "$CXXSTD" == "1y" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
- travis_wait sudo apt-get update -qq
- travis_wait sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-random-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libboost-locale-dev libboost-thread-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libvorbis-dev gdb moreutils xvfb
- if [ "$USE_CMAKE" = true ]; then
travis_wait sudo apt-get install -qq cmake;
else
travis_wait sudo apt-get install -qq scons;
fi
- if [ "$CXXSTD" == "1y" ]; then
sudo apt-get install -qq g++-5;
export CXX=g++-5;
export CC=gcc-5;
fi
- ./utils/travis/install_deps.sh
script:
- ./utils/travis/check_utf8.sh

20
utils/travis/install_deps.sh Executable file
View file

@ -0,0 +1,20 @@
#!/bin/bash
if [ "$CXXSTD" == "1y" ]; then
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y;
fi
travis_wait sudo apt-get update -qq
travis_wait sudo apt-get install -qq libboost-filesystem-dev libboost-iostreams-dev libboost-random-dev libboost-program-options-dev libboost-regex-dev libboost-system-dev libboost-test-dev libboost-locale-dev libboost-thread-dev libcairo2-dev libfribidi-dev libpango1.0-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libvorbis-dev gdb moreutils xvfb
if [ "$USE_CMAKE" = true ]; then
travis_wait sudo apt-get install -qq cmake;
else
travis_wait sudo apt-get install -qq scons;
fi
if [ "$CXXSTD" == "1y" ]; then
sudo apt-get install -qq g++-5;
export CXX=g++-5;
export CC=gcc-5;
fi