From 377b1056ec36fbc7fb0950df6fee4d3240209b0c Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Wed, 10 Sep 2025 11:17:41 +0200 Subject: [PATCH] maint(resources): rename KEYMAN_VERSION_FOR_PR_FILENAME Address review comment from #14703. Test-bot: skip Build-bot: skip Relates-to: #14703 Relates-to: #10521 --- android/KMAPro/build.sh | 4 ++-- android/build.sh | 4 ++-- developer/src/inst/build.sh | 10 +++++----- ios/tools/prepRelease.sh | 10 +++++----- mac/Keyman4MacIM/make-km-dmg.sh | 2 +- mac/build.sh | 2 +- oem/firstvoices/android/build.sh | 2 +- oem/firstvoices/windows/src/inst/build.sh | 4 ++-- resources/build/builder-basic.inc.sh | 16 ++++++++-------- resources/teamcity/ios/keyman-ios-test.sh | 2 +- windows/src/desktop/inst/build.sh | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/android/KMAPro/build.sh b/android/KMAPro/build.sh index e4151355da..06370c06d2 100755 --- a/android/KMAPro/build.sh +++ b/android/KMAPro/build.sh @@ -46,7 +46,7 @@ MODEL_PACKAGE_ID="nrc.en.mtnt" MODELS_TARGET="android/KMAPro/kMAPro/src/main/assets/${MODEL_PACKAGE_ID}.model.kmp" builder_describe_outputs \ configure "/${MODELS_TARGET}" \ - build /android/KMAPro/kMAPro/build/outputs/apk/$CONFIG/keyman-${KEYMAN_VERSION_FOR_PR_FILENAME}.apk + build /android/KMAPro/kMAPro/build/outputs/apk/$CONFIG/keyman-${KEYMAN_VERSION_FOR_FILENAME}.apk #### Build @@ -84,7 +84,7 @@ if builder_start_action build; then echo "BUILD_FLAGS $BUILD_FLAGS" ./gradlew $DAEMON_FLAG clean $BUILD_FLAGS - mv "${KEYMAN_ROOT}/android/KMAPro/kMAPro/build/outputs/apk/$CONFIG/keyman-${KEYMAN_VERSION}.apk" "${KEYMAN_ROOT}/android/KMAPro/kMAPro/build/outputs/apk/$CONFIG/keyman-${KEYMAN_VERSION_FOR_PR_FILENAME}.apk" + mv "${KEYMAN_ROOT}/android/KMAPro/kMAPro/build/outputs/apk/$CONFIG/keyman-${KEYMAN_VERSION}.apk" "${KEYMAN_ROOT}/android/KMAPro/kMAPro/build/outputs/apk/$CONFIG/keyman-${KEYMAN_VERSION_FOR_FILENAME}.apk" builder_finish_action success build fi diff --git a/android/build.sh b/android/build.sh index 56133c01a6..54e61dd9a5 100755 --- a/android/build.sh +++ b/android/build.sh @@ -66,8 +66,8 @@ function archive_artifacts() { UPLOAD_PATH="${KEYMAN_ROOT}/android/upload/${KEYMAN_VERSION}" KEYMAN_ENGINE_ANDROID_ZIP="keyman-engine-android-${KEYMAN_VERSION}.zip" - KEYMAN_APK="keyman-${KEYMAN_VERSION_FOR_PR_FILENAME}.apk" - FIRSTVOICES_APK="firstvoices-${KEYMAN_VERSION_FOR_PR_FILENAME}.apk" + KEYMAN_APK="keyman-${KEYMAN_VERSION_FOR_FILENAME}.apk" + FIRSTVOICES_APK="firstvoices-${KEYMAN_VERSION_FOR_FILENAME}.apk" rm -rf "${UPLOAD_PATH}" mkdir -p "${UPLOAD_PATH}" diff --git a/developer/src/inst/build.sh b/developer/src/inst/build.sh index e24d75b16c..5d44f228eb 100755 --- a/developer/src/inst/build.sh +++ b/developer/src/inst/build.sh @@ -16,7 +16,7 @@ builder_describe "Installation files for Keyman Developer" \ # after all other builds complete builder_describe_outputs \ - publish /developer/src/inst/keymandeveloper-${KEYMAN_VERSION_FOR_PR_FILENAME}.exe + publish /developer/src/inst/keymandeveloper-${KEYMAN_VERSION_FOR_FILENAME}.exe builder_parse "$@" @@ -96,7 +96,7 @@ function copy-keymandeveloper-installer-to-artifacts() { make-kmc-install-zip cp -f "$DEVELOPER_ROOT/src/inst/keymandeveloper.msi" "$DEVELOPER_ROOT/release/${KEYMAN_VERSION}/keymandeveloper.msi" - cp -f "$DEVELOPER_ROOT/src/inst/keymandeveloper-${KEYMAN_VERSION_FOR_PR_FILENAME}.exe" "$DEVELOPER_ROOT/release/${KEYMAN_VERSION}/keymandeveloper-${KEYMAN_VERSION_FOR_PR_FILENAME}.exe" + cp -f "$DEVELOPER_ROOT/src/inst/keymandeveloper-${KEYMAN_VERSION_FOR_FILENAME}.exe" "$DEVELOPER_ROOT/release/${KEYMAN_VERSION}/keymandeveloper-${KEYMAN_VERSION_FOR_FILENAME}.exe" } function verify-program-signatures() { @@ -234,8 +234,8 @@ function make-installer() { echo "MSIFileName=keymandeveloper.msi" >> setup.inf echo "Title=Keyman Developer ${KEYMAN_VERSION_WITH_TAG}" >>setup.inf add_zip_files setup.zip keymandeveloper.msi setup.inf - cat "$DEVELOPER_PROGRAM/setup.exe" setup.zip > "keymandeveloper-$KEYMAN_VERSION_FOR_PR_FILENAME.exe" - wrap-signcode //d "Keyman Developer" "keymandeveloper-$KEYMAN_VERSION_FOR_PR_FILENAME.exe" + cat "$DEVELOPER_PROGRAM/setup.exe" setup.zip > "keymandeveloper-$KEYMAN_VERSION_FOR_FILENAME.exe" + wrap-signcode //d "Keyman Developer" "keymandeveloper-$KEYMAN_VERSION_FOR_FILENAME.exe" # # Zip the files we distribute as part of the standalone kmc distro into release\$Version\kmcomp-$Version.zip @@ -251,7 +251,7 @@ function make-kmc-install-zip() { cd "${DEVELOPER_ROOT}/bin" # TODO: rename this to keyman-developer-cli-$Version.zip - local KMCOMP_ZIP="${DEVELOPER_ROOT}/release/${KEYMAN_VERSION}/kmcomp-${KEYMAN_VERSION_FOR_PR_FILENAME}.zip" + local KMCOMP_ZIP="${DEVELOPER_ROOT}/release/${KEYMAN_VERSION}/kmcomp-${KEYMAN_VERSION_FOR_FILENAME}.zip" add_zip_files "${KMCOMP_ZIP}" -q -r \ kmconvert.exe \ diff --git a/ios/tools/prepRelease.sh b/ios/tools/prepRelease.sh index 138823d51e..8065aad2f8 100755 --- a/ios/tools/prepRelease.sh +++ b/ios/tools/prepRelease.sh @@ -58,7 +58,7 @@ mv -f "$CHANGELOG_PATH.1" "$CHANGELOG_PATH" # Keyman Engine # -KMEI_DST_NAME="keyman-engine-ios-${KEYMAN_VERSION_FOR_PR_FILENAME}.zip" +KMEI_DST_NAME="keyman-engine-ios-${KEYMAN_VERSION_FOR_FILENAME}.zip" KMEI_DST="${WORK_DIR}/${UPLOAD_DIR}/${KMEI_DST_NAME}" KMEI_FRAMEWORK_BASE="build/Build/Products/Release/" @@ -86,14 +86,14 @@ cd "$WORK_DIR" # KEYMANAPP_IPA="build/Build/Products/Release-iphoneos/Keyman.ipa" -KEYMANAPP_IPA_DST="keyman-ios-${KEYMAN_VERSION_FOR_PR_FILENAME}.ipa" +KEYMANAPP_IPA_DST="keyman-ios-${KEYMAN_VERSION_FOR_FILENAME}.ipa" echo "Copying Keyman IPA ${KEYMANAPP_IPA} => ${UPLOAD_DIR}/${KEYMANAPP_IPA_DST}..." cp "${KEYMANAPP_IPA}" "${WORK_DIR}/${UPLOAD_DIR}/${KEYMANAPP_IPA_DST}" KEYMANAPP_SIM_FOLDER="build/Build/Products/Release-iphonesimulator" KEYMANAPP_SIM_APP="$KEYMANAPP_SIM_FOLDER/Keyman.app" -KEYMANAPP_SIM_APP_DST="keyman-ios-simulator-${KEYMAN_VERSION_FOR_PR_FILENAME}.app.zip" +KEYMANAPP_SIM_APP_DST="keyman-ios-simulator-${KEYMAN_VERSION_FOR_FILENAME}.app.zip" echo "Zipping Keyman simulator artifact ${KEYMANAPP_SIM_APP} => ${UPLOAD_DIR}/${KEYMANAPP_SIM_APP_DST}..." cd "${KEYMANAPP_SIM_FOLDER}" @@ -107,14 +107,14 @@ cd "$WORK_DIR" if [ "${RELEASE_OEM_FIRSTVOICES}" = true ]; then FIRSTVOICESAPP_IPA="../oem/firstvoices/ios/build/Build/Products/Release-iphoneos/FirstVoices.ipa" - FIRSTVOICESAPP_IPA_DST="firstvoices-ios-${KEYMAN_VERSION_FOR_PR_FILENAME}.ipa" + FIRSTVOICESAPP_IPA_DST="firstvoices-ios-${KEYMAN_VERSION_FOR_FILENAME}.ipa" echo "Copying FirstVoices IPA ${FIRSTVOICESAPP_IPA} => ${UPLOAD_DIR}/${FIRSTVOICESAPP_IPA_DST}..." cp "${FIRSTVOICESAPP_IPA}" "${WORK_DIR}/${UPLOAD_DIR}/${FIRSTVOICESAPP_IPA_DST}" FIRSTVOICESAPP_SIM_FOLDER="../oem/firstvoices/ios/build/Build/Products/Release-iphonesimulator/" FIRSTVOICESAPP_SIM_APP="$FIRSTVOICESAPP_SIM_FOLDER/FirstVoices.app" - FIRSTVOICESAPP_SIM_APP_DST="firstvoices-ios-simulator-${KEYMAN_VERSION_FOR_PR_FILENAME}.app.zip" + FIRSTVOICESAPP_SIM_APP_DST="firstvoices-ios-simulator-${KEYMAN_VERSION_FOR_FILENAME}.app.zip" echo "Zipping FirstVoices simulator artifact ${FIRSTVOICESAPP_SIM_APP} => ${UPLOAD_DIR}/${KEYMANAPP_SIM_APP_DST}..." cd "${FIRSTVOICESAPP_SIM_FOLDER}" diff --git a/mac/Keyman4MacIM/make-km-dmg.sh b/mac/Keyman4MacIM/make-km-dmg.sh index 87339f754a..d949a96af3 100755 --- a/mac/Keyman4MacIM/make-km-dmg.sh +++ b/mac/Keyman4MacIM/make-km-dmg.sh @@ -212,7 +212,7 @@ if (( DETACH_SUCCESS < 999 )); then fi # Step 5 - Convert image to a compressed readonly DMG image -DMG_FILE_PATH="$DEST_DIR/keyman-$KEYMAN_VERSION_FOR_PR_FILENAME.dmg" +DMG_FILE_PATH="$DEST_DIR/keyman-$KEYMAN_VERSION_FOR_FILENAME.dmg" builder_echo info "Converting/compressing image to create \"$DMG_FILE_PATH\"" if [[ -e "$DMG_FILE_PATH" ]] ; then if [[ "$VERBOSITY" != "-quiet" ]] ; then diff --git a/mac/build.sh b/mac/build.sh index fa331acbe4..e032db998a 100755 --- a/mac/build.sh +++ b/mac/build.sh @@ -293,7 +293,7 @@ do_publish() { "${KM4MIM_BASE_PATH}/make-km-dmg.sh" local UPLOAD_PATH="${KM4MIM_BASE_PATH}/output/upload/${KEYMAN_VERSION}" - write_download_info "${UPLOAD_PATH}" "keyman-${KEYMAN_VERSION_FOR_PR_FILENAME}.dmg" "Keyman4MacIM" dmg mac + write_download_info "${UPLOAD_PATH}" "keyman-${KEYMAN_VERSION_FOR_FILENAME}.dmg" "Keyman4MacIM" dmg mac if builder_is_ci_build && builder_is_ci_build_level_release; then do_sentry diff --git a/oem/firstvoices/android/build.sh b/oem/firstvoices/android/build.sh index 5fa54578c1..2d8d30141f 100755 --- a/oem/firstvoices/android/build.sh +++ b/oem/firstvoices/android/build.sh @@ -38,7 +38,7 @@ if builder_is_debug_build; then TEST_FLAGS="-x assembleDebug lintDebug testDebug" fi -ARTIFACT="firstvoices-${KEYMAN_VERSION_FOR_PR_FILENAME}.apk" +ARTIFACT="firstvoices-${KEYMAN_VERSION_FOR_FILENAME}.apk" KEYBOARD_PACKAGE_ID="fv_all" KEYBOARDS_TARGET="oem/firstvoices/android/app/src/main/assets/${KEYBOARD_PACKAGE_ID}.kmp" diff --git a/oem/firstvoices/windows/src/inst/build.sh b/oem/firstvoices/windows/src/inst/build.sh index 99eadb4e48..cad414d39b 100755 --- a/oem/firstvoices/windows/src/inst/build.sh +++ b/oem/firstvoices/windows/src/inst/build.sh @@ -16,7 +16,7 @@ builder_describe "Installation files for FirstVoices Keyboards" \ # after all other builds complete builder_if_release_build_level builder_describe_outputs \ - publish /windows/release/${KEYMAN_VERSION}/firstvoices-${KEYMAN_VERSION_FOR_PR_FILENAME}.exe + publish /windows/release/${KEYMAN_VERSION}/firstvoices-${KEYMAN_VERSION_FOR_FILENAME}.exe builder_parse "$@" @@ -103,7 +103,7 @@ function copy-installer() { mkdir -p "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}" cp firstvoices.msi "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/firstvoices.msi" - cp firstvoices.exe "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/firstvoices-${KEYMAN_VERSION_FOR_PR_FILENAME}.exe" + cp firstvoices.exe "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/firstvoices-${KEYMAN_VERSION_FOR_FILENAME}.exe" verify-installer-signatures } diff --git a/resources/build/builder-basic.inc.sh b/resources/build/builder-basic.inc.sh index a1a268cb2a..d5d590de45 100644 --- a/resources/build/builder-basic.inc.sh +++ b/resources/build/builder-basic.inc.sh @@ -13,7 +13,7 @@ # KEYMAN_VERSION_GIT_TAG: Git tag for the release, "release@$KEYMAN_VERSION_WITH_TAG", e.g. "release@14.0.1-alpha-test-1234" # KEYMAN_ROOT: fully resolved root path of Keyman repository # KEYMAN_VERSION_ENVIRONMENT: One of: local, test, alpha, beta, stable -# KEYMAN_VERSION_FOR_PR_FILENAME: KEYMAN_VERSION, for release builds, or KEYMAN_VERSION_WITH_TAG, for PR and local builds; see #10521 +# KEYMAN_VERSION_FOR_FILENAME: KEYMAN_VERSION, for release builds, or KEYMAN_VERSION_WITH_TAG, for PR and local builds; see #10521 # UPLOAD_SENTRY: true - if KEYMAN_VERSION_ENVIRONMENT is one of alpha, beta, stable # false - if local, test. Indicates if debug artifacts should be uploaded to Sentry # BUILDER_OS: win|mac|linux -- current build environment @@ -121,9 +121,9 @@ function _builder_basic_find_version() { # the tag but that involves changing a number of other websites as dealing with # the rename there too. if builder_is_ci_release_build; then - KEYMAN_VERSION_FOR_PR_FILENAME="${KEYMAN_VERSION}" + KEYMAN_VERSION_FOR_FILENAME="${KEYMAN_VERSION}" else - KEYMAN_VERSION_FOR_PR_FILENAME="${KEYMAN_VERSION_WITH_TAG}" + KEYMAN_VERSION_FOR_FILENAME="${KEYMAN_VERSION_WITH_TAG}" fi readonly KEYMAN_VERSION @@ -136,7 +136,7 @@ function _builder_basic_find_version() { readonly KEYMAN_VERSION_WITH_TAG readonly KEYMAN_VERSION_ENVIRONMENT readonly KEYMAN_VERSION_GIT_TAG - readonly KEYMAN_VERSION_FOR_PR_FILENAME + readonly KEYMAN_VERSION_FOR_FILENAME # Export version strings so places like version.gradle can access them export KEYMAN_VERSION @@ -149,7 +149,7 @@ function _builder_basic_find_version() { export KEYMAN_VERSION_WITH_TAG export KEYMAN_VERSION_ENVIRONMENT export KEYMAN_VERSION_GIT_TAG - export KEYMAN_VERSION_FOR_PR_FILENAME + export KEYMAN_VERSION_FOR_FILENAME } function _builder_basic_find_tier() { @@ -188,7 +188,7 @@ function _builder_basic_print_version_utils_debug() { echo "KEYMAN_VERSION_WITH_TAG: $KEYMAN_VERSION_WITH_TAG" echo "KEYMAN_VERSION_GIT_TAG: $KEYMAN_VERSION_GIT_TAG" echo "KEYMAN_VERSION_ENVIRONMENT: $KEYMAN_VERSION_ENVIRONMENT" - echo "KEYMAN_VERSION_FOR_PR_FILENAME: $KEYMAN_VERSION_FOR_PR_FILENAME" + echo "KEYMAN_VERSION_FOR_FILENAME: $KEYMAN_VERSION_FOR_FILENAME" } # TODO: consolidate with buildLevel, see #14285 @@ -223,7 +223,7 @@ replaceVersionStrings() { s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g; s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g; s/\$KEYMAN_VERSION/$KEYMAN_VERSION/g; - s/\$KEYMAN_VERSION_FOR_PR_FILENAME/$KEYMAN_VERSION_FOR_PR_FILENAME/g; + s/\$KEYMAN_VERSION_FOR_FILENAME/$KEYMAN_VERSION_FOR_FILENAME/g; " "$infile" > "$outfile" } @@ -264,7 +264,7 @@ replaceVersionStrings_Mkver() { s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g; s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g; s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g; - s/\$KEYMAN_VERSION_FOR_PR_FILENAME/$KEYMAN_VERSION_FOR_PR_FILENAME/g; + s/\$KEYMAN_VERSION_FOR_FILENAME/$KEYMAN_VERSION_FOR_FILENAME/g; s/\$KEYMAN_VERSION/$KEYMAN_VERSION_WIN/g; diff --git a/resources/teamcity/ios/keyman-ios-test.sh b/resources/teamcity/ios/keyman-ios-test.sh index 830fdc156b..63c48cc7dc 100755 --- a/resources/teamcity/ios/keyman-ios-test.sh +++ b/resources/teamcity/ios/keyman-ios-test.sh @@ -57,7 +57,7 @@ function __do_upload_to_testflight() { export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - APP_IPA_DST="$4-ios-${KEYMAN_VERSION_FOR_PR_FILENAME}.ipa" + APP_IPA_DST="$4-ios-${KEYMAN_VERSION_FOR_FILENAME}.ipa" cd "upload/${KEYMAN_VERSION}" command -v fastlane diff --git a/windows/src/desktop/inst/build.sh b/windows/src/desktop/inst/build.sh index c16dbbbfe5..8e64342a22 100755 --- a/windows/src/desktop/inst/build.sh +++ b/windows/src/desktop/inst/build.sh @@ -15,7 +15,7 @@ builder_describe "Installation files for Keyman for Windows" \ # after all other builds complete builder_if_release_build_level builder_describe_outputs \ - publish /windows/release/${KEYMAN_VERSION}/keyman-${KEYMAN_VERSION_FOR_PR_FILENAME}.exe + publish /windows/release/${KEYMAN_VERSION}/keyman-${KEYMAN_VERSION_FOR_FILENAME}.exe builder_parse "$@" @@ -104,7 +104,7 @@ function copy-installer() { mkdir -p "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}" cp keymandesktop.msi "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/keymandesktop.msi" - cp keymandesktop.exe "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/keyman-${KEYMAN_VERSION_FOR_PR_FILENAME}.exe" + cp keymandesktop.exe "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/keyman-${KEYMAN_VERSION_FOR_FILENAME}.exe" cp "$WINDOWS_PROGRAM_APP/setup.exe" "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/setup.exe" verify-installer-signatures