From 726f5e2b53d19a625be3cd3f5bb16a2273c0cf99 Mon Sep 17 00:00:00 2001
From: jwestfall <jwestfall@surrealistic.net>
Date: Thu, 24 Jan 2019 19:45:40 -0800
Subject: [PATCH] OSX: let build_installer.sh create a working Barrier.app on
 debug builds

build_installer.sh on OSX is responsible for populating Barrier.app to
make it viable to run and creating a dmg for release.  However its only
works if you run it against a release build.  This patch makes so you can
run it on a debug build and it will populate Barrier.app but doesn't
create the dmg.
---
 dist/macos/bundle/build_installer.sh.in | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dist/macos/bundle/build_installer.sh.in b/dist/macos/bundle/build_installer.sh.in
index 40f40745..4565348d 100755
--- a/dist/macos/bundle/build_installer.sh.in
+++ b/dist/macos/bundle/build_installer.sh.in
@@ -3,12 +3,6 @@
 # change this to rename the installer package
 B_DMG="Barrier-@BARRIER_VERSION@.dmg"
 
-# sanity check so we don't distribute packages full of debug symbols
-if [ "@CMAKE_BUILD_TYPE@" != "Release" ]; then
-    echo Will only build installers for Release builds
-    exit 1
-fi
-
 cd @CMAKE_CURRENT_SOURCE_DIR@/build/bundle || exit 1
 
 B_REREF_SCRIPT=@CMAKE_CURRENT_SOURCE_DIR@/build/bundle/reref_dylibs.sh
@@ -68,6 +62,14 @@ $B_REREF_SCRIPT platforms/libqcocoa.dylib ../ || exit 1
 printf "%s\n" "#!/bin/sh" "cd \$(dirname \$0)" "exec ./barrier" > barrier.sh
 chmod +x barrier.sh
 
+echo "Barrier.app created successfully"
+
+# sanity check so we don't distribute a dmg with debug symbols
+if [ "@CMAKE_BUILD_TYPE@" != "Release" ]; then
+    echo "dmg only created for Release builds"
+    exit 1
+fi
+
 # create the DMG to be distributed in build/bundle
 cd ../../..
 hdiutil create -size 64m -fs HFS+ -volname "Barrier" temp.dmg || exit 1
@@ -77,4 +79,4 @@ hdiutil detach mnt || exit 1
 hdiutil convert temp.dmg -format UDZO -o $B_DMG || exit 1
 rm temp.dmg
 
-echo "Installer created successfully"
+echo "dmg $B_DMB created successfully"