mirror of
https://github.com/wesnoth/wesnoth
synced 2025-04-29 20:47:49 +00:00
Split Travis dependency installation into a shell script
This is a prerequisite for getting an OSX build working, since a different package manager is used there.
This commit is contained in:
parent
c43651f99b
commit
9322f90b3a
14
.travis.yml
14
.travis.yml
@ -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
|
- if [[ "$OPT" == "-O0" ]] && [[ "$CXX" == "clang++" ]]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-deprecated-declarations -Wno-literal-suffix -Wno-deprecated-register"; fi
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [ "$CXXSTD" == "1y" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi
|
- ./utils/travis/install_deps.sh
|
||||||
- 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
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ./utils/travis/check_utf8.sh
|
- ./utils/travis/check_utf8.sh
|
||||||
|
20
utils/travis/install_deps.sh
Executable file
20
utils/travis/install_deps.sh
Executable 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
|
Loading…
x
Reference in New Issue
Block a user