From 24d94e230985f815c02dd808319fd3b00bc26864 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Mon, 18 May 2026 17:04:31 +0800
Subject: [PATCH] Center tag settings layout

---
 build.sh |  100 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index ab05c50..dd08a5b 100644
--- a/build.sh
+++ b/build.sh
@@ -1,16 +1,44 @@
 #!/bin/bash
 set -euo pipefail
 
-APP_NAME="Apptag"
+APP_NAME="TagLauncher"
 PROJECT_DIR="$(cd "$(dirname "$0")" && pwd)"
 BUILD_DIR="$PROJECT_DIR/build"
 APP_BUNDLE="$BUILD_DIR/$APP_NAME.app"
 MACOS_DIR="$APP_BUNDLE/Contents/MacOS"
 RESOURCES_DIR="$APP_BUNDLE/Contents/Resources"
 SWIFT_DIR="$PROJECT_DIR/Apptag"
+INFO_PLIST="$SWIFT_DIR/Info.plist"
 
 SDK_PATH=$(xcrun --sdk macosx --show-sdk-path)
-TARGET="arm64-apple-macosx26.0"
+TARGET="arm64-apple-macosx15.0"
+
+APP_VERSION=$(/usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" "$INFO_PLIST")
+APP_BUILD=$(/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" "$INFO_PLIST")
+if [ -z "$APP_VERSION" ] || ! [[ "$APP_BUILD" =~ ^[0-9]+$ ]]; then
+    echo "❌ Invalid version metadata in $INFO_PLIST: version='$APP_VERSION' build='$APP_BUILD'"
+    exit 1
+fi
+
+echo "==> Packaging $APP_NAME $APP_VERSION ($APP_BUILD)"
+
+# --- Optional: App Store / Sandbox signing ---
+# Set CODESIGN_IDENTITY to your "Apple Distribution" or "Mac Developer" cert name.
+# Example: CODESIGN_IDENTITY="Apple Distribution: Your Name (TEAMID)"
+CODESIGN_IDENTITY="${CODESIGN_IDENTITY:-}"
+ENTITLEMENTS="$SWIFT_DIR/TagLauncher.entitlements"
+APP_STORE_MODE=false
+
+if [ -n "${APP_STORE:-}" ] && [ "$APP_STORE" = "1" ]; then
+    APP_STORE_MODE=true
+    if [ -z "$CODESIGN_IDENTITY" ]; then
+        echo "⚠️  APP_STORE=1 but CODESIGN_IDENTITY not set. Will ad-hoc sign with entitlements."
+    fi
+    if [ ! -f "$ENTITLEMENTS" ]; then
+        echo "❌ APP_STORE=1 requires entitlements at: $ENTITLEMENTS"
+        exit 1
+    fi
+fi
 
 echo "==> Cleaning..."
 rm -rf "$BUILD_DIR"
@@ -20,6 +48,10 @@
 mkdir -p "$RESOURCES_DIR"
 
 echo "==> Compiling Swift files..."
+SWIFT_FILES=()
+while IFS= read -r file; do
+    SWIFT_FILES+=("$file")
+done < <(find "$SWIFT_DIR" -name '*.swift' -print | sort)
 swiftc \
     -o "$MACOS_DIR/$APP_NAME" \
     -framework AppKit \
@@ -27,10 +59,11 @@
     -framework Carbon \
     -sdk "$SDK_PATH" \
     -target "$TARGET" \
-    "$SWIFT_DIR"/*.swift
+    -Osize \
+    "${SWIFT_FILES[@]}"
 
 echo "==> Copying Info.plist..."
-cp "$SWIFT_DIR/Info.plist" "$APP_BUNDLE/Contents/Info.plist"
+cp "$INFO_PLIST" "$APP_BUNDLE/Contents/Info.plist"
 
 echo "==> Copying AppIcon.icns..."
 if [ -f "$PROJECT_DIR/icon-icns.icns" ]; then
@@ -39,9 +72,68 @@
     iconutil -c icns "$SWIFT_DIR/AppIcon.iconset" -o "$RESOURCES_DIR/AppIcon.icns" 2>/dev/null
 fi
 
+echo "==> Copying menu bar icon..."
+if [ -f "$PROJECT_DIR/Research/logo/TagLauncherMenuBarIcon_v2_light.svg" ]; then
+    cp "$PROJECT_DIR/Research/logo/TagLauncherMenuBarIcon_v2_light.svg" "$RESOURCES_DIR/TagLauncherMenuBarIcon.svg"
+fi
+
+echo "==> Copying Localization files..."
+cp -r "$SWIFT_DIR/Localization" "$RESOURCES_DIR/Localization"
+
+echo "==> Copying Smart Start catalog..."
+if [ -f "$PROJECT_DIR/Research/SmartStart/UltimateDefaultCatalog/SmartStart_UltimateDefaultCatalog.json" ]; then
+    cp "$PROJECT_DIR/Research/SmartStart/UltimateDefaultCatalog/SmartStart_UltimateDefaultCatalog.json" "$RESOURCES_DIR/SmartStartUltimateDefaultCatalog.json"
+fi
+if [ -f "$PROJECT_DIR/Research/SmartStart/UltimateDefaultCatalog/SmartStart_UltimateDefaultCatalog.csv" ]; then
+    cp "$PROJECT_DIR/Research/SmartStart/UltimateDefaultCatalog/SmartStart_UltimateDefaultCatalog.csv" "$RESOURCES_DIR/SmartStartUltimateDefaultCatalog.csv"
+fi
+if [ -f "$PROJECT_DIR/Research/SmartStart/AppDefaultTags_Review.csv" ]; then
+    cp "$PROJECT_DIR/Research/SmartStart/AppDefaultTags_Review.csv" "$RESOURCES_DIR/SmartStartAppDefaultTags.csv"
+fi
+
+echo "==> Embedding PkgInfo..."
+echo -n "APPL????" > "$APP_BUNDLE/Contents/PkgInfo"
+
 echo "==> Setting permissions..."
 chmod +x "$MACOS_DIR/$APP_NAME"
+
+echo "==> Stripping debug symbols..."
+strip -x "$MACOS_DIR/$APP_NAME"
+
+echo "==> Clearing extended attributes..."
+xattr -cr "$APP_BUNDLE" 2>/dev/null || true
+
+# --- Signing ---
+if [ "$APP_STORE_MODE" = true ] || [ -n "$CODESIGN_IDENTITY" ]; then
+    echo "==> Signing with entitlements..."
+    if [ -n "$CODESIGN_IDENTITY" ]; then
+        CODESIGN_ARGS="--sign \"$CODESIGN_IDENTITY\""
+    else
+        CODESIGN_ARGS="--sign -"
+    fi
+
+    if [ -f "$ENTITLEMENTS" ]; then
+        eval codesign --force --deep $CODESIGN_ARGS --entitlements "$ENTITLEMENTS" "$APP_BUNDLE"
+        echo "   Signed with entitlements: $ENTITLEMENTS"
+    else
+        eval codesign --force --deep $CODESIGN_ARGS "$APP_BUNDLE"
+        echo "   Signed (no entitlements file found)"
+    fi
+else
+    # Default: ad-hoc sign without entitlements (local dev)
+    echo "==> Ad-hoc signing..."
+    codesign --force --deep --sign - "$APP_BUNDLE"
+fi
 
 echo ""
 echo "✅ App built at: $APP_BUNDLE"
 echo "   Run: open $APP_BUNDLE"
+
+# --- App Store mode: remind about next steps ---
+if [ "$APP_STORE_MODE" = true ]; then
+    echo ""
+    echo "📦 App Store build ready. Next steps:"
+    echo "   1. Verify sandbox: spctl -a -v \"$APP_BUNDLE\""
+    echo "   2. Test in sandbox: sandbox-exec -f <(echo '(version 1)(allow default)') open \"$APP_BUNDLE\""
+    echo "   3. Upload via Transporter or 'xcrun altool --upload-app'"
+fi

--
Gitblit v1.9.3