From da8dbc59fb13df6fe7aab7c8c5402cd7bf60091d Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 19 Nov 2020 10:24:36 +1100
Subject: [PATCH] fix(mac): codesign resilience

This PR tries to make codesign more resilient to failure, by retrying
a build step that falls over with code 65. This code is not limited to
codesign but most frequently happens with it.

A more complete answer would be to do the codesigning step in build.sh
instead of in the project, which would give us more control of the
outcome, and maybe simplify the build process somewhat, but I will
leave that for now, because it is usually better to leave that to XCode.
---
 mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj | 4 ++--
 mac/build.sh                                            | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
index db649c2ab5..5c5dfed6e9 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
+++ b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
@@ -996,7 +996,7 @@
 				INFOPLIST_FILE = Keyman4MacIM/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CODE_SIGN_FLAGS = "--timestamp";
+				OTHER_CODE_SIGN_FLAGS = "--timestamp --verbose";
 				PRODUCT_BUNDLE_IDENTIFIER = "keyman.inputmethod.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PRODUCT_VERSION = 0.0.1;
@@ -1036,7 +1036,7 @@
 				INFOPLIST_FILE = Keyman4MacIM/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CODE_SIGN_FLAGS = "--timestamp";
+				OTHER_CODE_SIGN_FLAGS = "--timestamp --verbose";
 				PRODUCT_BUNDLE_IDENTIFIER = "keyman.inputmethod.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PRODUCT_VERSION = 0.0.1;
diff --git a/mac/build.sh b/mac/build.sh
index b9428a82a5..61b3dd7673 100755
--- a/mac/build.sh
+++ b/mac/build.sh
@@ -286,8 +286,17 @@ execBuildCommand() {
     typeset ret_code
 
     displayInfo "Building $component:" "$cmnd"
+    set +e
     eval $cmnd
+    set -e
     ret_code=$?
+    if [ $ret_code == 65 ]; then
+        # This is often a codesign failure, possibly due to a timeout. We'll retry once before failing
+        displayInfo "Failed to build with code 65, possibly codesign failure. Retrying build of $component:" "$cmnd"
+        eval $cmnd
+        ret_code=$?
+    fi
+
     if [ $ret_code != 0 ]; then
         fail "Build of $component failed! Error: [$ret_code] when executing command: '$cmnd'"
     fi