mirror of
https://github.com/AgentSeal/codeburn.git
synced 2026-10-26 08:39:39 +00:00
43608c2558
The desktop app and the macOS menu bar can now run in English, French, Japanese, Korean, Simplified Chinese and Traditional Chinese. A Language setting in the desktop Settings picks the language or follows the system, and the choice is shared so the menu bar switches with it, relaunching to pick up the language with a retry so a switch never leaves it down. Every user-facing string in the desktop renderer goes through a local lookup table, 1,249 keys per language, no framework and no network. The menu bar gains four .lproj to join English and Simplified Chinese, 626 keys each. A completeness gate fails the build if any language is missing a key, in both the desktop catalogs and the menu bar coverage suite. Fonts fall back per language so Japanese, Korean and both Chinese render their correct glyph forms, and dates and numbers format for the locale with values unchanged. English output is byte-identical. Strings produced by the CLI engine stay English until the CLI is localized, a separate effort. Validated live in all six languages: no missing text, no clipping, correct fonts, numbers unchanged, and the menu bar switching for every language.
167 lines
8 KiB
Bash
Executable file
167 lines
8 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# ============================================================================
|
|
# build-local.sh, Build CodeBurnMenubar.app on a macOS 14 (Sonoma) machine.
|
|
# ============================================================================
|
|
# Why this exists
|
|
# ---------------
|
|
# Package.swift's `.macOS(.v14)` deployment target already fixes the -10825
|
|
# launch failure for every build, including the CI-distributed release: ld64
|
|
# drops the macOS-15-only libswift_errno.dylib dependency based on the
|
|
# deployment target, not the SDK used to build. This script is not about that.
|
|
#
|
|
# It exists for the narrower case of building on a Sonoma machine that only
|
|
# has the Command Line Tools (macOS 14 SDK). That SDK's SwiftUI does NOT carry
|
|
# the @MainActor annotations the macOS 15 SDK added to the `View` protocol, so
|
|
# a plain `swift build` there fails with ~80 `main actor-isolated ... from a
|
|
# nonisolated context` errors. This script copies the sources to a scratch
|
|
# dir, gives every `View`/`App` conformance an explicit `@MainActor` there
|
|
# (repo sources stay untouched), and builds a universal bundle with a
|
|
# swift.org Swift 6.2 toolchain against the local macOS 14 SDK.
|
|
#
|
|
# Prerequisites
|
|
# - Command Line Tools (provides the macOS 14 SDK + sips/iconutil/codesign)
|
|
# - A swift.org Swift 6.x toolchain in ~/Library/Developer/Toolchains/
|
|
# download: https://www.swift.org/install/macos/ (Swift 6.2 recommended)
|
|
#
|
|
# Usage: mac/Scripts/build-local.sh [<version>] (defaults to "dev")
|
|
# ----------------------------------------------------------------------------
|
|
set -euo pipefail
|
|
|
|
VERSION="${1:-dev}"
|
|
BUNDLE_ID="org.agentseal.codeburn-menubar"
|
|
EXE="CodeBurnMenubar"
|
|
MIN_MACOS="14.0"
|
|
|
|
ROOT=$(cd "$(dirname "$0")/../.." && pwd)
|
|
MAC_DIR="${ROOT}/mac"
|
|
ICON_SOURCE="${ROOT}/assets/menubar-logo.png"
|
|
SCRATCH="$(mktemp -d /tmp/codeburn-local-build.XXXXXX)"
|
|
APPS="${HOME}/Applications"
|
|
BUNDLE="${APPS}/${EXE}.app"
|
|
|
|
trap 'rm -rf "${SCRATCH}"' EXIT
|
|
|
|
# --- locate a Swift 6.x toolchain -------------------------------------------
|
|
TC=""
|
|
for cand in "${HOME}/Library/Developer/Toolchains/swift-6.2-RELEASE.xctoolchain" \
|
|
"${HOME}/Library/Developer/Toolchains/swift-latest.xctoolchain" \
|
|
/Library/Developer/Toolchains/swift-latest.xctoolchain; do
|
|
[[ -x "${cand}/usr/bin/swift" ]] && { TC="${cand}"; break; }
|
|
done
|
|
if [[ -z "${TC}" ]]; then
|
|
echo "✗ No swift.org Swift 6.x toolchain found in ~/Library/Developer/Toolchains/." >&2
|
|
echo " Install one from https://www.swift.org/install/macos/ (Swift 6.2)." >&2
|
|
exit 1
|
|
fi
|
|
SWIFT="${TC}/usr/bin/swift"
|
|
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
|
|
SDK_VERSION="$(xcrun --sdk macosx --show-sdk-version)"
|
|
case "${SDK_VERSION}" in
|
|
14.*) ;;
|
|
*)
|
|
echo "✗ Active SDK is macOS ${SDK_VERSION}, not 14.x, xcode-select is likely" >&2
|
|
echo " pointed at a newer Xcode instead of the Command Line Tools. Run:" >&2
|
|
echo " sudo xcode-select -s /Library/Developer/CommandLineTools" >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
echo "▸ Toolchain : $("${SWIFT}" --version | head -1)"
|
|
echo "▸ SDK : ${SDKROOT} (${SDK_VERSION})"
|
|
|
|
# --- copy sources and add explicit @MainActor to SwiftUI views --------------
|
|
echo "▸ Staging sources in ${SCRATCH}..."
|
|
# Tests/ is copied only so the manifest's testTarget path resolves; `swift build`
|
|
# (product only) never compiles it, so it needs no @MainActor patching.
|
|
cp -R "${MAC_DIR}/Sources" "${MAC_DIR}/Tests" "${MAC_DIR}/Package.swift" "${SCRATCH}/"
|
|
find "${SCRATCH}/Sources" -name "*.swift" -print0 | while IFS= read -r -d '' f; do
|
|
# Slurp mode ([^{]* spans newlines) so this also catches multi-line generic
|
|
# struct headers and `extension X: View` conformances, not just the
|
|
# single-line `struct X: View {` shape the current sources happen to use.
|
|
perl -0777 -i -pe '
|
|
s/^((?:private |public |fileprivate |internal )?(?:struct|extension)\s+\w+(?:<[^{]*?>)?\s*:[^{]*\bView\b[^{]*\{)/\@MainActor\n$1/gm;
|
|
s/^(struct\s+\w+\s*:[^{]*\bApp\b[^{]*\{)/\@MainActor\n$1/gm;
|
|
s/\@MainActor\n\@MainActor\n/\@MainActor\n/g;
|
|
' "$f"
|
|
done
|
|
|
|
# --- build each arch separately, then lipo into one universal binary --------
|
|
# `swift build --arch arm64 --arch x86_64` together shells out to xcbuild,
|
|
# which the Command Line Tools doesn't ship, each arch alone stays on the
|
|
# plain SwiftPM build path, so build twice and merge with lipo instead.
|
|
BINS=()
|
|
for arch in arm64 x86_64; do
|
|
echo "▸ Building ${arch} release..."
|
|
( cd "${SCRATCH}" && "${SWIFT}" build -c release --arch "${arch}" )
|
|
bin="$(cd "${SCRATCH}" && "${SWIFT}" build -c release --arch "${arch}" --show-bin-path)/${EXE}"
|
|
[[ -x "${bin}" ]] || { echo "✗ ${arch} build produced no binary" >&2; exit 1; }
|
|
BINS+=("${bin}")
|
|
done
|
|
BIN="${SCRATCH}/${EXE}-universal"
|
|
lipo -create -output "${BIN}" "${BINS[@]}"
|
|
|
|
# --- assemble the .app bundle ------------------------------------------------
|
|
echo "▸ Assembling ${BUNDLE}..."
|
|
pkill -x "${EXE}" 2>/dev/null || true; sleep 1
|
|
rm -rf "${BUNDLE}"
|
|
mkdir -p "${BUNDLE}/Contents/MacOS" "${BUNDLE}/Contents/Resources"
|
|
cp "${BIN}" "${BUNDLE}/Contents/MacOS/${EXE}"
|
|
cp "${ICON_SOURCE}" "${BUNDLE}/Contents/Resources/menubar-logo.png"
|
|
|
|
# SwiftPM emits target resources as a sibling bundle of the executable, and
|
|
# `Bundle.module` resolves it from Contents/Resources. Without it the app traps
|
|
# on first icon load and no Localizable.strings table is reachable, so every
|
|
# string falls back to its English key. Mirrors package-app.sh:53-58.
|
|
# The arm64 bin path is enough: the bundle is arch-independent.
|
|
SPM_BIN_PATH="$(cd "${SCRATCH}" && "${SWIFT}" build -c release --arch arm64 --show-bin-path)"
|
|
SPM_RESOURCE_BUNDLE="${SPM_BIN_PATH}/${EXE}_${EXE}.bundle"
|
|
if [[ -d "${SPM_RESOURCE_BUNDLE}" ]]; then
|
|
cp -R "${SPM_RESOURCE_BUNDLE}" "${BUNDLE}/Contents/Resources/"
|
|
else
|
|
echo "✗ Resource bundle missing at ${SPM_RESOURCE_BUNDLE}" >&2
|
|
echo " Bundle.module would trap at launch; aborting." >&2
|
|
exit 1
|
|
fi
|
|
|
|
ICONSET="${SCRATCH}/AppIcon.iconset"; mkdir -p "${ICONSET}"
|
|
for spec in "16:16x16" "32:16x16@2x" "32:32x32" "64:32x32@2x" "128:128x128" \
|
|
"256:128x128@2x" "256:256x256" "512:256x256@2x" "512:512x512"; do
|
|
sips -z "${spec%%:*}" "${spec%%:*}" "${ICON_SOURCE}" --out "${ICONSET}/icon_${spec##*:}.png" >/dev/null
|
|
done
|
|
cp "${ICON_SOURCE}" "${ICONSET}/icon_512x512@2x.png"
|
|
iconutil -c icns "${ICONSET}" -o "${BUNDLE}/Contents/Resources/AppIcon.icns"
|
|
|
|
cat > "${BUNDLE}/Contents/Info.plist" <<PLIST
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
<plist version="1.0">
|
|
<dict>
|
|
<key>CFBundleDevelopmentRegion</key><string>en</string>
|
|
<!-- Keep in sync with package-app.sh and Package.swift's localizations. -->
|
|
<key>CFBundleLocalizations</key><array><string>en</string><string>fr</string><string>ja</string><string>ko</string><string>zh-Hans</string><string>zh-Hant</string></array>
|
|
<key>CFBundleDisplayName</key><string>CodeBurn Menubar</string>
|
|
<key>CFBundleExecutable</key><string>${EXE}</string>
|
|
<key>CFBundleIconFile</key><string>AppIcon</string>
|
|
<key>CFBundleIdentifier</key><string>${BUNDLE_ID}</string>
|
|
<key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
|
|
<key>CFBundleName</key><string>${EXE}</string>
|
|
<key>CFBundlePackageType</key><string>APPL</string>
|
|
<key>CFBundleShortVersionString</key><string>${VERSION}</string>
|
|
<key>CFBundleVersion</key><string>${VERSION}</string>
|
|
<key>LSMinimumSystemVersion</key><string>${MIN_MACOS}</string>
|
|
<key>LSUIElement</key><true/>
|
|
<key>NSHighResolutionCapable</key><true/>
|
|
<key>NSHumanReadableCopyright</key><string>© AgentSeal</string>
|
|
</dict>
|
|
</plist>
|
|
PLIST
|
|
printf 'APPL????' > "${BUNDLE}/Contents/PkgInfo"
|
|
|
|
echo "▸ Ad-hoc signing..."
|
|
codesign --force --sign - --timestamp=none --deep "${BUNDLE}"
|
|
codesign --verify --deep --strict "${BUNDLE}"
|
|
|
|
echo ""
|
|
echo "✓ Installed ${BUNDLE}"
|
|
lipo -info "${BUNDLE}/Contents/MacOS/${EXE}" | sed 's/^/ /'
|
|
vtool -show-build "${BUNDLE}/Contents/MacOS/${EXE}" 2>/dev/null | grep -iE "minos|sdk" | sed 's/^/ /'
|
|
echo " Launch with: codeburn menubar (or: open '${BUNDLE}')"
|