From c038e6b50497a4c63044a509e925a6eebff3e747 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Mon, 21 Sep 2015 19:54:36 -0400 Subject: [PATCH] GH398: Add mingw cross-compile, etc. For all release branches. It adds travis build support. If you don't have a config file it uses the default (because we enabled travis for the project), which uses ruby/rake/rakefiles, and you get confusing "build still failing" messages. Reviewed-by: Andy Polyakov (cherry picked from commit db9defdfe306e1adf0af7188b187d535eb0268da) --- .travis.yml | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 286247358a..cb28758e89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,50 @@ language: c +addons: + apt_packages: + - binutils-mingw-w64 + - gcc-mingw-w64 + os: - - linux - - osx + - linux + - osx compiler: - - clang - - gcc + - clang + - gcc + - i686-w64-mingw32-gcc + - x86_64-w64-mingw32-gcc env: - - CONFIG_OPTS="" - - CONFIG_OPTS="--debug" - - CONFIG_OPTS="shared" + - CONFIG_OPTS="" + - CONFIG_OPTS="shared" + - CONFIG_OPTS="--debug --strict-warnings" + +matrix: + exclude: + - os: osx + compiler: i686-w64-mingw32-gcc + - os: osx + compiler: x86_64-w64-mingw32-gcc + +before_script: + - if [ "$CC" == i686-w64-mingw32-gcc ]; then + export CROSS_COMPILE=${CC%%gcc}; unset CC; + ./Configure mingw $CONFIG_OPTS; + elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then + export CROSS_COMPILE=${CC%%gcc}; unset CC; + ./Configure mingw64 $CONFIG_OPTS; + else + ./config $CONFIG_OPTS; + fi script: - - ./config $CONFIG_OPTS && make && make test + - make + - if [ -z "$CROSS_COMPILE" ]; then make test; fi notifications: - recipient: - - openssl-dev@openssl.org - email: - on_success: change - on_failure: always + recipient: + - openssl-commits@openssl.org + email: + on_success: change + on_failure: always -- 2.25.1