From 8b6ffa40662020ae8769f62b6045d3f062e5bf01 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Thu, 6 Oct 2016 16:04:55 +0200
Subject: [PATCH] Move travis-ci script to shell file

This will allow easier integration for testing other build systems
---
 .travis.yml              | 23 +----------------------
 build/tools/travis-ci.sh | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100755 build/tools/travis-ci.sh

diff --git a/.travis.yml b/.travis.yml
index b3065f5b19..6a50afe28e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,25 +37,4 @@ notifications:
 
 before_install: ./build/tools/before_install.sh
 
-script: |
-    echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r' &&
-    ./configure --disable-optimise $wxCONFIGURE_FLAGS &&
-    echo -en 'travis_fold:end:script.1\\r' &&
-    echo 'Building...' && echo -en 'travis_fold:start:script.2\\r' &&
-    make &&
-    echo -en 'travis_fold:end:script.2\\r' &&
-    echo 'Testing...' && echo -en 'travis_fold:start:script.3\\r' &&
-    make -C tests &&
-    pushd tests &&
-    ./test -t &&
-    popd &&
-    echo -en 'travis_fold:end:script.3\\r' &&
-    echo 'Building the samples...' && echo -en 'travis_fold:start:script.4\\r' &&
-    make samples &&
-    echo -en 'travis_fold:end:script.4\\r' &&
-    echo 'Installing...' && echo -en 'travis_fold:start:script.5\\r' &&
-    sudo make install &&
-    echo -en 'travis_fold:end:script.5\\r' &&
-    echo 'Testing building with the installed version...' && echo -en 'travis_fold:start:script.6\\r' &&
-    make -C samples/minimal -f makefile.unx $wxMAKEFILE_FLAGS &&
-    echo -en 'travis_fold:end:script.6\\r'
+script: bash build/tools/travis-ci.sh
diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh
new file mode 100755
index 0000000000..d8638a22d0
--- /dev/null
+++ b/build/tools/travis-ci.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# This script is used by Travis CI to configure, build and test wxWidgets
+
+set -e
+
+echo 'travis_fold:start:configure'
+echo 'Configuring...' 
+./configure --disable-optimise $wxCONFIGURE_FLAGS
+echo 'travis_fold:end:configure'
+echo 'travis_fold:start:building'
+echo 'Building...'
+make
+echo 'travis_fold:end:building'
+echo 'travis_fold:start:testing'
+echo 'Testing...'
+make -C tests
+pushd tests
+./test -t
+popd
+echo 'travis_fold:end:testing'
+echo 'travis_fold:start:samples'
+echo 'Building the samples...'
+make samples
+echo 'travis_fold:end:samples'
+echo 'travis_fold:start:installing'
+echo 'Installing...'
+sudo make install
+echo 'travis_fold:end:installing'
+echo 'travis_fold:start:test_install'
+echo 'Testing building with the installed version...'
+make -C samples/minimal -f makefile.unx $wxMAKEFILE_FLAGS
+echo 'travis_fold:end:test_install'