From 407827e5f9a933d300da52cf25b00e88cb67dcb5 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Fri, 17 Jan 2020 17:35:56 -0500
Subject: [PATCH] Update the create_dmg script to run macdeployqt every time.

We need it to strip the binary before creating the dmg.
---
 Building/MacOS/create_dmg | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Building/MacOS/create_dmg b/Building/MacOS/create_dmg
index cbab4105..4c913d5e 100755
--- a/Building/MacOS/create_dmg
+++ b/Building/MacOS/create_dmg
@@ -22,12 +22,6 @@ if [[ ${APP} != "" ]]; then
         exit 1
     fi
 
-    # Create a deployable application bundle (if it hasn't been already been done).
-    if [[ ! -d "${APP}/Contents/Frameworks/QtCore.framework" ]]; then
-        echo "${QT_BIN}"/macdeployqt "${APP}"
-        "${QT_BIN}"/macdeployqt "${APP}" || exit
-    fi
-
     # Get the version from the application bundle.
     VERSION=`/usr/libexec/PlistBuddy -c "Print CFBundleGetInfoString" ${APP}/Contents/Info.plist`
     echo ${APP} is version ${VERSION}
@@ -38,7 +32,16 @@ if [[ ${APP} != "" ]]; then
         if [[ ${GIT_REVISION} != "" ]]; then
             VERSION=${VERSION}-${GIT_REVISION}
         fi
+
+        # TODO: possibly add -no-strip to macdeployqt for prerelease versions
     fi
+
+    # Create a deployable application bundle (if it hasn't been already been done).
+    # Edit: do it every time so that the application gets stripped, just suppress the spurious warnings.
+    #if [[ ! -d "${APP}/Contents/Frameworks/QtCore.framework" ]]; then
+        echo "${QT_BIN}"/macdeployqt "${APP}"
+        "${QT_BIN}"/macdeployqt "${APP}" 2>/dev/null || exit
+    #fi
 fi
 
 mkdir "${STAGING_DIR}" || exit