Merge pull request #11329 from keymanapp/chore/common/11324-this-scri…

…pt-path chore(common): maintenance on build scripts - cd
keymanapp · May 3, 2024 · c997965 · c997965
2 parents acb23e8 + 50bcfa4
commit c997965
Show file tree

Hide file tree

Showing 104 changed files with 241 additions and 489 deletions.
diff --git a/android/KMAPro/build.sh b/android/KMAPro/build.sh
@@ -1,22 +1,15 @@
 #!/usr/bin/env bash
 # Build Keyman for Android app (KMAPro)
-
-# set -x
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 # ################################ Main script ################################
 
 # Definition of global compile constants

diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh
@@ -1,21 +1,14 @@
 #!/usr/bin/env bash
 # Build Keyman Engine for Android using Keyman Web artifacts
 #
-
-#set -x
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 # ################################ Main script ################################
 
 # Definition of global compile constants

diff --git a/android/Samples/KMSample1/build.sh b/android/Samples/KMSample1/build.sh
@@ -1,22 +1,14 @@
 #!/usr/bin/env bash
 #
 # Samples: KMsample1
-
-set -eu
-# set -x: Debugging use, print each statement
-# set -x
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 ################################ Main script ################################
 
 # Definition of global compile constants

diff --git a/android/Samples/KMSample2/build.sh b/android/Samples/KMSample2/build.sh
@@ -1,22 +1,14 @@
 #!/usr/bin/env bash
 #
 # Samples: KMSample2
-
-set -eu
-# set -x: Debugging use, print each statement
-# set -x
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 ################################ Main script ################################
 
 # Definition of global compile constants

diff --git a/android/Tests/KeyboardHarness/build.sh b/android/Tests/KeyboardHarness/build.sh
@@ -1,21 +1,14 @@
 #!/usr/bin/env bash
 #
 # Build Test app: KeyboardHarness
-
-#set -x
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 ################################ Main script ################################
 
 # Definition of global compile constants
@@ -32,7 +25,7 @@ builder_describe "Build KeyboardHarness test app for Android." \
   ":app                   KeyboardHarness" \
   "--ci                   Don't start the Gradle daemon. Use for CI"
 
-# parse before describe outputs to check debug flags  
+# parse before describe outputs to check debug flags
 builder_parse "$@"
 
 ARTIFACT="app-release-unsigned.apk"

diff --git a/android/build.sh b/android/build.sh
@@ -2,21 +2,14 @@
 #
 # Build Keyman Engine for Android, Keyman for Android, OEM FirstVoices Android app,
 # Samples: KMsample1 and KMSample2, Test - KeyboardHarness
-
-#set -x
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 ################################ Main script ################################
 
 builder_describe \

diff --git a/common/build.sh b/common/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman common and resources modules" \

diff --git a/common/include/build.sh b/common/include/build.sh
@@ -2,18 +2,12 @@
 #
 # Creates keymanversion_build.h
 #
-
-# Exit on command failure and when using unset variables:
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-cd "$THIS_SCRIPT_PATH"
-
 builder_describe "Build keymanversion_build.h" configure build clean
 
 builder_describe_outputs \

diff --git a/common/linux/build.sh b/common/linux/build.sh
@@ -2,14 +2,9 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-if [[ $BUILDER_OS != linux ]]; then
-  builder_echo grey "Platform is not linux; skipping common/linux"
-  exit 0
-fi
-
 #
 # TODO: when we have linux-specific tests, add them here
 #       as child modules
@@ -23,6 +18,11 @@ builder_describe "Keyman common Linux modules" \
 
 builder_parse "$@"
 
+if [[ $BUILDER_OS != linux ]]; then
+  builder_echo grey "Platform is not linux; skipping common/linux"
+  exit 0
+fi
+
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_child_actions clean configure build test
diff --git a/common/mac/build.sh b/common/mac/build.sh
@@ -2,14 +2,9 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-if [[ $BUILDER_OS != mac ]]; then
-  builder_echo grey "Platform is not macOS; skipping common/mac"
-  exit 0
-fi
-
 #
 # TODO: when we have mac-specific tests, add them here
 #       as child modules
@@ -23,6 +18,11 @@ builder_describe "Keyman common mac modules" \
 
 builder_parse "$@"
 
+if [[ $BUILDER_OS != mac ]]; then
+  builder_echo grey "Platform is not macOS; skipping common/mac"
+  exit 0
+fi
+
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_child_actions clean configure build test
diff --git a/common/models/templates/build.sh b/common/models/templates/build.sh
@@ -2,19 +2,14 @@
 #
 # Compile our sourcemap-path remapping module for use by Web builds, releases, etc.
 #
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
-THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../resources/build/build-utils.sh"
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "$(dirname "$THIS_SCRIPT")/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$(dirname "$THIS_SCRIPT")"
-
 ################################ Main script ################################
 
 builder_describe "Builds the predictive-text model template implementation module" \

diff --git a/common/models/types/build.sh b/common/models/types/build.sh
@@ -2,18 +2,12 @@
 #
 # Packages the @keymanapp/models-types package.
 #
-
-# Exit on command failure and when using unset variables:
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-cd "$THIS_SCRIPT_PATH"
-
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
 

diff --git a/common/models/wordbreakers/build.sh b/common/models/wordbreakers/build.sh
@@ -2,19 +2,14 @@
 #
 # Compile our sourcemap-path remapping module for use by Web builds, releases, etc.
 #
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
-THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../resources/build/build-utils.sh"
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "$(dirname "$THIS_SCRIPT")/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$(dirname "$THIS_SCRIPT")"
-
 ################################ Main script ################################
 
 builder_describe "Builds the predictive-text wordbreaker implementation module" \

diff --git a/common/predictive-text/build.sh b/common/predictive-text/build.sh
@@ -3,23 +3,16 @@
 # Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications.
 # Designed for optimal compatibility with the Keyman Suite.
 #
-
-# Exit on command failure and when using unset variables:
-set -eu
-
 # Include some helper functions from resources
 
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$(dirname "$THIS_SCRIPT")"
-
 BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs"
 
 ################################ Main script ################################

diff --git a/common/test/keyboards/build.sh b/common/test/keyboards/build.sh
@@ -2,11 +2,9 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-cd "$THIS_SCRIPT_PATH"
-
 targets=()
 # Build list of available targets from subfolders, if none specified
 for d in */; do

diff --git a/common/test/keyboards/issue/6254-invalid-version-99/build.sh b/common/test/keyboards/issue/6254-invalid-version-99/build.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-set -e
-set -u
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"

diff --git a/common/tools/hextobin/build.sh b/common/tools/hextobin/build.sh
@@ -2,14 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 ################################ Main script ################################
 
 builder_describe "Build hextobin" clean configure build

diff --git a/common/tools/sourcemap-path-remapper/build.sh b/common/tools/sourcemap-path-remapper/build.sh
@@ -3,21 +3,14 @@
 # Compiles the JS sourcemap remapper tool used by some of our TS projects when complications
 # arise with sourcemap handling.
 #
-
-# Exit on command failure and when using unset variables:
-set -eu
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
 ################################ Main script ################################
 
 builder_describe "Builds a sourcemap manipulation ES module for use in Web-related builds" \