[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  db9defdfe306e1adf0af7188b187d535eb0268da (commit)
      from  2aa707c6ac033eab6a36f686b6c90f47a5e32691 (commit)


- Log -----------------------------------------------------------------
commit db9defdfe306e1adf0af7188b187d535eb0268da
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Sep 21 19:54:36 2015 -0400

    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 <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml | 52 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2862473..cb28758 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 at openssl.org
-  email:
-    on_success: change
-    on_failure: always
+    recipient:
+        - openssl-commits at openssl.org
+    email:
+        on_success: change
+        on_failure: always