From 0341a4a3d1056c7c17534e707c187f17cdc4c8d4 Mon Sep 17 00:00:00 2001 From: jahorton Date: Thu, 6 Jul 2023 12:15:04 +0700 Subject: [PATCH] chore(ios): minor build-script cleanup --- ios/build.sh | 1 - ios/engine/build.sh | 1 - ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj | 6 +++--- ios/keyman/build.sh | 1 - ios/samples/KMSample1/build.sh | 2 ++ ios/samples/KMSample2/build.sh | 2 ++ ios/samples/common.inc.sh | 6 +++--- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ios/build.sh b/ios/build.sh index 2df59af0f9..933e3ca013 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -24,7 +24,6 @@ builder_describe "Builds Keyman Engine and the Keyman app for use on iOS devices ":sample1=Samples/KMSample1 Builds the first KeymanEngine sample app" \ ":sample2=Samples/KMSample2 Builds the second KeymanEngine sample app" \ ":fv=../oem/firstvoices/ios Builds OEM FirstVoices for iOS platforms" \ - "--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 "$@" diff --git a/ios/engine/build.sh b/ios/engine/build.sh index 6870637cfd..8a77c519ce 100755 --- a/ios/engine/build.sh +++ b/ios/engine/build.sh @@ -22,7 +22,6 @@ builder_describe "Builds Keyman Engine for use on iOS devices - iPhone and iPad. "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 "$@" diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj index 012d3ba08f..5f2fad4ced 100644 --- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj +++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj @@ -205,8 +205,8 @@ 16A9229D20325253003CC98E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Keyman/Info.plist; sourceTree = SOURCE_ROOT; }; 293EA3E027059C6900545EED /* ha */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ha; path = ha.lproj/Localizable.strings; sourceTree = ""; }; 294914742738DF7700400732 /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/Localizable.strings"; sourceTree = ""; }; - 298566B829802828004ACA95 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; 297810FD297FA818007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kn; path = kn.lproj/Localizable.strings; sourceTree = ""; }; + 298566B829802828004ACA95 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; 298566C42980C493004ACA95 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; }; 298566D02980D354004ACA95 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = ""; }; 298566DC2980E416004ACA95 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; @@ -994,7 +994,7 @@ outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; + shellPath = "/usr/bin/env bash"; shellScript = "if which swiftlint >/dev/null; then\n swiftlint --config ../../.swiftlint.yml\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; }; CE7E13D8240E285800252C00 /* Run Script - set versions */ = { @@ -1030,7 +1030,7 @@ outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; + shellPath = "/usr/bin/env bash"; shellScript = ". \"$KEYMAN_ROOT/resources/build/xcode-utils.sh\"\n\n# Calls resource script to update build products' versioning.\nphaseSetBundleVersions\n"; showEnvVarsInLog = 0; }; diff --git a/ios/keyman/build.sh b/ios/keyman/build.sh index a7cd8ffdfd..64b2cc2c97 100755 --- a/ios/keyman/build.sh +++ b/ios/keyman/build.sh @@ -20,7 +20,6 @@ builder_describe "Builds Keyman Engine and the Keyman app for use on iOS devices "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 "$@" diff --git a/ios/samples/KMSample1/build.sh b/ios/samples/KMSample1/build.sh index 414a97b7f2..f7bb8798c7 100755 --- a/ios/samples/KMSample1/build.sh +++ b/ios/samples/KMSample1/build.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" diff --git a/ios/samples/KMSample2/build.sh b/ios/samples/KMSample2/build.sh index fda6479ebc..0b0fdc542d 100755 --- a/ios/samples/KMSample2/build.sh +++ b/ios/samples/KMSample2/build.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" diff --git a/ios/samples/common.inc.sh b/ios/samples/common.inc.sh index aac07b6af3..fb8d8e969c 100755 --- a/ios/samples/common.inc.sh +++ b/ios/samples/common.inc.sh @@ -40,10 +40,10 @@ function execute_sample_build() { CONFIG="Debug" fi - local BUILD_FOLDER="$KEYMAN_ROOT/ios/samples/$TARGET/build" + local BUILD_FOLDER="ios/samples/$TARGET/build" builder_describe_outputs \ - build "$BUILD_FOLDER" + build "/$BUILD_FOLDER" ### START OF THE BUILD ### @@ -51,6 +51,6 @@ function execute_sample_build() { KEYMAN_ENGINE_FRAMEWORK_SRC="$KEYMAN_ROOT/ios/build/Build/Products/$CONFIG/KeymanEngine.xcframework" KEYMAN_ENGINE_FRAMEWORK_DST=./ - builder_run_action clean rm -rf "$BUILD_FOLDER" + builder_run_action clean rm -rf "$KEYMAN_ROOT/$BUILD_FOLDER" builder_run_action build do_build } \ No newline at end of file