From b99e8c62e9a8c04c9077eccd65589e1b4e75ecec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= <sebastien.rombauts@gmail.com>
Date: Tue, 26 Jul 2016 18:45:16 +0200
Subject: [PATCH] Cleanup Travis CI configuration

---
 .travis.yml | 117 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 70 insertions(+), 47 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fcfd454..8a0f57e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 # Copyright (c) 2012-2016 Sebastien Rombauts (sebastien.rombauts@gmail.com)
 
-language: cpp
-
 # request for Ubuntu 14.04 Trusty VM
 sudo: true
 dist: trusty
@@ -9,115 +7,141 @@ dist: trusty
 cache:
   apt: true
 
+# NOTE: no language, so that we can set CXX and CC env vars as required
+#language: cpp
+
 matrix:
   include:
-      # gcc default
-    - env: COMPILERXX=g++
-      # clang default
-    - env: COMPILERXX=clang++
-      # clang 3.8
-    - os: linux
+    # gcc default
+    - compiler: gcc
       env:
-        - COMPILERXX=clang++
-        - LLVM_VERSION=3.8.0
-        - LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
-        - COMPILER=clang++
-        - CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1"
-        - CXXFLAGS=-lc++
-        - PATH=$HOME/clang-$LLVM_VERSION/bin:$PATH
-        - LD_LIBRARY_PATH=$HOME/clang-$LLVM_VERSION/lib:$LD_LIBRARY_PATH
-      before_install:
-       - wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
-       - mkdir $HOME/clang-$LLVM_VERSION
-       - tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang-$LLVM_VERSION --strip-components 1
-      # gcc 4.9 std=default
-    - addons:
+        - CC=gcc
+        - CXX=g++
+    # gcc 4.9 std=default
+    - compiler: gcc
+      addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-4.9
-      env: COMPILERXX=g++-4.9
+      env:
+        - CC=gcc-4.9
+        - CXX=g++-4.9
     # gcc 5 std=c++03
-    - addons:
+    - compiler: gcc
+      addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-5
       env:
-        - COMPILERXX=g++-5
+        - CC=gcc-5
+        - CXX=g++-5
         - CXXFLAGS="-std=c++03"
     # gcc 5 std=c++11
-    - addons:
+    - compiler: gcc
+      addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-5
       env:
-        - COMPILERXX=g++-5
+        - CC=gcc-5
+        - CXX=g++-5
         - CXXFLAGS="-std=c++11"
     # gcc 5 std=c++14
-    - addons:
+    - compiler: gcc
+      addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-5
       env:
-        - COMPILERXX=g++-5
+        - CC=gcc-5
+        - CXX=g++-5
         - CXXFLAGS="-std=c++14"
     # gcc 5 std=c++1z
-    - addons:
+    - compiler: gcc
+      addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-5
       env:
-        - COMPILERXX=g++-5
+        - CC=gcc-5
+        - CXX=g++-5
         - CXXFLAGS="-std=c++1z"
     # gcc 6 std=c++14
-    - addons:
+    - compiler: gcc
+      addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-6
       env:
-        - COMPILERXX=g++-6
+        - CXX=g++-6
         - CXXFLAGS="-std=c++14"
     # gcc 6 std=c++1z
-    - addons:
+    - compiler: gcc
+      addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-6
       env:
-        - COMPILERXX=g++-6
+        - CC=gcc-6
+        - CXX=g++-6
         - CXXFLAGS="-std=c++1z"
     # gcc 6 std=c++14 all warnings, pedantic
-    - addons:
+    - compiler: gcc
+      addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
             - g++-6
       env:
-        - COMPILERXX=g++-6
+        - CC=gcc-6
+        - CXX=g++-6
         - CXXFLAGS="-std=c++14 -Wall -Wextra -pedantic"
-     # os x
-    - os: osx
-      osx_image: xcode8
-      compiler: clang
-      install:
-       - brew install cmake
+    # clang default
+    - compiler: clang
       env:
-       - COMPILER=clang
-       - COMPILERXX=clang
-       - CXXFLAGS=-lstdc++
+        - CC=clang
+        - CXX=clang++
+    # clang 3.8
+    - compiler: clang
+      os: linux
+      env:
+        - CC=clang
+        - CXX=clang++
+        - LLVM_VERSION=3.8.0
+        - LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
+        - CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1"
+        - CXXFLAGS=-lc++
+        - PATH=$HOME/clang-$LLVM_VERSION/bin:$PATH
+        - LD_LIBRARY_PATH=$HOME/clang-$LLVM_VERSION/lib:$LD_LIBRARY_PATH
+      before_install:
+        - wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
+        - mkdir $HOME/clang-$LLVM_VERSION
+        - tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang-$LLVM_VERSION --strip-components 1
+    # os x
+    - compiler: clang
+      os: osx
+      osx_image: xcode8
+      install:
+        - brew install cmake
+      env:
+        - CC=clang
+        - CXX=clang
+        - CXXFLAGS=-lstdc++
 
 
 before_install:
@@ -127,7 +151,6 @@ before_install:
 before_script:
   - mkdir build
   - cd build
-  - export CXX=$COMPILERXX
   - cmake -DCMAKE_BUILD_TYPE=Debug -DSQLITECPP_USE_GCOV=ON -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON ..
 
 # build examples, and run tests (ie make & make test)