Merge commit 'refs/pull/2727/head' of https://github.com/digitalbitbox/bitbox-wallet-app

Author: benma

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Format amounts using localized decimal and group separator
 - Support pasting different localized number formats, i.e. dot and comma separated amounts
 - Fix BitBoxApp crash on GrapheneOS and other phones without Google Play Services when scanning QR codes.
+- Add DMG installer for macOS
 
 ## 4.42.0
 - Preselect backup when there's only one backup available

Makefile

@@ -79,6 +79,9 @@ android:
 osx-sec-check:
 	@echo "Checking build output"
 	./scripts/osx-build-check.sh
+osx-create-dmg:
+	@echo "Creating DMG installer"
+	./scripts/osx-create-dmg.sh
 ci:
 	./scripts/ci.sh
 clean:

docs/BUILD.md

@@ -52,14 +52,14 @@ Build artifacts:
 Requires Xcode 10+ and macOS 10.13.6+.
 
 ```
-$ cd frontends/qt/build/osx/
 $ # Sign with hardened runtime:
-$ codesign -f --deep --strict --timestamp -o runtime --entitlements ../../resources/MacOS/entitlements.plist -s CODESIGN_IDENTITY BitBox.app
-$ /usr/bin/ditto -c -k --keepParent BitBox.app BitBox.zip
+$ codesign -f --deep --strict --timestamp -o runtime --entitlements frontends/qt/resources/MacOS/entitlements.plist -s CODESIGN_IDENTITY frontends/qt/build/osx/BitBox.app
+$ # Create DMG installer
+$ make osx-create-dmg
 $ # Notarize
-$ xcrun notarytool submit --apple-id "APPLE_ID" --team-id "TEAM_ID" --password "PASSWORD" BitBox.zip
+$ xcrun notarytool submit --apple-id "APPLE_ID" --team-id "TEAM_ID" --password "PASSWORD" frontends/qt/build/osx/BitBox_Installer.dmg
 $ # Check notarization status
-$  xcrun notarytool info --apple-id "APPLE_ID" --team-id "TEAM_ID" --password "PASSWORD" NOTARIZATION_ID
+$ xcrun notarytool info --apple-id "APPLE_ID" --team-id "TEAM_ID" --password "PASSWORD" NOTARIZATION_ID
 ```
 
 If you don't know your TEAM_ID, you can find it in your Apple dev account or with:

frontends/qt/resources/MacOS/background.png

@@ -4,9 +4,11 @@ if [ $(arch) = "arm64" ]; then
   # recent M-based apple machines have an arm64 arch, but we need to install x86_64 deps
   arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
   /usr/local/Homebrew/bin/brew install go@1.21
-  /usr/local/Homebrew/bin/brew instal qt@5
+  /usr/local/Homebrew/bin/brew install qt@5
+  /usr/local/Homebrew/bin/brew install create-dmg
 else
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
   brew install go@1.21
   brew install qt@5
+  brew install create-dmg
 fi

scripts/osx-brew.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+APP="frontends/qt/build/osx/BitBox.app"
+INSTALLER="frontends/qt/build/osx/BitBoxApp_Installer.dmg"
+
+if ! type create-dmg > /dev/null; then
+    echo "create-dmg not available. Install with Homebrew using 'brew install create-dmg'."
+    exit 1
+fi
+
+if [ ! -d "$APP" ]; then
+	echo "No target found at: $APP"
+	exit 1
+fi
+
+if [ -f "$INSTALLER" ]; then
+    echo "Removing existing installer file: $INSTALLER"
+    rm "$INSTALLER"
+fi
+
+create-dmg \
+	--volname "BitBoxApp Installer" \
+	--volicon "frontends/qt/resources/MacOS/icon.icns" \
+	--background "frontends/qt/resources/MacOS/background.png" \
+	--window-pos 200 120 \
+	--window-size 800 450 \
+	--icon-size 120 \
+	--icon "BitBox.app" 200 190 \
+  	--hide-extension "BitBox.app" \
+  	--app-drop-link 600 190 \
+  	"$INSTALLER" \
+  	"$APP"