Update build utilities for more general use

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

travis-env-vars

 export TRAVIS_OS_NAME=linux
-export TRAVIS_BUILD_DIR=/home/icraggs/git/paho.mqtt.c
+export TRAVIS_BUILD_DIR=$PWD

travis-macos-vars

 export TRAVIS_OS_NAME=osx
-export TRAVIS_BUILD_DIR=/Users/icraggs/git/paho.mqtt.c
+export TRAVIS_BUILD_DIR=$PWD