updates

2026-10-23 09:35:17 +01:00
parent 415dba0344
commit 515a1464a3
6 changed files with 604 additions and 184 deletions
@@ -18,7 +18,36 @@ EXE=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' "$APP/Contents/Info
 [[ -x "$APP/Contents/MacOS/$EXE" ]] || { echo 'Application executable missing' >&2; exit 1; }
 echo "Build complete: $APP"
 echo "Log: $LOG"
-if [[ "${1:-}" == '--launch' ]]; then
-  pkill -x "$APP_NAME" 2>/dev/null || true
-  open "$APP"
+
+if [[ "${1:-}" == "--launch" ]]; then
+    echo
+    echo "=== LAUNCHING ORIONTOOLBAR ==="
+
+    pkill -x "$APP_NAME" 2>/dev/null || true
+    sleep 1
+
+    APP_EXEC="$APP/Contents/MacOS/$EXE"
+
+    if [[ ! -x "$APP_EXEC" ]]; then
+        echo "ERROR: Application executable missing: $APP_EXEC"
+        exit 1
+    fi
+
+    echo "Application: $APP"
+    echo "Executable: $APP_EXEC"
+
+    # Launch the exact built application as a separate macOS process.
+    /usr/bin/open -n "$APP" --args
+
+    sleep 3
+
+    if /usr/bin/pgrep -x "$APP_NAME" >/dev/null; then
+        echo "SUCCESS: OrionToolbar is running."
+        /usr/bin/pgrep -fl "$APP_NAME"
+    else
+        echo "ERROR: OrionToolbar did not remain running."
+        echo "Try launching the executable directly:"
+        echo "$APP_EXEC"
+        exit 1
+    fi
 fi
@@ -0,0 +1,24 @@
+#!/bin/zsh
+set -euo pipefail
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+cd "$ROOT"
+APP_NAME=OrionToolbar
+DERIVED="$ROOT/.build"
+CONFIGURATION="${CONFIGURATION:-Debug}"
+[[ "$CONFIGURATION" == Debug || "$CONFIGURATION" == Release ]] || { echo 'CONFIGURATION must be Debug or Release' >&2; exit 2; }
+mkdir -p "$ROOT/.build/build-logs"
+LOG="$ROOT/build-logs/build-${CONFIGURATION}-$(date +%Y%m%d-%H%M%S).log"
+echo "Building $APP_NAME ($CONFIGURATION)"
+set -o pipefail
+xcodebuild -project "$ROOT/OrionToolbar.xcodeproj" -scheme "$APP_NAME" -configuration "$CONFIGURATION" -derivedDataPath "$DERIVED" CODE_SIGNING_ALLOWED=NO build 2>&1 | tee "$LOG"
+APP="$DERIVED/Build/Products/$CONFIGURATION/$APP_NAME.app"
+[[ -d "$APP" ]] || { echo "Missing application: $APP" >&2; exit 1; }
+plutil -lint "$APP/Contents/Info.plist"
+EXE=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' "$APP/Contents/Info.plist")
+[[ -x "$APP/Contents/MacOS/$EXE" ]] || { echo 'Application executable missing' >&2; exit 1; }
+echo "Build complete: $APP"
+echo "Log: $LOG"
+if [[ "${1:-}" == '--launch' ]]; then
+  pkill -x "$APP_NAME" 2>/dev/null || true
+  open "$APP"
+fi
@@ -0,0 +1,48 @@
+#!/bin/zsh
+set -euo pipefail
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+cd "$ROOT"
+APP_NAME=OrionToolbar
+DERIVED="$ROOT/.build"
+CONFIGURATION="${CONFIGURATION:-Debug}"
+[[ "$CONFIGURATION" == Debug || "$CONFIGURATION" == Release ]] || { echo 'CONFIGURATION must be Debug or Release' >&2; exit 2; }
+mkdir -p "$ROOT/.build/build-logs"
+LOG="$ROOT/build-logs/build-${CONFIGURATION}-$(date +%Y%m%d-%H%M%S).log"
+echo "Building $APP_NAME ($CONFIGURATION)"
+set -o pipefail
+xcodebuild -project "$ROOT/OrionToolbar.xcodeproj" -scheme "$APP_NAME" -configuration "$CONFIGURATION" -derivedDataPath "$DERIVED" CODE_SIGNING_ALLOWED=NO build 2>&1 | tee "$LOG"
+APP="$DERIVED/Build/Products/$CONFIGURATION/$APP_NAME.app"
+[[ -d "$APP" ]] || { echo "Missing application: $APP" >&2; exit 1; }
+plutil -lint "$APP/Contents/Info.plist"
+EXE=$(/usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' "$APP/Contents/Info.plist")
+[[ -x "$APP/Contents/MacOS/$EXE" ]] || { echo 'Application executable missing' >&2; exit 1; }
+echo "Build complete: $APP"
+echo "Log: $LOG"
+if [[ "${1:-}" == '--launch' ]]; then
+  echo "Launching $APP_NAME..."
+
+  # Stop any previously running instance.
+  pkill -x "$APP_NAME" 2>/dev/null || true
+  sleep 1
+
+  # Launch the executable from this exact build.
+  EXECUTABLE="$APP/Contents/MacOS/$EXE"
+
+  [[ -x "$EXECUTABLE" ]] || {
+    echo "ERROR: Executable not found: $EXECUTABLE" >&2
+    exit 1
+  }
+
+  "$EXECUTABLE" > "$ROOT/build-logs/launch.log" 2>&1 &
+  APP_PID=$!
+
+  sleep 2
+
+  if ! kill -0 "$APP_PID" 2>/dev/null; then
+    echo "ERROR: Application exited immediately." >&2
+    cat "$ROOT/build-logs/launch.log"
+    exit 1
+  fi
+
+  echo "Launched $APP_NAME (PID $APP_PID)"
+fi