Collect application resources for #433 (#833)

2026-10-14 00:49:32 -04:00
1 parent d5ff5ea1a5
commit 9f76cca8b4
@@ -1,67 +0,0 @@
-<?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">
-<!-- Template: packaging/macos/package.sh substitutes @VERSION@ (full, e.g. 0.2.0-rc.1) and
-     @SHORT_VERSION@ (numeric X.Y.Z). Adapted from PhotoCraft's (storytold/photocraft, Apache-2.0). -->
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleDisplayName</key>
-  <string>SolidCraft</string>
-  <key>CFBundleName</key>
-  <string>SolidCraft</string>
-  <key>CFBundleExecutable</key>
-  <string>SolidCraft</string>
-  <key>CFBundleIdentifier</key>
-  <string>ai.storyteller.solidcraft</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundlePackageType</key>
-  <string>APPL</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleShortVersionString</key>
-  <string>@SHORT_VERSION@</string>
-  <key>CFBundleVersion</key>
-  <string>@SHORT_VERSION@</string>
-  <key>SolidCraftVersion</key>
-  <string>@VERSION@</string>
-  <key>CFBundleIconFile</key>
-  <string>SolidCraft</string>
-  <key>CFBundleIconName</key>
-  <string>SolidCraft</string>
-  <key>LSApplicationCategoryType</key>
-  <string>public.app-category.graphics-design</string>
-  <!-- Must match MACOSX_DEPLOYMENT_TARGET in package.sh. -->
-  <key>LSMinimumSystemVersion</key>
-  <string>11.0</string>
-  <key>NSHighResolutionCapable</key>
-  <true/>
-  <key>NSSupportsAutomaticGraphicsSwitching</key>
-  <true/>
-  <key>CFBundleDocumentTypes</key>
-  <array>
-    <dict>
-      <key>CFBundleTypeName</key>
-      <string>SolidCraft design</string>
-      <key>CFBundleTypeExtensions</key>
-      <!-- solvecraft: designs saved before the rename (compatibility shim, docs/compatibility.md). -->
-      <array><string>solidcraft</string><string>solvecraft</string></array>
-      <key>CFBundleTypeRole</key>
-      <string>Editor</string>
-      <key>LSHandlerRank</key>
-      <string>Owner</string>
-    </dict>
-    <dict>
-      <key>CFBundleTypeName</key>
-      <string>STEP, IGES and mesh files</string>
-      <key>CFBundleTypeExtensions</key>
-      <array><string>step</string><string>stp</string><string>igs</string><string>iges</string><string>3mf</string><string>stl</string></array>
-      <key>CFBundleTypeRole</key>
-      <string>Viewer</string>
-      <key>LSHandlerRank</key>
-      <string>Alternate</string>
-    </dict>
-  </array>
-</dict>
-</plist>
@@ -1,16 +0,0 @@
-Install SolidCraft
-
-Drag SolidCraft.app onto Applications.
-
-Updating an older installation
-
-1. Quit the app.
-2. Drag SolidCraft.app from this disk image onto Applications and choose Replace.
-
-Some earlier releases were installed as SolveCraft.app. Move that one to the Trash
-once SolidCraft.app is in Applications, and replace any Dock shortcut with the
-old name (open SolidCraft.app, then choose Options > Keep in Dock).
-
-Designs saved as .solvecraft still open, and SolidCraft copies your settings
-and recovery files from the old SolveCraft folder on its first launch.
-New designs are saved as .solidcraft.
@@ -12,7 +12,6 @@
 set -euo pipefail
 # shellcheck source=../env.sh
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
-HERE="$ROOT/packaging/macos"
 # The same reverse-DNS id as the Linux APP_ID.
 MACOS_BUNDLE_ID=ai.storyteller.solidcraft

@@ -63,11 +62,11 @@ mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
 cp "$WORK/bin/solidcraft" "$APP/Contents/MacOS/SolidCraft"
 # Apple-compiled layered icon and older-macOS fallback (regeneration: assets/README.md).
 # Keep compiled resources so packaging also works on runners with older Xcode versions.
-cp "$ROOT/assets/Assets.car" "$APP/Contents/Resources/Assets.car"
-cp "$ROOT/assets/icon.icns" "$APP/Contents/Resources/SolidCraft.icns"
+cp "$ROOT/assets/icons/app/macos/exports/Assets.car" "$APP/Contents/Resources/Assets.car"
+cp "$ROOT/assets/icons/app/macos/exports/icon.icns" "$APP/Contents/Resources/SolidCraft.icns"
 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"
+sed -e "s/@VERSION@/$VERSION/g" -e "s/@SHORT_VERSION@/$SHORT_VERSION/g" "$ROOT/assets/platforms/macos/Info.plist.in" >"$APP/Contents/Info.plist"
 plutil -lint "$APP/Contents/Info.plist"
 printf 'APPL????' >"$APP/Contents/PkgInfo"
 # Ad-hoc signature over the whole bundle (Apple silicon refuses unsigned code).
@@ -80,7 +79,7 @@ STAGE="$WORK/dmg"
 mkdir -p "$STAGE"
 ditto "$APP" "$STAGE/SolidCraft.app"
 ln -s /Applications "$STAGE/Applications"
-cp "$HERE/README.txt" "$STAGE/README.txt"
+cp "$ROOT/assets/platforms/macos/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").
@@ -100,9 +99,9 @@ for key in CFBundleName CFBundleDisplayName CFBundleExecutable CFBundleIconFile
 done
 test "$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "$MNT/SolidCraft.app/Contents/Info.plist")" = "$MACOS_BUNDLE_ID"
 test -s "$MNT/SolidCraft.app/Contents/Resources/SolidCraft.icns"
-cmp "$ROOT/assets/icon.icns" "$MNT/SolidCraft.app/Contents/Resources/SolidCraft.icns"
-cmp "$ROOT/assets/Assets.car" "$MNT/SolidCraft.app/Contents/Resources/Assets.car"
-cmp "$HERE/README.txt" "$MNT/README.txt"
+cmp "$ROOT/assets/icons/app/macos/exports/icon.icns" "$MNT/SolidCraft.app/Contents/Resources/SolidCraft.icns"
+cmp "$ROOT/assets/icons/app/macos/exports/Assets.car" "$MNT/SolidCraft.app/Contents/Resources/Assets.car"
+cmp "$ROOT/assets/platforms/macos/README.txt" "$MNT/README.txt"
 case "$ARCH" in universal) WANT=(arm64 x86_64) ;; aarch64) WANT=(arm64) ;; *) WANT=(x86_64) ;; esac
 for arch in "${WANT[@]}"; do
  lipo "$MNT/SolidCraft.app/Contents/MacOS/SolidCraft" -verify_arch "$arch"