From e0dc6d85b47a392af795f214a1ebfc4a2605167d Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Tue, 7 Jan 2020 09:48:16 +0200 Subject: [PATCH] travis: add build with ovpn3 enabled Signed-off-by: Lev Stipakov --- .travis-build-jsonc.sh | 22 ++++++++++++++++++++++ .travis.yml | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100755 .travis-build-jsonc.sh diff --git a/.travis-build-jsonc.sh b/.travis-build-jsonc.sh new file mode 100755 index 0000000..0749f05 --- /dev/null +++ b/.travis-build-jsonc.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -e + +git clone https://github.com/json-c/json-c.git +cd json-c + +mkdir build && cd build +cmake -DBUILD_SHARED_LIBS=False -DDISABLE_WERROR=True -DCMAKE_INSTALL_PREFIX=/usr/local/i686-w64-mingw32 -DCMAKE_C_COMPILER=i686-w64-mingw32-gcc -DCMAKE_SYSTEM_NAME="Windows" .. +make V=1 +sudo make install + +cd .. && rm -rf build + +mkdir build && cd build +cmake -DBUILD_SHARED_LIBS=False -DDISABLE_WERROR=True -DCMAKE_INSTALL_PREFIX=/usr/local/x86_64-w64-mingw32 -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_SYSTEM_NAME="Windows" .. +make V=1 +sudo make install + +cd .. && rm -rf build + +cd .. diff --git a/.travis.yml b/.travis.yml index 93b9e12..3b33c8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,10 @@ matrix: env: CHOST=i686-w64-mingw32 CONFIG="" - compiler: gcc env: CHOST=x86_64-w64-mingw32 CONFIG="" + - compiler: gcc + env: CHOST=i686-w64-mingw32 CONFIG="--enable-ovpn3" + - compiler: gcc + env: CHOST=x86_64-w64-mingw32 CONFIG="--enable-ovpn3" - compiler: gcc env: CHOST=i686-w64-mingw32 CONFIG="--disable-password-change" - compiler: gcc @@ -25,13 +29,14 @@ matrix: addons: apt: - packages: [ gcc-mingw-w64 ] + packages: [ gcc-mingw-w64, mingw-w64-tools, doxygen ] before_script: - unset CC; unset CXX script: - if [[ $CONFIG != *"--disable-password-change"* ]]; then . .travis-build-openssl.sh; fi + - if [[ $CONFIG == *"--enable-ovpn3"* ]]; then . .travis-build-jsonc.sh; fi - autoreconf -i -v - ./configure --prefix=/ --libdir=/lib --host=$CHOST --build=x86_64-pc-linux-gnu --program-prefix='' $CONFIG && make # build from tarball