From 31c372a0e7c981a6ed4f02035fff735dac6aa0d6 Mon Sep 17 00:00:00 2001 From: Koncord Date: Sun, 4 Sep 2016 14:47:21 +0800 Subject: [PATCH] resolve depends for travis --- .travis.yml | 16 ++++++++++------ CI/before_install.linux.sh | 12 ++++++++++++ CI/before_script.linux.sh | 4 +++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index af10c5387..9c0eb1e61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ addons: packages: [ # Dev clang-3.6, libunshield-dev, libtinyxml-dev, + g++-6, # Tests libgtest-dev, google-mock, # Boost @@ -49,6 +50,9 @@ matrix: - os: linux env: ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 " + COMPILER_NAME=gcc + CXX=g++-6 + CC=gcc-6 compiler: clang allow_failures: - env: ANALYZE="scan-build-3.6 --use-cc clang-3.6 --use-c++ clang++-3.6 " @@ -63,9 +67,9 @@ script: - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi -notifications: - recipients: - - corrmage+travis-ci@gmail.com - email: - on_success: change - on_failure: always +#notifications: +# recipients: +# - corrmage+travis-ci@gmail.com +# email: +# on_success: change +# on_failure: always diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh index 2b0e73110..cacedff53 100755 --- a/CI/before_install.linux.sh +++ b/CI/before_install.linux.sh @@ -9,3 +9,15 @@ sudo cmake .. -DBUILD_SHARED_LIBS=1 sudo make -j4 sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so + +cd ~/ +git clone https://github.com/TES3MP/RakNet +cd RakNet +cmake . -DRAKNET_ENABLE_DLL=OFF -DRAKNET_ENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=Release +mkdir ./lib +cp ./Lib/RakNetLibStatic/libRakNetLibStatic.a ./lib +make -j3 install +cd .. + +wget https://github.com/zdevito/terra/releases/download/release-2016-03-25/terra-Linux-x86_64-332a506.zip +unzip terra-Linux-x86_64-332a506.zip diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh index 93be1cb48..badd98e16 100755 --- a/CI/before_script.linux.sh +++ b/CI/before_script.linux.sh @@ -4,5 +4,7 @@ free -m mkdir build cd build export CODE_COVERAGE=1 +export RAKNET_ROOT=~/RakNet +export Terra_ROOT=~/terra-Linux-x86_64-332a506 if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0; fi -${ANALYZE}cmake .. -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games -DCMAKE_BUILD_TYPE="None" -DUSE_SYSTEM_TINYXML=TRUE +${ANALYZE}cmake .. -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games -DCMAKE_BUILD_TYPE="None" -DUSE_SYSTEM_TINYXML=TRUE -DRakNet_LIBRARY_RELEASE=~/RakNet/lib/libRakNetLibStatic.a -DRakNet_LIBRARY_DEBUG=~/RakNet/lib/libRakNetLibStatic.a