fix(macos): package the app as SolidCraft (#347) (#354)

packaging/macos/Info.plist.in

@@ -11,7 +11,7 @@
   <key>CFBundleName</key>
   <string>SolidCraft</string>
   <key>CFBundleExecutable</key>
-  <string>SolveCraft</string>
+  <string>SolidCraft</string>
   <key>CFBundleIdentifier</key>
   <string>ai.storyteller.solvecraft</string>
   <key>CFBundleInfoDictionaryVersion</key>
@@ -27,7 +27,7 @@
   <key>SolveCraftVersion</key>
   <string>@VERSION@</string>
   <key>CFBundleIconFile</key>
-  <string>SolveCraft</string>
+  <string>SolidCraft</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.graphics-design</string>
   <!-- Must match MACOSX_DEPLOYMENT_TARGET in package.sh. -->

packaging/macos/README.txt

@@ -0,0 +1,17 @@
+Install SolidCraft
+
+Drag SolidCraft.app onto Applications.
+
+Updating an older SolveCraft.app installation
+
+1. Quit the app.
+2. In Applications, rename the existing SolveCraft.app to SolidCraft.app.
+3. Drag SolidCraft.app from this disk image onto Applications and choose Replace.
+
+If both names are already present, keep SolidCraft.app and move the old
+SolveCraft.app to the Trash. The disk image does not remove old installations.
+If your Dock shortcut still uses the old name, remove it from the Dock, then
+open SolidCraft.app from Applications and choose Options > Keep in Dock.
+
+Your designs and settings keep their existing locations. The bundle identifier
+remains ai.storyteller.solvecraft; saved designs still use .solvecraft.

packaging/macos/package.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Build and package SolidCraft for macOS:
 #
-#   $DIST/solvecraft-<version>-macos-<arch>.dmg        SolveCraft.app on a drag-to-Applications DMG
+#   $DIST/solvecraft-<version>-macos-<arch>.dmg        SolidCraft.app on a drag-to-Applications DMG
 #   $DIST/solvecraft-cli-<version>-macos-<arch>.zip    the headless CLI with the licence files
 #
 # Usage: packaging/macos/package.sh [--arch universal|aarch64|x86_64] [--skip-build]
@@ -34,7 +34,7 @@ esac
 export MACOSX_DEPLOYMENT_TARGET=11.0
 SHORT_VERSION="${VERSION%%-*}"
 WORK="$CARGO_TARGET_DIR/macos-package"
-APP="$WORK/SolveCraft.app"
+APP="$WORK/SolidCraft.app"
 DMG="$DIST/solvecraft-$VERSION-macos-$ARCH.dmg"
 CLI_ZIP="$DIST/solvecraft-cli-$VERSION-macos-$ARCH.zip"
 
@@ -54,18 +54,18 @@ for bin in solvecraft solvecraft-cli; do
   lipo -info "$WORK/bin/$bin"
 done
 
-# ---- SolveCraft.app ----------------------------------------------------------------------------
+# ---- SolidCraft.app ----------------------------------------------------------------------------
 echo "==> assembling $APP"
 mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
-cp "$WORK/bin/solvecraft" "$APP/Contents/MacOS/SolveCraft"
+cp "$WORK/bin/solvecraft" "$APP/Contents/MacOS/SolidCraft"
 # The icon, drawn by the CLI (no image files are committed).
-SET="$WORK/SolveCraft.iconset"
+SET="$WORK/SolidCraft.iconset"
 mkdir -p "$SET"
 for s in 16 32 128 256 512; do
   "$WORK/bin/solvecraft-cli" icon --size "$s" --out "$SET/icon_${s}x${s}.png" >/dev/null
   "$WORK/bin/solvecraft-cli" icon --size $((s * 2)) --out "$SET/icon_${s}x${s}@2x.png" >/dev/null
 done
-iconutil -c icns -o "$APP/Contents/Resources/SolveCraft.icns" "$SET"
+iconutil -c icns -o "$APP/Contents/Resources/SolidCraft.icns" "$SET"
 mkdir -p "$APP/Contents/Resources/Licenses"
 copy_docs "$APP/Contents/Resources/Licenses"
 sed -e "s/@VERSION@/$VERSION/g" -e "s/@SHORT_VERSION@/$SHORT_VERSION/g" "$HERE/Info.plist.in" >"$APP/Contents/Info.plist"
@@ -79,8 +79,9 @@ codesign --verify --strict --deep --verbose=2 "$APP"
 echo "==> building $DMG"
 STAGE="$WORK/dmg"
 mkdir -p "$STAGE"
-ditto "$APP" "$STAGE/SolveCraft.app"
+ditto "$APP" "$STAGE/SolidCraft.app"
 ln -s /Applications "$STAGE/Applications"
+cp "$HERE/README.txt" "$STAGE/README.txt"
 rm -f "$DMG" "$WORK/raw.dmg"
 # makehybrid + convert builds the image without attaching a device, unlike `create -srcfolder`,
 # which is flaky on CI runners ("Resource busy").
@@ -91,15 +92,25 @@ rm -f "$WORK/raw.dmg"
 # Check the image as a user gets it: mount it and look inside.
 MNT="$(mktemp -d)"
 hdiutil attach -readonly -nobrowse -mountpoint "$MNT" "$DMG"
-ls -la "$MNT" "$MNT/SolveCraft.app/Contents" "$MNT/SolveCraft.app/Contents/MacOS" "$MNT/SolveCraft.app/Contents/Resources"
+ls -la "$MNT" "$MNT/SolidCraft.app/Contents" "$MNT/SolidCraft.app/Contents/MacOS" "$MNT/SolidCraft.app/Contents/Resources"
 test -L "$MNT/Applications" && test "$(readlink "$MNT/Applications")" = /Applications
-plutil -lint "$MNT/SolveCraft.app/Contents/Info.plist"
+plutil -lint "$MNT/SolidCraft.app/Contents/Info.plist"
+# Check the names Finder/LaunchServices actually use, as well as compatibility identity.
+for key in CFBundleName CFBundleDisplayName CFBundleExecutable CFBundleIconFile; do
+  test "$(/usr/libexec/PlistBuddy -c "Print :$key" "$MNT/SolidCraft.app/Contents/Info.plist")" = SolidCraft
+done
+test "$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$MNT/SolidCraft.app/Contents/Info.plist")" = "$APP_ID"
+test ! -e "$MNT/SolveCraft.app"
+test -s "$MNT/SolidCraft.app/Contents/Resources/SolidCraft.icns"
+cmp "$HERE/README.txt" "$MNT/README.txt"
 case "$ARCH" in universal) WANT=(arm64 x86_64) ;; aarch64) WANT=(arm64) ;; *) WANT=(x86_64) ;; esac
-lipo "$MNT/SolveCraft.app/Contents/MacOS/SolveCraft" -verify_arch "${WANT[@]}"
-test -s "$MNT/SolveCraft.app/Contents/Resources/Licenses/THIRD-PARTY-LICENSES.txt"
+for arch in "${WANT[@]}"; do
+  lipo "$MNT/SolidCraft.app/Contents/MacOS/SolidCraft" -verify_arch "$arch"
+done
+test -s "$MNT/SolidCraft.app/Contents/Resources/Licenses/THIRD-PARTY-LICENSES.txt"
 # Not --strict: the mounted HFS volume adds Finder info, which strict verification rejects.
-codesign --verify --deep --verbose=2 "$MNT/SolveCraft.app"
-"$MNT/SolveCraft.app/Contents/MacOS/SolveCraft" --version
+codesign --verify --deep --verbose=2 "$MNT/SolidCraft.app"
+"$MNT/SolidCraft.app/Contents/MacOS/SolidCraft" --version
 hdiutil detach "$MNT"
 
 # ---- CLI ---------------------------------------------------------------------------------------