diff options
author | Brent Cook <bcook@openbsd.org> | 2015-09-09 06:59:35 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-09-09 06:59:55 -0500 |
commit | c0341ad1319253bf980a2bf9b7dd1d788c2746d6 (patch) | |
tree | 19ce8f670e2ca53fde6e17921c84803bdfd98016 /scripts | |
parent | 2728a86590a5b82152b497a991613b2f48657995 (diff) | |
download | portable-c0341ad1319253bf980a2bf9b7dd1d788c2746d6.tar.gz portable-c0341ad1319253bf980a2bf9b7dd1d788c2746d6.tar.bz2 portable-c0341ad1319253bf980a2bf9b7dd1d788c2746d6.zip |
use newer cmake for travis linux builds, revise build script
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/travis | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/scripts/travis b/scripts/travis index 58a1dfb..98bfc61 100755 --- a/scripts/travis +++ b/scripts/travis | |||
@@ -3,10 +3,10 @@ set -e | |||
3 | 3 | ||
4 | ./autogen.sh | 4 | ./autogen.sh |
5 | 5 | ||
6 | if [ "x$ARCH" = "xnative" ]; then | 6 | if "x$ARCH" = "xnative"; then |
7 | # test autotools | 7 | # test autotools |
8 | ./configure | 8 | ./configure |
9 | if [ `uname` = "Darwin" ]; then | 9 | if `uname` = "Darwin"; then |
10 | # OS X runs out of resources if we run 'make -j check' | 10 | # OS X runs out of resources if we run 'make -j check' |
11 | make check | 11 | make check |
12 | else | 12 | else |
@@ -17,23 +17,29 @@ if [ "x$ARCH" = "xnative" ]; then | |||
17 | make dist | 17 | make dist |
18 | tar zxvf libressl-*.tar.gz | 18 | tar zxvf libressl-*.tar.gz |
19 | cd libressl-* | 19 | cd libressl-* |
20 | |||
21 | # test cmake and ninja | ||
22 | mkdir build | 20 | mkdir build |
23 | cd build | 21 | cd build |
24 | cmake .. | 22 | |
25 | make | 23 | # test cmake and ninja |
24 | if `uname` = "Darwin"; then | ||
25 | cmake .. | ||
26 | make | ||
27 | else | ||
28 | sudo apt-add-repository -y ppa:kalakris/cmake | ||
29 | sudo apt-get update | ||
30 | sudo apt-get install -y $ARCH-x-gcc cmake ninja-build | ||
31 | cmake .. -GNinja | ||
32 | make | ||
33 | fi | ||
26 | else | 34 | else |
27 | CPU=i686 | 35 | CPU=i686 |
28 | if [ "x$ARCH" = "xmingw64" ]; then | 36 | if "x$ARCH" = "xmingw64"; then |
29 | CPU=x86_64 | 37 | CPU=x86_64 |
30 | fi | 38 | fi |
31 | export CC=$CPU-w64-mingw32-gcc | 39 | export CC=$CPU-w64-mingw32-gcc |
32 | 40 | ||
33 | if [ -z $(which $CC) ]; then | 41 | if ! hash $CC 2>/dev/null; then |
34 | # Update Ubuntu 12.04 with current mingw toolchain | 42 | # Update Ubuntu 12.04 with current mingw toolchain |
35 | sudo apt-get update | ||
36 | sudo apt-get install -y python-software-properties | ||
37 | sudo apt-add-repository -y ppa:tobydox/mingw-x-precise | 43 | sudo apt-add-repository -y ppa:tobydox/mingw-x-precise |
38 | sudo apt-get update | 44 | sudo apt-get update |
39 | sudo apt-get install -y $ARCH-x-gcc make | 45 | sudo apt-get install -y $ARCH-x-gcc make |