jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Travis: unify GCC5 and SWIG_CC variables

Browse source
This commit is contained in:
Alexey Sokolov 2015-09-05 11:21:17 +01:00
commit 5dd553e244
2 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
.travis.yml
View file

@ -7,12 +7,10 @@ matrix:
- compiler: gcc - compiler: gcc
os: linux os: linux
env: SWIGLANG= env: SWIGLANG=
- compiler: gcc - os: linux
os: linux env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
env: SWIGLANG= GCC5=1 CPP11=1 - os: linux
- compiler: gcc env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP14=1
os: linux
env: SWIGLANG= GCC5=1 CPP14=1
- compiler: gcc - compiler: gcc
os: linux os: linux
env: SWIGLANG=csharp env: SWIGLANG=csharp
@ -100,15 +98,12 @@ matrix:
- compiler: gcc - compiler: gcc
os: linux os: linux
env: SWIGLANG=tcl env: SWIGLANG=tcl
- compiler: gcc - os: linux
os: linux env: SWIGLANG=csharp SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
env: SWIGLANG=csharp GCC5=1 CPP11=1 - os: linux
- compiler: gcc env: SWIGLANG=java SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
os: linux - os: linux
env: SWIGLANG=java GCC5=1 CPP11=1 env: SWIGLANG=python SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
- compiler: gcc
os: linux
env: SWIGLANG=python GCC5=1 CPP11=1
- os: osx - os: osx
env: SWIGLANG= SWIG_CC=gcc-4.2 SWIG_CXX=g++-4.2 env: SWIGLANG= SWIG_CC=gcc-4.2 SWIG_CXX=g++-4.2
- compiler: clang - compiler: clang

3
Tools/travis-linux-install.sh
View file

@ -2,12 +2,11 @@
lsb_release -a lsb_release -a
sudo apt-get -qq update sudo apt-get -qq update
if [[ "$GCC5" ]]; then if [[ "$CC" == gcc-5 ]]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo add-apt-repository -y ppa:boost-latest/ppa sudo add-apt-repository -y ppa:boost-latest/ppa
sudo apt-get -qq update sudo apt-get -qq update
sudo apt-get install -qq g++-5 libboost1.55-dev sudo apt-get install -qq g++-5 libboost1.55-dev
export CC=gcc-5 CXX=g++-5
else else
sudo apt-get -qq install libboost-dev sudo apt-get -qq install libboost-dev
fi fi