diff options
| author | Don <don.j.olmstead@gmail.com> | 2018-03-21 10:55:55 -0700 |
|---|---|---|
| committer | Don <don.j.olmstead@gmail.com> | 2018-03-21 10:55:55 -0700 |
| commit | a1c22d93cdb0dab8f1df470d6c05fda239b9054e (patch) | |
| tree | 6bc2176edc90edd519e1debd83a66e5af10a40e3 /scripts/travis | |
| parent | 26bebfc564c48fdb7fca064ccc975565d1dc53ab (diff) | |
| download | portable-a1c22d93cdb0dab8f1df470d6c05fda239b9054e.tar.gz portable-a1c22d93cdb0dab8f1df470d6c05fda239b9054e.tar.bz2 portable-a1c22d93cdb0dab8f1df470d6c05fda239b9054e.zip | |
Have travis do shared and static builds
Diffstat (limited to 'scripts/travis')
| -rwxr-xr-x | scripts/travis | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/scripts/travis b/scripts/travis index c8e67ce..ea54aae 100755 --- a/scripts/travis +++ b/scripts/travis | |||
| @@ -12,20 +12,32 @@ if [ "x$ARCH" = "xnative" ]; then | |||
| 12 | make dist | 12 | make dist |
| 13 | tar zxvf libressl-*.tar.gz | 13 | tar zxvf libressl-*.tar.gz |
| 14 | cd libressl-* | 14 | cd libressl-* |
| 15 | mkdir build | 15 | mkdir build-static |
| 16 | cd build | 16 | mkdir build-shared |
| 17 | |||
| 18 | cd build-static | ||
| 17 | 19 | ||
| 18 | # test cmake and ninja | 20 | # test cmake and ninja |
| 19 | if [ `uname` = "Darwin" ]; then | 21 | if [ `uname` = "Darwin" ]; then |
| 20 | cmake .. | 22 | cmake .. |
| 21 | make | 23 | make |
| 22 | make test | 24 | make test |
| 25 | |||
| 26 | cd ../build-shared | ||
| 27 | cmake -DBUILD_SHARED_LIBS=ON .. | ||
| 28 | make | ||
| 29 | make test | ||
| 23 | else | 30 | else |
| 24 | sudo apt-get update | 31 | sudo apt-get update |
| 25 | sudo apt-get install -y cmake ninja-build | 32 | sudo apt-get install -y cmake ninja-build |
| 26 | cmake -GNinja .. | 33 | cmake -GNinja .. |
| 27 | ninja | 34 | ninja |
| 28 | ninja test | 35 | ninja test |
| 36 | |||
| 37 | cd ../build-shared | ||
| 38 | cmake -GNinja -DBUILD_SHARED_LIBS=ON .. | ||
| 39 | ninja | ||
| 40 | ninja test | ||
| 29 | fi | 41 | fi |
| 30 | else | 42 | else |
| 31 | CPU=i686 | 43 | CPU=i686 |
