Change travis to build with and without libcapnp pre-installed

This commit is contained in:
Jason Paryani 2014-12-11 22:11:25 -08:00
parent 4c0d4ec290
commit 3411581d89
2 changed files with 17 additions and 9 deletions

View file

@ -6,18 +6,14 @@ python:
- 3.3
- pypy
env:
- BUILD_CAPNP=true
- BUILD_CAPNP=
compiler: gcc
before_install:
- sudo apt-get install autoconf automake libtool autotools-dev
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get -qq update
- sudo apt-get -qq install g++-4.8 libstdc++-4.8-dev
- sudo update-alternatives --quiet --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60
--slave /usr/bin/g++ g++ /usr/bin/g++-4.8
--slave /usr/bin/gcov gcov /usr/bin/gcov-4.8
- sudo update-alternatives --quiet --set gcc /usr/bin/gcc-4.8
- wget https://github.com/kentonv/capnproto/archive/master.zip && unzip master.zip && cd capnproto-master/c++ && ./setup-autotools.sh && autoreconf -i && ./configure && make -j6 check && sudo make install && sudo ldconfig && cd ../..
- buildutils/setup_travis.sh
- pip install -U setuptools
- pip install cython
- pip install pytest

12
buildutils/setup_travis.sh Executable file
View file

@ -0,0 +1,12 @@
#!/bin/bash
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get -qq update
sudo apt-get -qq install g++-4.8 libstdc++-4.8-dev
sudo update-alternatives --quiet --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8 --slave /usr/bin/gcov gcov /usr/bin/gcov-4.8
sudo update-alternatives --quiet --set gcc /usr/bin/gcc-4.8
if ! [ -z "${BUILD_CAPNP}" ]; then
sudo apt-get install autoconf automake libtool autotools-dev
wget https://github.com/kentonv/capnproto/archive/master.zip && unzip master.zip && cd capnproto-master/c++ && ./setup-autotools.sh && autoreconf -i && ./configure && make -j6 check && sudo make install && sudo ldconfig && cd ../..
fi