From f394245636d4238f15cff570eacdae4ece71a423 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Sat, 2 Aug 2025 07:53:42 +1000 Subject: [PATCH] maint(common): consolidate builder scripts Clarifies the confusing builder.inc.sh / build-utils.sh distinction by giving the scripts more appropriate names. Most build scripts should use builder-full.inc.sh; some helper scripts can use builder-basic.inc.sh. Documented in resources/build/README.md. Renames: * resources/build/builder.inc.sh to resources/build/builder-full.inc.sh * resources/build/build-utils.sh to resources/build/builder-basic.inc.sh Other changes: * Moves Android-specific functions out of builder-basic.inc.sh and into android/build.sh. * Renames functions in builder-basic.inc.sh More functions may be moved from builder-basic.inc.sh into utils.inc.sh or other scripts in the future. Fixes: #14065 Build-bot: build all Test-bot: skip --- .github/workflows/deb-packaging.yml | 2 +- .gitignore | 2 +- android/KMAPro/build.sh | 2 +- android/KMEA/build.sh | 2 +- android/Samples/KMSample1/build.sh | 2 +- android/Samples/KMSample2/build.sh | 2 +- android/Tests/KeyboardHarness/build.sh | 2 +- android/build.sh | 16 +++- android/utility/i18n-check-unused-strings.sh | 2 +- build.sh | 2 +- common/build.sh | 2 +- common/include/build.sh | 2 +- common/linux/build.sh | 2 +- common/mac/build.sh | 2 +- common/test/keyboards/baseline/build.sh | 2 +- common/test/keyboards/build.sh | 2 +- .../issue/6254-invalid-version-99/build.sh | 2 +- .../test/resources/test_kill_browserstack.sh | 2 +- common/tools/hextobin/build.sh | 2 +- common/tools/sourcemap-path-remapper/build.sh | 2 +- common/web/build.sh | 2 +- common/web/keyman-version/build.sh | 2 +- common/web/langtags/build.sh | 2 +- common/web/types/build.sh | 2 +- common/windows/build.sh | 2 +- common/windows/cef-checkout.sh | 2 +- common/windows/data/build.sh | 2 +- common/windows/delphi/build.sh | 2 +- common/windows/delphi/components/build.sh | 2 +- .../delphi/general/KeymanVersionInfo.inc | 2 +- .../delphi/general/keymanversion_build.in | 2 +- common/windows/delphi/tools/build.sh | 2 +- .../tools/build_standards_data/build.sh | 2 +- .../delphi/tools/buildunidata/build.sh | 2 +- .../delphi/tools/certificates/build.sh | 2 +- common/windows/delphi/tools/devtools/build.sh | 2 +- .../windows/delphi/tools/sentrytool/build.sh | 2 +- .../windows/delphi/tools/test-klog/build.sh | 2 +- .../delphi/tools/verify_signatures/build.sh | 2 +- common/windows/mkver.sh | 2 +- core/build.sh | 2 +- core/include/ldml/build.sh | 2 +- core/tools/api-header-extractor/build.sh | 2 +- core/tools/ldml-const-builder/build.sh | 2 +- developer/build.sh | 2 +- developer/src/build.sh | 2 +- developer/src/common/build.sh | 2 +- developer/src/common/delphi/build.sh | 2 +- developer/src/common/web/build.sh | 2 +- .../src/common/web/test-helpers/build.sh | 2 +- developer/src/common/web/utils/build.sh | 2 +- developer/src/inst/build.sh | 2 +- developer/src/kmanalyze/build.sh | 2 +- developer/src/kmc-analyze/build.sh | 2 +- developer/src/kmc-copy/build.sh | 2 +- developer/src/kmc-generate/build.sh | 2 +- developer/src/kmc-keyboard-info/build.sh | 2 +- developer/src/kmc-kmn/build.sh | 2 +- developer/src/kmc-ldml/build.sh | 2 +- developer/src/kmc-model-info/build.sh | 2 +- developer/src/kmc-model/build.sh | 2 +- developer/src/kmc-package/build.sh | 2 +- developer/src/kmc/build.sh | 2 +- developer/src/kmc/test/command-line-tests.sh | 2 +- developer/src/kmcmplib/build.sh | 2 +- .../src/kmcmplib/tests/get-test-source.sh | 2 +- developer/src/kmcmplib/tests/prep.sh | 2 +- developer/src/kmconvert/build.sh | 2 +- developer/src/kmdbrowserhost/build.sh | 2 +- developer/src/kmdecomp/build.sh | 2 +- developer/src/samples/build.sh | 2 +- developer/src/samples/imsample/build.sh | 2 +- developer/src/server/build.sh | 2 +- developer/src/server/src/version-data.ts | 2 +- developer/src/setup/build.sh | 2 +- developer/src/test/auto/build.sh | 2 +- .../compile-supplementary-support/build.sh | 2 +- .../src/test/auto/keyboard-js-info/build.sh | 2 +- developer/src/test/auto/kmcomp/build.sh | 2 +- .../src/test/auto/kmx-file-languages/build.sh | 2 +- .../src/test/auto/model-ts-parser/build.sh | 2 +- developer/src/test/auto/package-info/build.sh | 2 +- developer/src/test/build.sh | 2 +- developer/src/tike/build.sh | 2 +- developer/src/tools/sentry-upload-difs.sh | 2 +- docs/builder.md | 12 +-- ios/build.sh | 2 +- ios/ci.sh | 2 +- ios/engine/build.sh | 2 +- ios/i18n-export.sh | 2 +- ios/keyman/build.sh | 2 +- ios/samples/KMSample1/build.sh | 2 +- ios/samples/KMSample2/build.sh | 2 +- ios/samples/common.inc.sh | 2 +- ios/scripts/kme-universal.sh | 2 +- ios/tools/prepRelease.sh | 2 +- linux/build.sh | 2 +- linux/ibus-keyman/build.sh | 2 +- linux/keyman-config/build.sh | 2 +- linux/keyman-system-service/build.sh | 2 +- linux/mcompile/keymap/build.sh | 2 +- linux/scripts/deb-packaging.sh | 4 +- linux/scripts/debian.sh | 2 +- linux/scripts/dist.sh | 2 +- linux/scripts/launchpad.sh | 4 +- linux/scripts/reconf.sh | 2 +- linux/scripts/test/deb-packaging.tests.sh | 2 +- linux/scripts/test/verify_api.tests.sh | 2 +- linux/scripts/upload-to-debian.sh | 2 +- linux/scripts/verify_api.inc.sh | 2 +- mac/Keyman4MacIM/make-km-dmg.sh | 2 +- mac/build.sh | 2 +- mac/is_same_version.sh | 2 +- mac/mcompile/build.sh | 2 +- mac/setup/build.sh | 2 +- oem/firstvoices/android/build.sh | 2 +- oem/firstvoices/common/build_csv_languages.sh | 2 +- oem/firstvoices/ios/build.sh | 2 +- oem/firstvoices/windows/src/inst/build.sh | 2 +- resources/build.sh | 2 +- resources/build/README.md | 17 +++- resources/build/build-utils-ci.test.sh | 2 +- .../{build-utils.sh => builder-basic.inc.sh} | 88 +++++++------------ .../{builder.inc.sh => builder-full.inc.sh} | 28 ++---- resources/build/builder-report.sh | 2 +- resources/build/ci/test/test-pull-requests.sh | 2 +- resources/build/help-keyman-com.sh | 2 +- resources/build/increment-version.sh | 2 +- resources/build/jq.inc.sh | 2 +- resources/build/pr-build-status/build.sh | 2 +- resources/build/publish-minimum-versions.sh | 2 +- resources/build/report-history.sh | 2 +- resources/build/run-required-test-builds.sh | 2 +- .../test/build-bot/trigger-build-bot.test.sh | 2 +- .../build/test/build-utils-traps.test.sh | 4 +- resources/build/test/build.sh | 2 +- resources/build/test/builder-deps.test.sh | 2 +- .../test/builder-invalid-script-1.test.sh | 2 +- .../test/builder-invalid-script-2.test.sh | 2 +- .../test/builder-invalid-script-3.test.sh | 2 +- .../build/test/debug-deps/child/build.sh | 2 +- .../build/test/debug-deps/child/dep/build.sh | 2 +- resources/build/test/debug-deps/dep/build.sh | 2 +- .../build/test/debug-deps/dep/child/build.sh | 2 +- resources/build/test/debug-deps/test.sh | 2 +- .../test/dependencies/basic/app/build.sh | 2 +- .../test/dependencies/basic/library/build.sh | 2 +- .../test/dependencies/error/app/build.sh | 2 +- .../test/dependencies/error/error/build.sh | 2 +- .../test/dependencies/targets/app/build.sh | 2 +- .../dependencies/targets/library/build.sh | 2 +- resources/build/test/dependencies/test.sh | 2 +- resources/build/test/ignored-flags/build.sh | 2 +- .../build/test/ignored-flags/child/build.sh | 2 +- resources/build/test/ignored-flags/test.sh | 2 +- .../build/test/locate_emscripten.tests.sh | 2 +- resources/build/test/test.sh | 4 +- .../build/test/testing-framework.tests.sh | 2 +- resources/build/test/trap-test-builds.test.sh | 2 +- resources/build/test/trees/build.sh | 2 +- resources/build/test/trees/child1/build.sh | 2 +- resources/build/test/trees/child2/build.sh | 2 +- .../test/trees/child3_renamed/src/build.sh | 2 +- resources/build/test/trees/dep/build.sh | 2 +- resources/build/test/trees/test.sh | 2 +- resources/build/test/verify-colors.test.sh | 2 +- resources/build/test/zip.inc.tests.sh | 2 +- resources/build/version/build.sh | 2 +- resources/build/xcode-utils.sh | 14 +-- resources/builder.inc.sh | 2 +- resources/docker-images/build.sh | 2 +- resources/docker-images/run.sh | 2 +- .../ldml-keyboards/fetch-latest-cldr.sh | 2 +- .../unicode-character-database/download.sh | 2 +- resources/stats/stats.sh | 2 +- .../android/keyman-android-release.sh | 2 +- .../android/keyman-android-test-samples.sh | 2 +- .../teamcity/android/keyman-android-test.sh | 2 +- .../teamcity/common/common-test-common-web.sh | 2 +- .../teamcity/common/common-test-common.sh | 2 +- .../teamcity/common/common-test-core-wasm.sh | 2 +- resources/teamcity/common/common-test-core.sh | 2 +- .../developer/keyman-developer-release.sh | 2 +- .../keyman-developer-test-linux-macos.sh | 2 +- .../keyman-developer-test-windows.sh | 2 +- resources/teamcity/ios/keyman-ios-release.sh | 2 +- .../teamcity/ios/keyman-ios-test-samples.sh | 2 +- resources/teamcity/ios/keyman-ios-test.sh | 2 +- .../teamcity/linux/keyman-linux-release.sh | 2 +- .../linux/keyman-linux-test-integration.sh | 2 +- resources/teamcity/linux/keyman-linux-test.sh | 2 +- .../teamcity/macos/keyman-macos-release.sh | 2 +- resources/teamcity/macos/keyman-macos-test.sh | 2 +- resources/teamcity/web/keyman-web-release.sh | 2 +- resources/teamcity/web/keyman-web-test.sh | 2 +- .../windows/keyman-windows-release.sh | 2 +- .../teamcity/windows/keyman-windows-test.sh | 2 +- resources/tools/check-markdown/build.sh | 2 +- web/build.sh | 2 +- web/ci.sh | 2 +- web/src/app/browser/build.sh | 2 +- web/src/app/ui/build.sh | 2 +- web/src/app/webview/build.sh | 2 +- web/src/engine/attachment/build.sh | 2 +- web/src/engine/common/web-utils/build.sh | 2 +- web/src/engine/dom-utils/build.sh | 2 +- web/src/engine/element-wrappers/build.sh | 2 +- web/src/engine/events/build.sh | 2 +- web/src/engine/interfaces/build.sh | 2 +- web/src/engine/js-processor/build.sh | 2 +- web/src/engine/keyboard-storage/build.sh | 2 +- web/src/engine/keyboard/build.sh | 2 +- web/src/engine/main/build.sh | 2 +- web/src/engine/osk/build.sh | 2 +- web/src/engine/osk/gesture-processor/build.sh | 2 +- .../osk/gesture-processor/src/tools/build.sh | 2 +- web/src/engine/predictive-text/build.sh | 2 +- .../engine/predictive-text/templates/build.sh | 2 +- .../predictive-text/wordbreakers/build.sh | 2 +- .../predictive-text/worker-main/build.sh | 2 +- .../worker-main/unit_tests/test.sh | 2 +- .../predictive-text/worker-thread/build.sh | 2 +- web/src/engine/sentry-manager/build.sh | 2 +- web/src/samples/build.sh | 2 +- web/src/test/manual/build.sh | 2 +- .../manual/embed/android-harness/build.sh | 2 +- web/src/tools/build.sh | 2 +- web/src/tools/building/check-build-size.sh | 2 +- .../tools/building/sourcemap-root/build.sh | 2 +- web/src/tools/es-bundling/build.sh | 2 +- web/src/tools/testing/bulk_rendering/build.sh | 2 +- web/src/tools/testing/recorder-core/build.sh | 2 +- web/src/tools/testing/recorder/build.sh | 2 +- web/test.sh | 2 +- windows/build.sh | 2 +- windows/src/build.sh | 2 +- windows/src/buildtools/sentry-upload-difs.sh | 2 +- windows/src/desktop/build.sh | 2 +- windows/src/desktop/help/build.sh | 2 +- windows/src/desktop/inst/build.sh | 2 +- windows/src/desktop/insthelp/build.sh | 2 +- windows/src/desktop/kmbrowserhost/build.sh | 2 +- windows/src/desktop/kmconfig/build.sh | 2 +- windows/src/desktop/kmshell/build.sh | 2 +- windows/src/desktop/locale/crowdin-control.sh | 2 +- windows/src/desktop/setup/build.sh | 2 +- windows/src/engine/build.sh | 2 +- windows/src/engine/inst/build.sh | 2 +- windows/src/engine/insthelper/build.sh | 2 +- windows/src/engine/keyman/build.sh | 2 +- windows/src/engine/keyman32/build.sh | 2 +- windows/src/engine/keymanmc/build.sh | 2 +- windows/src/engine/keymanx64/build.sh | 2 +- windows/src/engine/kmcomapi/build.sh | 2 +- windows/src/engine/kmrefresh/build.sh | 2 +- windows/src/engine/kmtip/build.sh | 2 +- windows/src/engine/mcompile/build.sh | 2 +- windows/src/engine/testhost/build.sh | 2 +- windows/src/engine/tsysinfo/build.sh | 2 +- windows/src/engine/tsysinfox64/build.sh | 2 +- windows/src/global/delphi/build.sh | 2 +- windows/src/support/build.sh | 2 +- windows/src/support/etl2log/build.sh | 2 +- windows/src/support/oskbulkrenderer/build.sh | 2 +- windows/src/support/texteditor/build.sh | 2 +- .../i18n-check-unused-strings.sh | 2 +- .../build.sh | 2 +- windows/src/test/unit-tests/build.sh | 2 +- .../unit-tests/group-helper-rsp19902/build.sh | 2 +- windows/src/test/unit-tests/jsonutil/build.sh | 2 +- .../src/test/unit-tests/shared-data/build.sh | 2 +- .../test/unit-tests/shared-data/cpp/build.sh | 2 +- .../unit-tests/shared-data/delphi/build.sh | 2 +- .../test/unit-tests/standards-data/build.sh | 2 +- .../unit-tests/ui-language-manager/build.sh | 2 +- .../test/unit-tests/windows-setup/build.sh | 2 +- 276 files changed, 354 insertions(+), 369 deletions(-) rename resources/build/{build-utils.sh => builder-basic.inc.sh} (89%) mode change 100755 => 100644 rename resources/build/{builder.inc.sh => builder-full.inc.sh} (52%) diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml index a06d7ed3cd..674b90e9c4 100644 --- a/.github/workflows/deb-packaging.yml +++ b/.github/workflows/deb-packaging.yml @@ -86,7 +86,7 @@ jobs: shell: bash run: | THIS_SCRIPT="$GITHUB_WORKSPACE/.github/workflows/deb-packaging.yml" - . "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh" + . "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh" echo "KEYMAN_VERSION=${KEYMAN_VERSION:-${VERSION}}" >> $GITHUB_OUTPUT - name: Set prerelease tag as output parameter diff --git a/.gitignore b/.gitignore index 6c8fbfbec8..6316adb5d2 100644 --- a/.gitignore +++ b/.gitignore @@ -164,7 +164,7 @@ tsconfig.tsbuildinfo # Windows system files Thumbs.db -# Temporary file for logging scripts in xcode runs, see build-utils.sh for +# Temporary file for logging scripts in xcode runs, see builder-basic.inc.sh for # details /xcodebuild-scripts.log diff --git a/android/KMAPro/build.sh b/android/KMAPro/build.sh index 66ce1d09c3..525b951138 100755 --- a/android/KMAPro/build.sh +++ b/android/KMAPro/build.sh @@ -3,7 +3,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh index 45a770308f..9b6d0d4892 100755 --- a/android/KMEA/build.sh +++ b/android/KMEA/build.sh @@ -4,7 +4,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/android/Samples/KMSample1/build.sh b/android/Samples/KMSample1/build.sh index 752e72b91e..65e5619815 100755 --- a/android/Samples/KMSample1/build.sh +++ b/android/Samples/KMSample1/build.sh @@ -4,7 +4,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/android/Samples/KMSample2/build.sh b/android/Samples/KMSample2/build.sh index 5538d5dee6..08c5261778 100755 --- a/android/Samples/KMSample2/build.sh +++ b/android/Samples/KMSample2/build.sh @@ -4,7 +4,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/android/Tests/KeyboardHarness/build.sh b/android/Tests/KeyboardHarness/build.sh index af85c7c55a..66f2b0496e 100755 --- a/android/Tests/KeyboardHarness/build.sh +++ b/android/Tests/KeyboardHarness/build.sh @@ -4,7 +4,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/android/build.sh b/android/build.sh index ebf30aeb43..e00c99e634 100755 --- a/android/build.sh +++ b/android/build.sh @@ -10,7 +10,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE # shellcheck disable=SC2154 @@ -108,8 +108,18 @@ function archive_artifacts() { fi } -# Override JAVA_HOME to OpenJDK 11 -set_java_home + +# For CI compatibility of building Keyman for Android 18.0 with OpenJDK 11, +# this overrides JAVA_HOME for the builder script to use OpenJDK 21. +android_set_java_home() { + if [[ ! -z ${JAVA_HOME_21+x} ]]; then + builder_echo "Setting JAVA_HOME to JAVA_HOME_21 (${JAVA_HOME_21})" + export JAVA_HOME="${JAVA_HOME_21}" + fi +} + +# Override JAVA_HOME +android_set_java_home # This script also responsible for cleaning up /android/upload builder_run_child_actions clean diff --git a/android/utility/i18n-check-unused-strings.sh b/android/utility/i18n-check-unused-strings.sh index 062ff8cff4..9e3a0a21c3 100755 --- a/android/utility/i18n-check-unused-strings.sh +++ b/android/utility/i18n-check-unused-strings.sh @@ -25,7 +25,7 @@ set -u # die on undefined variables ## 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-basic.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE # Preparation diff --git a/build.sh b/build.sh index a455d3307f..2589a162b1 100755 --- a/build.sh +++ b/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Keyman -- all projects" \ diff --git a/common/build.sh b/common/build.sh index 5119bca8ac..a066cf15d3 100755 --- 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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../resources/build/builder-full.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 index 9115bd661a..962d13d5c7 100755 --- a/common/include/build.sh +++ b/common/include/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build keymanversion_build.h" configure build clean diff --git a/common/linux/build.sh b/common/linux/build.sh index b52102313e..2df05e03ba 100755 --- a/common/linux/build.sh +++ b/common/linux/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE # diff --git a/common/mac/build.sh b/common/mac/build.sh index 44a7064c83..1acf2f3ccd 100755 --- a/common/mac/build.sh +++ b/common/mac/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE # diff --git a/common/test/keyboards/baseline/build.sh b/common/test/keyboards/baseline/build.sh index 065e2593c5..1428b5e0c4 100755 --- a/common/test/keyboards/baseline/build.sh +++ b/common/test/keyboards/baseline/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Baseline keyboards tests -- built with 16.0 compiler" \ diff --git a/common/test/keyboards/build.sh b/common/test/keyboards/build.sh index 2d6a986b87..489bf17543 100755 --- a/common/test/keyboards/build.sh +++ b/common/test/keyboards/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/zip.inc.sh" diff --git a/common/test/keyboards/issue/6254-invalid-version-99/build.sh b/common/test/keyboards/issue/6254-invalid-version-99/build.sh index 462908042c..80c5e575e6 100755 --- a/common/test/keyboards/issue/6254-invalid-version-99/build.sh +++ b/common/test/keyboards/issue/6254-invalid-version-99/build.sh @@ -3,7 +3,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-basic.inc.sh" # . "$KEYMAN_ROOT/resources/build/utils.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE THIS_DIR="$(dirname "$THIS_SCRIPT")" diff --git a/common/test/resources/test_kill_browserstack.sh b/common/test/resources/test_kill_browserstack.sh index f6ea16a36b..cbca52da45 100755 --- a/common/test/resources/test_kill_browserstack.sh +++ b/common/test/resources/test_kill_browserstack.sh @@ -8,7 +8,7 @@ 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-basic.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE diff --git a/common/tools/hextobin/build.sh b/common/tools/hextobin/build.sh index 0d8075b83b..28eaa853d5 100755 --- a/common/tools/hextobin/build.sh +++ b/common/tools/hextobin/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/common/tools/sourcemap-path-remapper/build.sh b/common/tools/sourcemap-path-remapper/build.sh index c3b7e24536..44c3692dae 100755 --- a/common/tools/sourcemap-path-remapper/build.sh +++ b/common/tools/sourcemap-path-remapper/build.sh @@ -6,7 +6,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/common/web/build.sh b/common/web/build.sh index 2370e3ecf4..182de85d62 100755 --- a/common/web/build.sh +++ b/common/web/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Keyman common web modules" \ diff --git a/common/web/keyman-version/build.sh b/common/web/keyman-version/build.sh index aa9287ea6c..95730b2793 100755 --- a/common/web/keyman-version/build.sh +++ b/common/web/keyman-version/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/common/web/langtags/build.sh b/common/web/langtags/build.sh index 58fc6d10cf..d04319fc77 100755 --- a/common/web/langtags/build.sh +++ b/common/web/langtags/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/common/web/types/build.sh b/common/web/types/build.sh index 679fcfc018..b1eaa8b3ff 100755 --- a/common/web/types/build.sh +++ b/common/web/types/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/common/windows/build.sh b/common/windows/build.sh index 663a7f41c7..45941b668d 100755 --- a/common/windows/build.sh +++ b/common/windows/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE # diff --git a/common/windows/cef-checkout.sh b/common/windows/cef-checkout.sh index 184769a198..c669961328 100755 --- a/common/windows/cef-checkout.sh +++ b/common/windows/cef-checkout.sh @@ -13,7 +13,7 @@ set -u ## 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-basic.inc.sh" # . "$KEYMAN_ROOT/resources/build/utils.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE diff --git a/common/windows/data/build.sh b/common/windows/data/build.sh index ac559612bb..2b70c426ed 100755 --- a/common/windows/data/build.sh +++ b/common/windows/data/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/common/windows/delphi/build.sh b/common/windows/delphi/build.sh index b3e0ddfc1f..81042422fd 100755 --- a/common/windows/delphi/build.sh +++ b/common/windows/delphi/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/common/windows/delphi/components/build.sh b/common/windows/delphi/components/build.sh index 86bad135e0..6fe3dfa9ec 100755 --- a/common/windows/delphi/components/build.sh +++ b/common/windows/delphi/components/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Common Delphi components" clean configure build test edit diff --git a/common/windows/delphi/general/KeymanVersionInfo.inc b/common/windows/delphi/general/KeymanVersionInfo.inc index 4991b42385..41e316e051 100644 --- a/common/windows/delphi/general/KeymanVersionInfo.inc +++ b/common/windows/delphi/general/KeymanVersionInfo.inc @@ -1,6 +1,6 @@ type TKeymanVersionInfo = record - // These fields match fields in /resources/build/build-utils.sh + // These fields match fields in /resources/build/builder-basic.inc.sh Version: string; // 14.0.2 VersionWin: string; // 14.0.2.0 VersionRelease: string; // 14.0 diff --git a/common/windows/delphi/general/keymanversion_build.in b/common/windows/delphi/general/keymanversion_build.in index edd55572a6..a5ada65e15 100644 --- a/common/windows/delphi/general/keymanversion_build.in +++ b/common/windows/delphi/general/keymanversion_build.in @@ -6,7 +6,7 @@ // Keyman Version Information CKeymanVersionInfo: TKeymanVersionInfo = ( - // These fields match fields in /resources/build/build-utils.sh + // These fields match fields in /resources/build/builder-basic.inc.sh Version: '$Version'; VersionWin: '$VersionWin'; VersionRelease: '$VersionRelease'; diff --git a/common/windows/delphi/tools/build.sh b/common/windows/delphi/tools/build.sh index 6fad40a4d6..220463620b 100755 --- a/common/windows/delphi/tools/build.sh +++ b/common/windows/delphi/tools/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/common/windows/delphi/tools/build_standards_data/build.sh b/common/windows/delphi/tools/build_standards_data/build.sh index 3d39aefe9d..239bde79f0 100755 --- a/common/windows/delphi/tools/build_standards_data/build.sh +++ b/common/windows/delphi/tools/build_standards_data/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build build_standards_data tool" clean configure build test edit diff --git a/common/windows/delphi/tools/buildunidata/build.sh b/common/windows/delphi/tools/buildunidata/build.sh index b4e13c264d..36b069351b 100755 --- a/common/windows/delphi/tools/buildunidata/build.sh +++ b/common/windows/delphi/tools/buildunidata/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Unicode character database build tool" \ diff --git a/common/windows/delphi/tools/certificates/build.sh b/common/windows/delphi/tools/certificates/build.sh index 10ab4c75ce..dfe4911f18 100755 --- a/common/windows/delphi/tools/certificates/build.sh +++ b/common/windows/delphi/tools/certificates/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build and install test certificates" clean configure build test \ diff --git a/common/windows/delphi/tools/devtools/build.sh b/common/windows/delphi/tools/devtools/build.sh index f514ea7578..f7b9dd52d4 100755 --- a/common/windows/delphi/tools/devtools/build.sh +++ b/common/windows/delphi/tools/devtools/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/common/windows/delphi/tools/sentrytool/build.sh b/common/windows/delphi/tools/sentrytool/build.sh index ca4e427c39..c1672b0aeb 100755 --- a/common/windows/delphi/tools/sentrytool/build.sh +++ b/common/windows/delphi/tools/sentrytool/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Sentrytool for converting Delphi symbols into sentry-readable format" \ diff --git a/common/windows/delphi/tools/test-klog/build.sh b/common/windows/delphi/tools/test-klog/build.sh index b271565cae..acdd90cd53 100755 --- a/common/windows/delphi/tools/test-klog/build.sh +++ b/common/windows/delphi/tools/test-klog/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Tool for validating klog is disabled for release builds" \ diff --git a/common/windows/delphi/tools/verify_signatures/build.sh b/common/windows/delphi/tools/verify_signatures/build.sh index f53883c70e..d1b29e89cb 100755 --- a/common/windows/delphi/tools/verify_signatures/build.sh +++ b/common/windows/delphi/tools/verify_signatures/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Tool to verify all Windows executable signatures and manifests" \ diff --git a/common/windows/mkver.sh b/common/windows/mkver.sh index 8ddb9e34ed..84886666bd 100755 --- a/common/windows/mkver.sh +++ b/common/windows/mkver.sh @@ -9,7 +9,7 @@ set -u ## 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-basic.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE display_usage() { diff --git a/core/build.sh b/core/build.sh index 6bdb52d936..1c1d337b1c 100755 --- a/core/build.sh +++ b/core/build.sh @@ -3,7 +3,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE diff --git a/core/include/ldml/build.sh b/core/include/ldml/build.sh index 4188b758f5..650bd7adf7 100755 --- a/core/include/ldml/build.sh +++ b/core/include/ldml/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/core/tools/api-header-extractor/build.sh b/core/tools/api-header-extractor/build.sh index fe048ce48b..bf26598ce2 100755 --- a/core/tools/api-header-extractor/build.sh +++ b/core/tools/api-header-extractor/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE CORE_ROOT="$KEYMAN_ROOT/core" diff --git a/core/tools/ldml-const-builder/build.sh b/core/tools/ldml-const-builder/build.sh index 01082bca0a..8c8bc364b5 100755 --- a/core/tools/ldml-const-builder/build.sh +++ b/core/tools/ldml-const-builder/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/build.sh b/developer/build.sh index b75967a4ce..74269abcc3 100755 --- a/developer/build.sh +++ b/developer/build.sh @@ -2,7 +2,7 @@ ## START STANDARD UTILITY 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-basic.inc.sh" ## END STANDARD UTILITY SCRIPT INCLUDE # This is not a builder script but calls a builder script diff --git a/developer/src/build.sh b/developer/src/build.sh index b774b6c943..6e23dc8c0a 100755 --- a/developer/src/build.sh +++ b/developer/src/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/common/build.sh b/developer/src/common/build.sh index b37c2bc948..8ef5a4a1f2 100755 --- a/developer/src/common/build.sh +++ b/developer/src/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/common/delphi/build.sh b/developer/src/common/delphi/build.sh index 63680a5624..907621194f 100755 --- a/developer/src/common/delphi/build.sh +++ b/developer/src/common/delphi/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/common/web/build.sh b/developer/src/common/web/build.sh index 7ca90bd986..9be3a521fa 100755 --- a/developer/src/common/web/build.sh +++ b/developer/src/common/web/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/common/web/test-helpers/build.sh b/developer/src/common/web/test-helpers/build.sh index f7b9bb49b0..81042fff19 100755 --- a/developer/src/common/web/test-helpers/build.sh +++ b/developer/src/common/web/test-helpers/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh index 4bd0885dcf..a8f6a1585f 100755 --- a/developer/src/common/web/utils/build.sh +++ b/developer/src/common/web/utils/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/inst/build.sh b/developer/src/inst/build.sh index be26678e5c..8b37048e1e 100755 --- a/developer/src/inst/build.sh +++ b/developer/src/inst/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE source "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmanalyze/build.sh b/developer/src/kmanalyze/build.sh index ecd9fd263f..a72381557f 100755 --- a/developer/src/kmanalyze/build.sh +++ b/developer/src/kmanalyze/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Legacy keyboard source analysis tool" \ diff --git a/developer/src/kmc-analyze/build.sh b/developer/src/kmc-analyze/build.sh index 1d069b3b81..4c09fabb43 100755 --- a/developer/src/kmc-analyze/build.sh +++ b/developer/src/kmc-analyze/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc-copy/build.sh b/developer/src/kmc-copy/build.sh index a5f8febdc1..9dd7d3d2e2 100755 --- a/developer/src/kmc-copy/build.sh +++ b/developer/src/kmc-copy/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc-generate/build.sh b/developer/src/kmc-generate/build.sh index 6b790ad3ff..ca8b9615f4 100755 --- a/developer/src/kmc-generate/build.sh +++ b/developer/src/kmc-generate/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc-keyboard-info/build.sh b/developer/src/kmc-keyboard-info/build.sh index 5d41665e5f..7eaac99c02 100755 --- a/developer/src/kmc-keyboard-info/build.sh +++ b/developer/src/kmc-keyboard-info/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc-kmn/build.sh b/developer/src/kmc-kmn/build.sh index 7ff15520b5..dc33cfd9c1 100755 --- a/developer/src/kmc-kmn/build.sh +++ b/developer/src/kmc-kmn/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc-ldml/build.sh b/developer/src/kmc-ldml/build.sh index e1b879f438..7f9ff0ad15 100755 --- a/developer/src/kmc-ldml/build.sh +++ b/developer/src/kmc-ldml/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc-model-info/build.sh b/developer/src/kmc-model-info/build.sh index 21cd3e52f5..60c1d23b0b 100755 --- a/developer/src/kmc-model-info/build.sh +++ b/developer/src/kmc-model-info/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc-model/build.sh b/developer/src/kmc-model/build.sh index 53f7b44b12..550bb8a302 100755 --- a/developer/src/kmc-model/build.sh +++ b/developer/src/kmc-model/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc-package/build.sh b/developer/src/kmc-package/build.sh index 93ba6c4ade..1e260c7b3e 100755 --- a/developer/src/kmc-package/build.sh +++ b/developer/src/kmc-package/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh index 1fc897949a..0654bfd247 100755 --- a/developer/src/kmc/build.sh +++ b/developer/src/kmc/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh" diff --git a/developer/src/kmc/test/command-line-tests.sh b/developer/src/kmc/test/command-line-tests.sh index c76a641376..41652bcdfd 100755 --- a/developer/src/kmc/test/command-line-tests.sh +++ b/developer/src/kmc/test/command-line-tests.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE # . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh" diff --git a/developer/src/kmcmplib/build.sh b/developer/src/kmcmplib/build.sh index 457f597f4c..952c0732b8 100755 --- a/developer/src/kmcmplib/build.sh +++ b/developer/src/kmcmplib/build.sh @@ -3,7 +3,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/kmcmplib/tests/get-test-source.sh b/developer/src/kmcmplib/tests/get-test-source.sh index fe6cded2f1..af647ee311 100755 --- a/developer/src/kmcmplib/tests/get-test-source.sh +++ b/developer/src/kmcmplib/tests/get-test-source.sh @@ -3,7 +3,7 @@ # Finds all keyboards in the keyboards repo (passed in $1) that are valid source # keyboards (i.e. ///source/.kmn) # -# Called from meson.build, so this script does not use build-utils.sh. Do not run this +# Called from meson.build, so this script does not use builder-basic.inc.sh. Do not run this # script directly. # set -eu diff --git a/developer/src/kmcmplib/tests/prep.sh b/developer/src/kmcmplib/tests/prep.sh index 8ad9b81171..e00f2fc1fd 100755 --- a/developer/src/kmcmplib/tests/prep.sh +++ b/developer/src/kmcmplib/tests/prep.sh @@ -11,7 +11,7 @@ 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-basic.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE cd "$THIS_SCRIPT_PATH" diff --git a/developer/src/kmconvert/build.sh b/developer/src/kmconvert/build.sh index 3ba94c21dc..e18977f05b 100755 --- a/developer/src/kmconvert/build.sh +++ b/developer/src/kmconvert/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Keyboard project generation and conversion tool" \ diff --git a/developer/src/kmdbrowserhost/build.sh b/developer/src/kmdbrowserhost/build.sh index 55e7ae8d14..8996b17bc4 100755 --- a/developer/src/kmdbrowserhost/build.sh +++ b/developer/src/kmdbrowserhost/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Chromium browser host process for Keyman Developer" \ diff --git a/developer/src/kmdecomp/build.sh b/developer/src/kmdecomp/build.sh index 494b8afde5..069e3e836a 100755 --- a/developer/src/kmdecomp/build.sh +++ b/developer/src/kmdecomp/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/samples/build.sh b/developer/src/samples/build.sh index 703a2691a8..c60602bf85 100755 --- a/developer/src/samples/build.sh +++ b/developer/src/samples/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/samples/imsample/build.sh b/developer/src/samples/imsample/build.sh index 2cdd11ac70..50447040ac 100755 --- a/developer/src/samples/imsample/build.sh +++ b/developer/src/samples/imsample/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh index d2bd8575dd..bd19066948 100755 --- a/developer/src/server/build.sh +++ b/developer/src/server/build.sh @@ -3,7 +3,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/build/utils.inc.sh" diff --git a/developer/src/server/src/version-data.ts b/developer/src/server/src/version-data.ts index 05f266c5c6..a082a65170 100644 --- a/developer/src/server/src/version-data.ts +++ b/developer/src/server/src/version-data.ts @@ -1,5 +1,5 @@ /* - Version information from build-utils.sh: + Version information from builder-basic.inc.sh: # KEYMAN_VERSION: Full current build version, e.g. "14.0.1" # [KEYMAN_VERSION_WIN: Full current build version for Windows, e.g. "14.0.1.0"] diff --git a/developer/src/setup/build.sh b/developer/src/setup/build.sh index ef84122fdb..1e4ab94a68 100755 --- a/developer/src/setup/build.sh +++ b/developer/src/setup/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/test/auto/build.sh b/developer/src/test/auto/build.sh index 043711e752..a2bca0e0dd 100755 --- a/developer/src/test/auto/build.sh +++ b/developer/src/test/auto/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/test/auto/compile-supplementary-support/build.sh b/developer/src/test/auto/compile-supplementary-support/build.sh index b004605b1d..4f8acf40a9 100755 --- a/developer/src/test/auto/compile-supplementary-support/build.sh +++ b/developer/src/test/auto/compile-supplementary-support/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "test if KS=1 is in the right files, both in debug and non-debug versions" clean configure build test diff --git a/developer/src/test/auto/keyboard-js-info/build.sh b/developer/src/test/auto/keyboard-js-info/build.sh index 0a19929f4b..7bbf417681 100755 --- a/developer/src/test/auto/keyboard-js-info/build.sh +++ b/developer/src/test/auto/keyboard-js-info/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Test the read of basic keyboard info info from js files" clean configure build test diff --git a/developer/src/test/auto/kmcomp/build.sh b/developer/src/test/auto/kmcomp/build.sh index 7239010b06..8bfcd69149 100755 --- a/developer/src/test/auto/kmcomp/build.sh +++ b/developer/src/test/auto/kmcomp/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Test that kmc passes various compile tests" clean configure build test diff --git a/developer/src/test/auto/kmx-file-languages/build.sh b/developer/src/test/auto/kmx-file-languages/build.sh index 58ae1492ef..9bf1821450 100755 --- a/developer/src/test/auto/kmx-file-languages/build.sh +++ b/developer/src/test/auto/kmx-file-languages/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Test the read of language info from kmx files and translation from legacy ids to BCP47" clean configure build test diff --git a/developer/src/test/auto/model-ts-parser/build.sh b/developer/src/test/auto/model-ts-parser/build.sh index eaf5bb4819..e4e2208e56 100755 --- a/developer/src/test/auto/model-ts-parser/build.sh +++ b/developer/src/test/auto/model-ts-parser/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Test lexical model parser" clean configure build test diff --git a/developer/src/test/auto/package-info/build.sh b/developer/src/test/auto/package-info/build.sh index e67366b26e..32f9fbbbc4 100755 --- a/developer/src/test/auto/package-info/build.sh +++ b/developer/src/test/auto/package-info/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Test lexical model parser" clean configure build test diff --git a/developer/src/test/build.sh b/developer/src/test/build.sh index 48f3e69ac5..6546dbf752 100755 --- a/developer/src/test/build.sh +++ b/developer/src/test/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe \ diff --git a/developer/src/tike/build.sh b/developer/src/tike/build.sh index b06fd1f847..0ba6c98642 100755 --- a/developer/src/tike/build.sh +++ b/developer/src/tike/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/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE builder_describe "Build Keyman Developer IDE" \ diff --git a/developer/src/tools/sentry-upload-difs.sh b/developer/src/tools/sentry-upload-difs.sh index 34ab4c60b0..b45387ec3e 100755 --- a/developer/src/tools/sentry-upload-difs.sh +++ b/developer/src/tools/sentry-upload-difs.sh @@ -14,7 +14,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-basic.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE cd "$KEYMAN_ROOT/developer" diff --git a/docs/builder.md b/docs/builder.md index 18272accd0..66815c6325 100644 --- a/docs/builder.md +++ b/docs/builder.md @@ -1,4 +1,4 @@ -# Using the build-utils.sh builder functions +# Using the builder-basic.inc.sh builder functions The Keyman repository is standardising on bash scripts for builds. These may call project-specific builders, such as `tsc` for Typescript projects, `meson` @@ -43,7 +43,7 @@ set -eu ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "$(dirname "$THIS_SCRIPT")//resources/build/build-utils.sh" +. "$(dirname "$THIS_SCRIPT")//resources/build/builder-basic.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE # . "$KEYMAN_ROOT/.../foo.inc.sh" # any other includes, such as jq.inc.sh @@ -78,7 +78,7 @@ Builder scripts will inherit `set -eu` from builder.inc.sh: ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "$(dirname "$THIS_SCRIPT")//resources/build/build-utils.sh" +. "$(dirname "$THIS_SCRIPT")//resources/build/builder-basic.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE ``` @@ -100,7 +100,7 @@ search-and-replace) this section in the future as required. ## Any other includes -Once `build-utils.sh` has been included, the variable `$KEYMAN_ROOT` will be +Once `builder-basic.inc.sh` has been included, the variable `$KEYMAN_ROOT` will be available, so other include scripts should be sourced accordingly, for example: ```bash @@ -114,7 +114,7 @@ to `cd` at the start of your script. ## Standard environment -`build-utils.sh` will prepend `$KEYMAN_ROOT/node_modules/.bin` to the `PATH` +`builder-basic.inc.sh` will prepend `$KEYMAN_ROOT/node_modules/.bin` to the `PATH` variable to ensure that we run the correct versions of npm package commands, so there is no need to hard-code path references or add script wrappers to package.json (`npm run