From c99aecacde152d2e252c0cb86108ed37520dede2 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 11 Mar 2024 12:02:57 -0500
Subject: [PATCH] fix(ios): remove '--debug' from build declaration

The '--debug' flag should not be specified as a parameter in the
builder_describe call.
---
 common/web/gesture-recognizer/test.sh | 3 +--
 ios/samples/common.inc.sh             | 9 ++-------
 oem/firstvoices/ios/build.sh          | 1 -
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/common/web/gesture-recognizer/test.sh b/common/web/gesture-recognizer/test.sh
index 5e09082c91..4dc6251e45 100755
--- a/common/web/gesture-recognizer/test.sh
+++ b/common/web/gesture-recognizer/test.sh
@@ -18,8 +18,7 @@ builder_describe "Runs all tests for the gesture-recognizer module" \
   "test+" \
   ":headless   Runs headless user tests" \
   ":browser    Runs browser-based user tests" \
-  "--ci        Uses CI-based test configurations & emits CI-friendly test reports" \
-  "--debug,-d  Activates developer-friendly debug mode for unit tests where applicable"
+  "--ci        Uses CI-based test configurations & emits CI-friendly test reports"
 
 builder_parse "$@"
 
diff --git a/ios/samples/common.inc.sh b/ios/samples/common.inc.sh
index 55a815779b..cbfc4796fd 100755
--- a/ios/samples/common.inc.sh
+++ b/ios/samples/common.inc.sh
@@ -8,9 +8,7 @@ function do_build() {
   cp -Rf "$KEYMAN_ENGINE_FRAMEWORK_SRC" "$KEYMAN_ENGINE_FRAMEWORK_DST"
 
   CODE_SIGN=
-  # `builder_is_debug_build` appears to fail here, while referring to the option does not?
-  # Perhaps it's due to the main build definition being within a function?
-  if builder_has_option --debug; then
+  if builder_is_debug_build; then
     CODE_SIGN=CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED="NO" CODE_SIGNING_ENTITLEMENTS=""
   fi
 
@@ -30,15 +28,12 @@ function execute_sample_build() {
     "clean" \
     "configure" \
     "build" \
-    "--debug          Avoids codesigning and adds full sourcemaps for the embedded predictive-text engine" \
     "--sim-artifact+  Unused by this build at present"
 
   builder_parse "$@"
 
   local CONFIG=Release
-  # `builder_is_debug_build` appears to fail here, while referring to the option does not?
-  # Perhaps it's due to being within a function?
-  if builder_has_option --debug; then
+  if builder_is_debug_build; then
     CONFIG="Debug"
   fi
 
diff --git a/oem/firstvoices/ios/build.sh b/oem/firstvoices/ios/build.sh
index 03693589db..b8ec107774 100755
--- a/oem/firstvoices/ios/build.sh
+++ b/oem/firstvoices/ios/build.sh
@@ -22,7 +22,6 @@ builder_describe "Builds the $TARGET app for use on iOS devices - iPhone and iPa
   "clean" \
   "configure" \
   "build" \
-  "--debug         Avoids codesigning and adds full sourcemaps for the embedded predictive-text engine" \
   "--sim-artifact  Also outputs a simulator-friendly test artifact corresponding to the build"
 
 builder_parse "$@"