From fe7df7130e6d5db1c2b179a248ca47cb579ac40e Mon Sep 17 00:00:00 2001
From: Felix Kauselmann <2039670+selmf@users.noreply.github.com>
Date: Sun, 16 Apr 2017 12:41:06 +0200
Subject: [PATCH] More mac compile script simplification

---
 compileOSX.sh | 8 ++++----
 releaseOSX.sh | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/compileOSX.sh b/compileOSX.sh
index 138120f2..722ae794 100755
--- a/compileOSX.sh
+++ b/compileOSX.sh
@@ -10,19 +10,19 @@ hash qmake 2>/dev/null || { echo >&2 "Qmake command not available. Please add th
 
 echo "Compiling YACReader"
 cd YACReader
-qmake CONFIG+=release
+qmake
 make
 cd ..
 
 echo "Compiling YACReaderLibrary"
 cd YACReaderLibrary
-qmake CONFIG+=release
+qmake
 make
 cd ..
 
 echo "Compiling YACReaderLibraryServer"
 cd YACReaderLibraryServer
-qmake CONFIG+=release
+qmake
 make
 cd ..
 
@@ -51,6 +51,6 @@ cp README.txt "${dest}/"
 echo "Creating dmg package"
 #tar -czf "${dest}".tar.gz "${dest}"
 #hdiutil create "${dest}".dmg -srcfolder "./${dest}" -ov
-./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}"
+dependencies/create-dmg/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 29b4770c..dafd649c 100755
--- a/releaseOSX.sh
+++ b/releaseOSX.sh
@@ -6,9 +6,11 @@ macdeployqt YACReader.app
 macdeployqt YACReaderLibrary.app -qmldir=YACReaderLibrary/qml
 macdeployqt YACReaderLibraryServer.app
 
+#TODO: This copies unneeded stuff into the respective apps
 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/