5 files changed, 24 insertions, 13 deletions
diff --git a/scripts/android/travisbuild.sh b/scripts/android/travisbuild.sh
index 4887ea684..8cec02585 100644
--- a/scripts/android/travisbuild.sh
+++ b/scripts/android/travisbuild.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -x
+set -e
+
 docker exec -t builder subsurface/packaging/android/android-build-wrapper.sh
 
 # Extract the built apk from the builder container
diff --git a/scripts/build.sh b/scripts/build.sh
index 23b978efa..6b214a866 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -451,9 +451,6 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then
 	git checkout master
 	git pull --rebase
 
-	# remove the qt_build_config from .qmake.conf as that fails on Travis
-	sed -i '' 's/.*qt_build_config.*//' .qmake.conf
-
 	mkdir -p build
 	cd build
 	$QMAKE -query
@@ -461,7 +458,8 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then
 	# on Travis the compiler doesn't support c++1z, yet qmake adds that flag;
 	# since things compile fine with c++11, let's just hack that away
 	# similarly, don't use -Wdata-time
-	sed -i 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' Makefile
+	mv Makefile Makefile.bak
+	cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile
 	make -j4
 	make install
 fi
diff --git a/scripts/linux/travisbuild.sh b/scripts/linux/travisbuild.sh
index 244320d8d..3e48544f6 100644
--- a/scripts/linux/travisbuild.sh
+++ b/scripts/linux/travisbuild.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -x
+set -e
 
 # this gets executed by Travis when building an AppImage for Linux
 # it gets started from inside the subsurface directory
diff --git a/scripts/mac/travisbuild.sh b/scripts/mac/travisbuild.sh
index f056f3e86..40fad844f 100644
--- a/scripts/mac/travisbuild.sh
+++ b/scripts/mac/travisbuild.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -x
+set -e
+
 # this gets executed by Travis when building an App for Mac
 # it gets started from inside the subsurface directory
 
@@ -12,8 +15,7 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
 cd ${TRAVIS_BUILD_DIR}/..
 DIR=$(pwd)
 
-#bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit # we need to build 'both' and need to build without BT and other variations that we want to exercise
-bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -skip-googlemaps
+bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit
 
 cd ${TRAVIS_BUILD_DIR}/build
 
@@ -31,17 +33,21 @@ for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do
 		install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} ${EXECUTABLE}
 		install_name_tool -id @executable_path/../Frameworks/${SONAME} Subsurface.app/Contents/Frameworks/${SONAME}
 		# also fix incorrect references inside of libgit2
-		if [[ "$i" = "libgit2" ]] ; then
-			CURLLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libcurl | cut -d\  -f1 | tr -d "\t")
-			install_name_tool -change ${CURLLIB} @executable_path/../Frameworks/$(basename ${CURLLIB}) Subsurface.app/Contents/Frameworks/${SONAME}
-			SSHLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh2 | cut -d\  -f1 | tr -d "\t")
-			install_name_tool -change ${SSHLIB} @executable_path/../Frameworks/$(basename ${SSHLIB}) Subsurface.app/Contents/Frameworks/${SONAME}
-		fi
+		# if [[ "$i" = "libgit2" ]] ; then
+		# 	CURLLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libcurl | cut -d\  -f1 | tr -d "\t")
+		# 	if [ ! -z $CURLLIB ] ; then
+		# 		install_name_tool -change ${CURLLIB} @executable_path/../Frameworks/$(basename ${CURLLIB}) Subsurface.app/Contents/Frameworks/${SONAME}
+		# 	fi
+		# 	SSHLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh2 | cut -d\  -f1 | tr -d "\t")
+		# 	if [ ! -z $SSHLIB ] ; then
+		# 		install_name_tool -change ${SSHLIB} @executable_path/../Frameworks/$(basename ${SSHLIB}) Subsurface.app/Contents/Frameworks/${SONAME}
+		# 	fi
+		# fi
 	fi
 done
 
 # next, copy libssh2.1
-cp ${DIR}/install-root/lib/libssh2.1.dylib Subsurface.app/Contents/Frameworks
+# cp ${DIR}/install-root/lib/libssh2.1.dylib Subsurface.app/Contents/Frameworks
 
 # next, replace @rpath references with @executable_path references in Subsurface
 RPATH=$(otool -L ${EXECUTABLE} | grep rpath  | cut -d\  -f1 | tr -d "\t" | cut -b 8- )
diff --git a/scripts/windows/travisbuild.sh b/scripts/windows/travisbuild.sh
index e8455ea87..6ca94c888 100644
--- a/scripts/windows/travisbuild.sh
+++ b/scripts/windows/travisbuild.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -x
+set -e
+
 # this gets executed by Travis when building an installer for Windows
 # it gets started from inside the subsurface directory
 # with all the other projects downloaded and installed in parralel to