gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/0e0e4d29 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/14b72ea1 (commit)
	from  https://github.com/Gnucash/gnucash/commit/197faeab (commit)



commit 0e0e4d294e493911004f2e5c53eeedc798fa92a4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Sep 2 11:05:30 2017 +0200

    Set up a build matrix on Travis CI
    
    This will run the different builds in parallel (depending on
    resource availability on Travis).
    
    The advantages are
    - faster test results
    - easier to spot which build type has failed
    - shorter test log per build type to parse

diff --git a/.travis.yml b/.travis.yml
index 9b903b0..cd1626a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,10 @@ language: c
 compiler:
   - gcc
 #  - clang
+env:
+  - BUILDTYPE=cmake-make
+  - BUILDTYPE=cmake-ninja
+  - BUILDTYPE=autotools
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get build-dep -qq gnucash
@@ -13,22 +17,26 @@ script: |
   set -ev
 
   # First, do the cmake build using the default Makefile generator
-  mkdir /tmp/gnucash-build-cmake-make
-  cd /tmp/gnucash-build-cmake-make
-  cmake $TRAVIS_BUILD_DIR
-  make -j 4
-  make check
+  if [[ "$BUILDTYPE" == "cmake-make" ]]; then
+    mkdir /tmp/gnucash-build-cmake-make
+    cd /tmp/gnucash-build-cmake-make
+    cmake $TRAVIS_BUILD_DIR
+    make -j 4
+    make check
 
   # Next, do cmake again, using the Ninja generator this time
-  mkdir /tmp/gnucash-build-cmake-ninja
-  cd /tmp/gnucash-build-cmake-ninja
-  cmake -G Ninja $TRAVIS_BUILD_DIR
-  ninja
-  ninja check
+  elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
+    mkdir /tmp/gnucash-build-cmake-ninja
+    cd /tmp/gnucash-build-cmake-ninja
+    cmake -G Ninja $TRAVIS_BUILD_DIR
+    ninja
+    ninja check
 
   # Finally, do the autotools build
-  cd $TRAVIS_BUILD_DIR
-  ./autogen.sh
-  ./configure
-  make
-  make check
+  elif [[ "$BUILDTYPE" == "autotools" ]]; then
+    cd $TRAVIS_BUILD_DIR
+    ./autogen.sh
+    ./configure
+    make
+    make check
+  fi

commit 14b72ea11d948999968616f5b8c14a46ab70753d
Author: Rob Gowin <robgowin at gmail.com>
Date:   Fri Sep 1 17:48:25 2017 -0500

    Enable CMake build in Travis CI

diff --git a/.travis.yml b/.travis.yml
index 1660d5c..9b903b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,29 @@ compiler:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get build-dep -qq gnucash
-  - sudo apt-get install -qq swig xsltproc libdbd-sqlite3
+  - sudo apt-get install -qq swig xsltproc libdbd-sqlite3 cmake3 texinfo ninja-build
   - sudo apt-get --reinstall install -qq language-pack-en language-pack-fr
-script: ./autogen.sh && ./configure && make && make check
+script: |
+  # The -e here says that if any line below fails, the whole script fails
+  set -ev
+
+  # First, do the cmake build using the default Makefile generator
+  mkdir /tmp/gnucash-build-cmake-make
+  cd /tmp/gnucash-build-cmake-make
+  cmake $TRAVIS_BUILD_DIR
+  make -j 4
+  make check
+
+  # Next, do cmake again, using the Ninja generator this time
+  mkdir /tmp/gnucash-build-cmake-ninja
+  cd /tmp/gnucash-build-cmake-ninja
+  cmake -G Ninja $TRAVIS_BUILD_DIR
+  ninja
+  ninja check
+
+  # Finally, do the autotools build
+  cd $TRAVIS_BUILD_DIR
+  ./autogen.sh
+  ./configure
+  make
+  make check



Summary of changes:
 .travis.yml | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)