From 7f6a248fe2c95711030de55de4ef568760026a4b Mon Sep 17 00:00:00 2001
From: Felix Kauselmann <2039670+selmf@users.noreply.github.com>
Date: Mon, 10 Apr 2017 20:13:53 +0200
Subject: [PATCH] give the mac OS build scripts a much needed update

---
 cleanOSX.sh   |  2 ++
 compileOSX.sh | 48 ++++++++++++++++++++++++++----------------------
 releaseOSX.sh | 25 +++++++++++++------------
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/cleanOSX.sh b/cleanOSX.sh
index 5923cf7a..06a5f3ca 100755
--- a/cleanOSX.sh
+++ b/cleanOSX.sh
@@ -10,5 +10,7 @@ cd ..
 cd YACReaderLibrary
 make clean
 rm -R YACReaderLibrary.app
+cd ..
+cd YACReaderLibraryServer
 rm -R YACReaderLibraryServer.app
 cd ..
diff --git a/compileOSX.sh b/compileOSX.sh
index b5a34ed8..138120f2 100755
--- a/compileOSX.sh
+++ b/compileOSX.sh
@@ -1,52 +1,56 @@
 #! /bin/bash
-if [ $2 == "clean" ]; then
+
+VERSION=${1:-"8.6.0"}
+
+if [ "$2" == "clean" ]; then
 ./cleanOSX.sh
 fi
 
+hash qmake 2>/dev/null || { echo >&2 "Qmake command not available. Please add the bin subfolder of your Qt installation to the PATH environment variable."; exit 1; }
+
 echo "Compiling YACReader"
-cd ./YACReader
-/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/qmake YACReader.pro  -spec macx-clang "CONFIG+=release"
+cd YACReader
+qmake CONFIG+=release
 make
 cd ..
 
 echo "Compiling YACReaderLibrary"
-cd ./YACReaderLibrary
-/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/qmake YACReaderLibrary.pro -spec macx-clang "CONFIG+=release"
+cd YACReaderLibrary
+qmake CONFIG+=release
 make
 cd ..
 
 echo "Compiling YACReaderLibraryServer"
-cd ./YACReaderLibrary
-make clean
-/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/qmake YACReaderLibraryServer.pro -spec macx-clang "CONFIG+=release"
+cd YACReaderLibraryServer
+qmake CONFIG+=release
 make
 cd ..
 
 echo "Configuring release apps"
 
-cp -R ./YACReader/YACReader.app ./YACReader.app
-cp -R ./YACReaderLibrary/YACReaderLibrary.app ./YACReaderLibrary.app
-cp -R ./YACReaderLibrary/YACReaderLibraryServer.app ./YACReaderLibraryServer.app
+cp -R YACReader/YACReader.app YACReader.app
+cp -R YACReaderLibrary/YACReaderLibrary.app YACReaderLibrary.app
+cp -R YACReaderLibraryServer/YACReaderLibraryServer.app YACReaderLibraryServer.app
 
 ./releaseOSX.sh
 
 echo "Copying to destination folder"
-dest='YACReader-'$1' MacOSX-Intel'
-mkdir "$dest"
-cp -R ./YACReader.app "./${dest}/YACReader.app"
-cp -R ./YACReaderLibrary.app "./${dest}/YACReaderLibrary.app"
-cp -R ./YACReaderLibraryServer.app "./${dest}/YACReaderLibraryServer"
+dest="YACReader-$VERSION MacOSX-Intel"
+mkdir -p "$dest"
+cp -R YACReader.app "${dest}/YACReader.app"
+cp -R YACReaderLibrary.app "${dest}/YACReaderLibrary.app"
+cp -R YACReaderLibraryServer.app "${dest}/YACReaderLibraryServer"
 
-cp ./COPYING.txt "./${dest}/"
-cp ./README.txt "./${dest}/"
+cp COPYING.txt "${dest}/"
+cp README.txt "${dest}/"
 
-#mkdir "./${dest}/icons/"
-#cp ./images/db.png "./${dest}/icons/"
-#cp ./images/coversPackage.png "./${dest}/icons/"
+#mkdir -p "${dest}/icons/"
+#cp images/db.png "${dest}/icons/"
+#cp images/coversPackage.png "${dest}/icons/"
 
 echo "Creating dmg package"
 #tar -czf "${dest}".tar.gz "${dest}"
 #hdiutil create "${dest}".dmg -srcfolder "./${dest}" -ov
-./create-dmg --volname 'YACReader '$1' Installer' --volicon icon.icns --window-size 600 403 --icon-size 128 --app-drop-link 485 90 --background background.png --icon YACReader 80 90 --icon YACReaderLibrary 235 90 --eula COPYING.txt --icon YACReaderLibraryServer 470 295 --icon README.txt 120 295 --icon COPYING.txt 290 295 "./${dest}.dmg" "./${dest}"
+./create-dmg --volname 'YACReader '$VERSION' Installer' --volicon icon.icns --window-size 600 403 --icon-size 128 --app-drop-link 485 90 --background background.png --icon YACReader 80 90 --icon YACReaderLibrary 235 90 --eula COPYING.txt --icon YACReaderLibraryServer 470 295 --icon README.txt 120 295 --icon COPYING.txt 290 295 "${dest}.dmg" "${dest}"
 
 echo "Done!"
diff --git a/releaseOSX.sh b/releaseOSX.sh
index 6eafa3e9..29b4770c 100755
--- a/releaseOSX.sh
+++ b/releaseOSX.sh
@@ -1,17 +1,18 @@
 #!/bin/bash
 
-/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/macdeployqt YACReader.app
-/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/macdeployqt YACReaderLibrary.app -qmldir=./YACReaderLibrary/qml
-/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/macdeployqt YACReaderLibraryServer.app
+hash macdeployqt 2>/dev/null || { echo >&2 "Qmake command not available. Please add the bin subfolder of your Qt installation  to the PATH environment variable."; exit 1; }
 
-cp -R ./utils ./YACReader.app/Contents/MacOS/
-cp -R ./utils ./YACReaderLibrary.app/Contents/MacOS/
-cp -R ./utils ./YACReaderLibraryServer.app/Contents/MacOS/
-cp -R ./release/server ./YACReaderLibrary.app/Contents/MacOS/
-cp -R ./release/server ./YACReaderLibraryServer.app/Contents/MacOS/
-cp -R ./release/languages ./YACReader.app/Contents/MacOS/
-cp -R ./release/languages ./YACReaderLibrary.app/Contents/MacOS/
-cp -R ./release/languages ./YACReaderLibraryServer.app/Contents/MacOS/
+macdeployqt YACReader.app
+macdeployqt YACReaderLibrary.app -qmldir=YACReaderLibrary/qml
+macdeployqt YACReaderLibraryServer.app
+
+cp -R utils YACReader.app/Contents/MacOS/
+cp -R utils YACReaderLibrary.app/Contents/MacOS/
+cp -R utils YACReaderLibraryServer.app/Contents/MacOS/
+cp -R release/server YACReaderLibrary.app/Contents/MacOS/
+cp -R release/server YACReaderLibraryServer.app/Contents/MacOS/
+cp -R release/languages YACReader.app/Contents/MacOS/
+cp -R release/languages YACReaderLibrary.app/Contents/MacOS/
+cp -R release/languages YACReaderLibraryServer.app/Contents/MacOS/
 
 #./signapps.sh
-