From 2af6d8956602cfb65215daacbb7c351ba5ed7ca3 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed, 19 Jul 2017 16:29:36 +0100
Subject: [PATCH] Update build utilities for more general use

---
 travis-build.sh   | 32 ++++++++++----------------------
 travis-env-vars   |  2 +-
 travis-macos-vars |  2 +-
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/travis-build.sh b/travis-build.sh
index 15eafaf9..5356f8ba 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -2,26 +2,14 @@
 
 set -e
 
-if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-  mkdir build.paho
-  cd build.paho
-  echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD"
-  cmake -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE ..
-  make
-  python ../test/mqttsas2.py &
-  ctest -VV --timeout 600
-  kill %1
-  killall mosquitto
-fi
+rm -rf build.paho
+mkdir build.paho
+cd build.paho
+echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD"
+cmake -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE ..
+make
+python ../test/mqttsas2.py &
+ctest -VV --timeout 600
+kill %1
+killall mosquitto
 
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-  mkdir build.paho
-  cd build.paho
-  echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD"
-  cmake -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE ..
-  make
-  python ../test/mqttsas2.py &
-  ctest -VV --timeout 600
-  kill %1
-  killall mosquitto
-fi
diff --git a/travis-env-vars b/travis-env-vars
index 1ee92860..2551ccb6 100644
--- a/travis-env-vars
+++ b/travis-env-vars
@@ -1,2 +1,2 @@
 export TRAVIS_OS_NAME=linux
-export TRAVIS_BUILD_DIR=/home/icraggs/git/paho.mqtt.c
+export TRAVIS_BUILD_DIR=$PWD
diff --git a/travis-macos-vars b/travis-macos-vars
index 8259c3ab..bbdbccb5 100644
--- a/travis-macos-vars
+++ b/travis-macos-vars
@@ -1,2 +1,2 @@
 export TRAVIS_OS_NAME=osx
-export TRAVIS_BUILD_DIR=/Users/icraggs/git/paho.mqtt.c
+export TRAVIS_BUILD_DIR=$PWD