diff options
-rwxr-xr-x | scripts/travis | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/scripts/travis b/scripts/travis index 3253538..091f37d 100755 --- a/scripts/travis +++ b/scripts/travis | |||
@@ -4,7 +4,6 @@ set -e | |||
4 | ./autogen.sh | 4 | ./autogen.sh |
5 | 5 | ||
6 | if [ "x$ARCH" = "xnative" ]; then | 6 | if [ "x$ARCH" = "xnative" ]; then |
7 | # test autotools | ||
8 | ./configure | 7 | ./configure |
9 | if [ `uname` = "Darwin" ]; then | 8 | if [ `uname` = "Darwin" ]; then |
10 | # OS X runs out of resources if we run 'make -j check' | 9 | # OS X runs out of resources if we run 'make -j check' |
@@ -12,25 +11,6 @@ if [ "x$ARCH" = "xnative" ]; then | |||
12 | else | 11 | else |
13 | make -j distcheck | 12 | make -j distcheck |
14 | fi | 13 | fi |
15 | |||
16 | # make distribution | ||
17 | make dist | ||
18 | tar zxvf libressl-*.tar.gz | ||
19 | cd libressl-* | ||
20 | mkdir build | ||
21 | cd build | ||
22 | |||
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 cmake ninja-build | ||
31 | cmake .. -GNinja | ||
32 | ninja | ||
33 | fi | ||
34 | else | 14 | else |
35 | CPU=i686 | 15 | CPU=i686 |
36 | if [ "x$ARCH" = "xmingw64" ]; then | 16 | if [ "x$ARCH" = "xmingw64" ]; then |
@@ -38,8 +18,10 @@ else | |||
38 | fi | 18 | fi |
39 | export CC=$CPU-w64-mingw32-gcc | 19 | export CC=$CPU-w64-mingw32-gcc |
40 | 20 | ||
41 | if hash $CC 2>/dev/null; then | 21 | if [ -z $(which $CC) ]; then |
42 | # Update Ubuntu 12.04 with current mingw toolchain | 22 | # Update Ubuntu 12.04 with current mingw toolchain |
23 | sudo apt-get update | ||
24 | sudo apt-get install -y python-software-properties | ||
43 | sudo apt-add-repository -y ppa:tobydox/mingw-x-precise | 25 | sudo apt-add-repository -y ppa:tobydox/mingw-x-precise |
44 | sudo apt-get update | 26 | sudo apt-get update |
45 | sudo apt-get install -y $ARCH-x-gcc make | 27 | sudo apt-get install -y $ARCH-x-gcc make |