From 3420e6e0ddbc1acee1a85051f94519adca9cdff0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 11 Feb 2016 20:12:10 +0000 Subject: [PATCH] Problem: CI still thinks libsodium is default Solution: build by default with tweetnacl, and add sub-build project to test libsodium --- .travis.yml | 2 +- builds/{tweetnacl => libsodium}/ci_build.sh | 8 +++++++- ci_build.sh | 8 +------- 3 files changed, 9 insertions(+), 9 deletions(-) rename builds/{tweetnacl => libsodium}/ci_build.sh (67%) diff --git a/.travis.yml b/.travis.yml index 7e59e1e0..4d9d9a2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ os: env: - BUILD_TYPE=default - BUILD_TYPE=android -- BUILD_TYPE=tweetnacl +- BUILD_TYPE=libsodium - BUILD_TYPE=cmake sudo: false diff --git a/builds/tweetnacl/ci_build.sh b/builds/libsodium/ci_build.sh similarity index 67% rename from builds/tweetnacl/ci_build.sh rename to builds/libsodium/ci_build.sh index e59c10f0..f9501cf4 100755 --- a/builds/tweetnacl/ci_build.sh +++ b/builds/libsodium/ci_build.sh @@ -13,11 +13,17 @@ CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib") CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig") CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}") +# Build required projects first + +# libsodium +git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git +( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install) + # Build and check this project ( cd ../..; ./autogen.sh && - ./configure "${CONFIG_OPTS[@]}" --with-tweetnacl=yes && + ./configure "${CONFIG_OPTS[@]}" --with-libsodium=yes && make && ( if make check; then true; else cat test-suite.log; exit 1; fi ) && make install diff --git a/ci_build.sh b/ci_build.sh index 848be338..e8e900f4 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -14,16 +14,10 @@ if [ $BUILD_TYPE == "default" ]; then CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig") CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}") - # Build required projects first - - # libsodium - git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git - ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install) - # Build and check this project ( ./autogen.sh && - ./configure "${CONFIG_OPTS[@]}" --with-libsodium=yes && + ./configure "${CONFIG_OPTS[@]}" && make && ( if make check; then true; else cat test-suite.log; exit 1; fi ) && make install