Repository navigation
feat(macos): ship Bridge as a .app in a styled DMG; fix the updater for real release archives #47
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| /target | ||
| native-hid/node_modules | ||
| .DS_Store | ||
| __pycache__/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <?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> | ||
| <key>CFBundleExecutable</key> | ||
| <string>openmouse-bridge</string> | ||
| <key>CFBundleIconFile</key> | ||
| <string>OpenMouse</string> | ||
| <key>CFBundleIdentifier</key> | ||
| <string>io.OpenMouse.OpenMouse-Bridge</string> | ||
| <key>CFBundleInfoDictionaryVersion</key> | ||
| <string>6.0</string> | ||
| <key>CFBundleName</key> | ||
| <string>OpenMouse Bridge</string> | ||
| <key>CFBundleDisplayName</key> | ||
| <string>OpenMouse Bridge</string> | ||
| <key>CFBundlePackageType</key> | ||
| <string>APPL</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>@VERSION@</string> | ||
| <key>CFBundleVersion</key> | ||
| <string>@BUILD@</string> | ||
| <key>LSMinimumSystemVersion</key> | ||
| <string>11.0</string> | ||
| <key>LSUIElement</key> | ||
| <true/> | ||
| <key>NSHighResolutionCapable</key> | ||
| <true/> | ||
| <key>NSHumanReadableCopyright</key> | ||
| <string>MIT License</string> | ||
| </dict> | ||
| </plist> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| #!/bin/bash | ||
| # Assembles "OpenMouse Bridge.app" from a built Bridge binary and a prepared | ||
| # native-hid directory (deps + bundled Node.js, see release.yml). | ||
| # | ||
| # build-app.sh <binary> <native-hid-dir> <version> <out-dir> | ||
| # | ||
| # Signs ad-hoc by default. Set MACOS_SIGN_IDENTITY to a Developer ID | ||
| # Application identity for a distributable (notarizable) build. | ||
| set -euo pipefail | ||
|
|
||
| binary="$1" | ||
| native_hid="$2" | ||
| version="$3" | ||
| out_dir="$4" | ||
| identity="${MACOS_SIGN_IDENTITY:--}" | ||
|
|
||
| here="$(cd "$(dirname "$0")" && pwd)" | ||
| repo="$(cd "$here/../.." && pwd)" | ||
| app="$out_dir/OpenMouse Bridge.app" | ||
|
|
||
| rm -rf "$app" | ||
| mkdir -p "$app/Contents/MacOS" "$app/Contents/Resources" | ||
|
|
||
| cp "$binary" "$app/Contents/MacOS/openmouse-bridge" | ||
| chmod +x "$app/Contents/MacOS/openmouse-bridge" | ||
|
|
||
| ditto "$native_hid" "$app/Contents/Resources/native-hid" | ||
| # Bridge's updater refuses packages that omit the bundled font's license. | ||
| cp "$repo/assets/fonts/DM-Sans-OFL.txt" "$app/Contents/Resources/DM-Sans-OFL.txt" | ||
| # npm's .bin entries are symlinks, which the update zip cannot carry. | ||
| find "$app/Contents/Resources/native-hid" -name .bin -type d -prune -exec rm -rf {} + | ||
| if [ -n "$(find "$app" -type l)" ]; then | ||
| echo "bundle contains symlinks:" >&2 | ||
| find "$app" -type l >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| # 1.0.0-beta.19 -> short version as-is, build number numeric. | ||
| build="${version%%-*}" | ||
| sed -e "s/@VERSION@/$version/" -e "s/@BUILD@/$build/" \ | ||
| "$here/Info.plist" > "$app/Contents/Info.plist" | ||
|
|
||
| iconset="$(mktemp -d)/OpenMouse.iconset" | ||
| mkdir -p "$iconset" | ||
| icon="$here/icon-1024.png" # regenerate with make-assets.py | ||
| for size in 16 32 128 256 512; do | ||
| sips -z "$size" "$size" "$icon" --out "$iconset/icon_${size}x${size}.png" >/dev/null | ||
| double=$((size * 2)) | ||
| sips -z "$double" "$double" "$icon" --out "$iconset/icon_${size}x${size}@2x.png" >/dev/null | ||
| done | ||
| iconutil -c icns "$iconset" -o "$app/Contents/Resources/OpenMouse.icns" | ||
|
|
||
| sign_flags=(--force --sign "$identity" --entitlements "$here/entitlements.plist") | ||
| if [ "$identity" != "-" ]; then | ||
| sign_flags+=(--options runtime --timestamp) | ||
| fi | ||
|
|
||
| # Inside-out: nested Mach-O (Node, node-hid addon) first, then the app. | ||
| while IFS= read -r -d '' file; do | ||
| if file -b "$file" | grep -q "Mach-O"; then | ||
| codesign "${sign_flags[@]}" "$file" | ||
| fi | ||
| done < <(find "$app/Contents/Resources" -type f -print0) | ||
| codesign "${sign_flags[@]}" "$app" | ||
|
|
||
| codesign --verify --deep --strict "$app" | ||
| echo "$app" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/bash | ||
| # Wraps the app in a styled drag-to-Applications disk image. Needs dmgbuild | ||
| # (pip install dmgbuild). | ||
| # | ||
| # build-dmg.sh <app> <output.dmg> | ||
| set -euo pipefail | ||
|
|
||
| app="$1" | ||
| dmg="$2" | ||
| identity="${MACOS_SIGN_IDENTITY:--}" | ||
| here="$(cd "$(dirname "$0")" && pwd)" | ||
|
|
||
| rm -f "$dmg" | ||
| dmgbuild -s "$here/dmg-settings.py" \ | ||
| -D app="$app" \ | ||
| -D icon="$app/Contents/Resources/OpenMouse.icns" \ | ||
| -D background="$here/dmg-background.tiff" \ | ||
| "OpenMouse Bridge" "$dmg" | ||
|
|
||
| if [ "$identity" != "-" ]; then | ||
| codesign --force --sign "$identity" --timestamp "$dmg" | ||
| fi | ||
| echo "$dmg" |
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # dmgbuild settings for the installer window; see build-dmg.sh. | ||
| # defines: app (path to the .app), icon (volume icon .icns), background (.tiff) | ||
| import os | ||
|
|
||
| app = defines["app"] | ||
| app_name = os.path.basename(app) | ||
|
|
||
| format = "UDZO" | ||
| files = [app] | ||
| symlinks = {"Applications": "/Applications"} | ||
| background = defines["background"] | ||
| icon = defines["icon"] | ||
|
|
||
| show_status_bar = False | ||
| show_tab_view = False | ||
| show_toolbar = False | ||
| show_pathbar = False | ||
| show_sidebar = False | ||
| default_view = "icon-view" | ||
|
|
||
| # Frame = 32pt title bar + 400pt content + 28pt path bar (bg is 660x428 so it | ||
| # also fills the frame when the path bar is hidden). Icon y matches make-assets.py. | ||
| window_rect = ((200, 120), (660, 460)) | ||
| icon_size = 112 | ||
| text_size = 13 | ||
| arrange_by = None | ||
| icon_locations = {app_name: (170, 185), "Applications": (490, 185)} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?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> | ||
| <!-- The bundled Node.js runtime needs V8's JIT, and loads node-hid's | ||
| prebuilt addon, which carries a different signature than the host. --> | ||
| <key>com.apple.security.cs.allow-jit</key> | ||
| <true/> | ||
| <key>com.apple.security.cs.allow-unsigned-executable-memory</key> | ||
| <true/> | ||
| <key>com.apple.security.cs.disable-library-validation</key> | ||
| <true/> | ||
| </dict> | ||
| </plist> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🟠 High
workflows/release.yml:156The macOS release job aborts before packaging artifacts because
python3 -m pip install dmgbuildinstalls into the externally managed base Python onmacos-14. Installdmgbuildin a virtual environment and add that environment’sbindirectory toPATHbefore runningbuild-dmg.sh.🚀 Reply "fix it for me" or copy this AI Prompt for your agent: