From bbfab358a65bc22fd003b250fdcb81bc6ff1d350 Mon Sep 17 00:00:00 2001 From: Shawn Schantz Date: Thu, 19 Mar 2026 15:39:52 -0400 Subject: [PATCH] feat(mac): update build script to build Config app builds and cleans Config app does not yet include Config app in install script --- mac/build.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mac/build.sh b/mac/build.sh index 4cfcc6dabc..0878ab74c1 100755 --- a/mac/build.sh +++ b/mac/build.sh @@ -53,11 +53,13 @@ KEYMAN_MAC_BASE_PATH="$KEYMAN_ROOT/mac" KME4M_BASE_PATH="$KEYMAN_MAC_BASE_PATH/$ENGINE_NAME" KMTESTAPP_BASE_PATH="$KEYMAN_MAC_BASE_PATH/$TESTAPP_NAME" KM4MIM_BASE_PATH="$KEYMAN_MAC_BASE_PATH/$IM_NAME" -CONFIGAPP_BASE_PATH="$KEYMAN_MAC_BASE_PATH/$CONFIGAPP_NAME" KME4M_PROJECT_PATH="$KME4M_BASE_PATH/$ENGINE_NAME$XCODE_PROJ_EXT" KMTESTAPP_PROJECT_PATH="$KMTESTAPP_BASE_PATH/$TESTAPP_NAME$XCODE_PROJ_EXT" KMIM_WORKSPACE_PATH="$KM4MIM_BASE_PATH/$IM_NAME.xcworkspace" + +KEYMAN_WORKSPACE_PATH="$KEYMAN_MAC_BASE_PATH/$PRODUCT_NAME.xcworkspace" +CONFIGAPP_BASE_PATH="$KEYMAN_MAC_BASE_PATH/$CONFIGAPP_NAME" CONFIGAPP_PROJ_PATH="$CONFIGAPP_BASE_PATH/$CONFIGAPP_NAME$XCODE_PROJ_EXT" PODS_FOLDER="/mac/Keyman4MacIM/Pods/Target Support Files/Pods-Keyman" @@ -66,7 +68,7 @@ builder_describe_outputs \ configure "$PODS_FOLDER/$CONFIG_TARGET" \ build:engine "/mac/$ENGINE_NAME/build/$CONFIG" \ build:app "/mac/$IM_NAME/build/$CONFIG" \ - build:configapp "/mac/$CONFIGAPP_NAME/build/$CONFIG" \ + build:configapp "/mac/$CONFIGAPP_NAME/build/Build/Products/$CONFIG" \ build:testapp "/mac/$TESTAPP_NAME/build/$CONFIG" ### DEFINE HELPER FUNCTIONS ### @@ -127,6 +129,7 @@ do_clean ( ) { rm -rf "$KM4MIM_BASE_PATH/build" rm -rf "$KMTESTAPP_BASE_PATH/build" rm -rf "$KEYMAN_ROOT/mac/setup/Install Keyman.app" + rm -rf "$CONFIGAPP_BASE_PATH/build" builder_heading "Cleaning pods folder (CocoaPods)" rm -rf "$PODS_FOLDER" @@ -205,10 +208,11 @@ do_build_settings_package ( ) { do_build_config_app ( ) { ### Build Keyman Configuration.app (Configuration app) ### builder_heading "Building Keyman Configuration.app" - - xcodebuild -resolvePackageDependencies -project $CONFIGAPP_PROJ_PATH -scheme Config - execBuildCommand "Keyman Configuration" "xcodebuild -project $CONFIGAPP_PROJ_PATH \ - -derivedDataPath ./build $BUILD_OPTIONS $BUILD_ACTIONS -scheme Config + #xcodebuild -resolvePackageDependencies -workspace Keyman.xcworkspace -scheme Config + xcodebuild -resolvePackageDependencies -workspace $KEYMAN_WORKSPACE_PATH -scheme Config + echo "building $KEYMAN_WORKSPACE_PATH with scheme Config" + execBuildCommand "Keyman Configuration" xcodebuild -workspace $KEYMAN_WORKSPACE_PATH \ + $BUILD_OPTIONS $BUILD_ACTIONS -scheme Config -derivedDataPath ./Config/build } do_update_app_metadata ( ) { @@ -412,7 +416,7 @@ builder_run_action test:help check-markdown "$KEYMAN_ROOT/mac/docs/help" builder_run_action build:app do_update_app_metadata #builder_run_action build:configapp do_build_settings_package -#builder_run_action build:configapp do_build_config_app +builder_run_action build:configapp do_build_config_app builder_run_action build:testapp do_build_testapp