From bc98262973f54ef9bec2564e02dc7d3cc27df32d Mon Sep 17 00:00:00 2001 From: holmesworcester Date: Wed, 15 Jul 2020 13:54:38 -0400 Subject: [PATCH 1/6] Adds instruction to install create-dmg --- packaging/osx/release_osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/osx/release_osx.sh b/packaging/osx/release_osx.sh index 91fcb158..a5497ff5 100755 --- a/packaging/osx/release_osx.sh +++ b/packaging/osx/release_osx.sh @@ -1,6 +1,7 @@ #!/bin/bash # Create and package a clean, release-mode build of the application +# Install `create-dmg` with `brew install create-dmg` or from source: https://github.com/create-dmg/create-dmg # Must be run from the git source directory. # Create a .packagingrc file to define: # TOR_BINARY Path to tor binary to copy into bundle. From 104449ed8d1d7a488e32079b7b35b0225c3ed35e Mon Sep 17 00:00:00 2001 From: holmesworcester Date: Wed, 15 Jul 2020 14:34:15 -0400 Subject: [PATCH 2/6] Adds macOS-specific path and params to qmake --- packaging/osx/release_osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/osx/release_osx.sh b/packaging/osx/release_osx.sh index a5497ff5..149a848c 100755 --- a/packaging/osx/release_osx.sh +++ b/packaging/osx/release_osx.sh @@ -28,7 +28,7 @@ rm -r build || true mkdir build cd build -qmake CONFIG+=release .. +/usr/local/opt/qt5/bin/qmake OPENSSLDIR=/usr/local/opt/openssl/ CONFIG+=release .. make cp "$TOR_BINARY" ricochet.app/Contents/MacOS/ From 1cfb11ac0110f0a058db616b5b02f36d92e4be37 Mon Sep 17 00:00:00 2001 From: holmesworcester Date: Wed, 15 Jul 2020 15:43:17 -0400 Subject: [PATCH 3/6] Adds helpful background image This image comes from the electron builder project, which is made available under the MIT license. See: https://github.com/electron-userland/electron-builder/blob/e1a7ec9f3f7dde69b99dc8c809aac688803ee9a9/packages/dmg-builder/templates/background.tiff https://stackoverflow.com/questions/11199926/create-dmg-with-retina-background-support/11204769#11204769 --- icons/osx-dmg-background.tiff | Bin 0 -> 37298 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/osx-dmg-background.tiff diff --git a/icons/osx-dmg-background.tiff b/icons/osx-dmg-background.tiff new file mode 100644 index 0000000000000000000000000000000000000000..66d832a8fda1dcc8631cde2135d52f7c660e652c GIT binary patch literal 37298 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 literal 0 HcmV?d00001 From 41a12d5b506838bee0f308141601f62557b0a4f4 Mon Sep 17 00:00:00 2001 From: holmesworcester Date: Wed, 15 Jul 2020 16:18:28 -0400 Subject: [PATCH 4/6] Adds instructive background and shortcut to `Applications` to DMG --- packaging/osx/release_osx.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packaging/osx/release_osx.sh b/packaging/osx/release_osx.sh index 149a848c..1486fac0 100755 --- a/packaging/osx/release_osx.sh +++ b/packaging/osx/release_osx.sh @@ -43,7 +43,16 @@ if [ ! -z "$CODESIGN_ID" ]; then codesign --verbose --sign "$CODESIGN_ID" --deep Ricochet.app fi -hdiutil create Ricochet.dmg -srcfolder Ricochet.app -format UDZO -volname Ricochet +# Since create-dmg does not clobber, be sure to delete previous DMG +[[ -f Ricochet.dmg ]] && rm Ricochet.dmg + +# Creates source folder required by create-dmg +# [[ -f osx-dmg-source ]] && rm -rf osx-dmg-source +mkdir osx-dmg-source +cp -r Ricochet.app osx-dmg-source/Ricochet.app + +# Create "fancy" DMG with shortcut to `Applications` and instruction to user. (See: https://github.com/create-dmg/create-dmg) +create-dmg --window-size 540 380 --icon-size 80 --text-size 12 --app-drop-link 370 225 --icon "Ricochet.app" 165 225 --volname "Ricochet" --hide-extension "Ricochet.app" --background "../icons/osx-dmg-background.tiff" "Ricochet.dmg" "osx-dmg-source/" echo "---------" From 65c29997b3f8bd4faad68d632e53700e48532d5a Mon Sep 17 00:00:00 2001 From: holmesworcester Date: Wed, 15 Jul 2020 16:19:59 -0400 Subject: [PATCH 5/6] Revert "Adds instructive background and shortcut to `Applications` to DMG" This reverts commit 41a12d5b506838bee0f308141601f62557b0a4f4. --- packaging/osx/release_osx.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/packaging/osx/release_osx.sh b/packaging/osx/release_osx.sh index 1486fac0..149a848c 100755 --- a/packaging/osx/release_osx.sh +++ b/packaging/osx/release_osx.sh @@ -43,16 +43,7 @@ if [ ! -z "$CODESIGN_ID" ]; then codesign --verbose --sign "$CODESIGN_ID" --deep Ricochet.app fi -# Since create-dmg does not clobber, be sure to delete previous DMG -[[ -f Ricochet.dmg ]] && rm Ricochet.dmg - -# Creates source folder required by create-dmg -# [[ -f osx-dmg-source ]] && rm -rf osx-dmg-source -mkdir osx-dmg-source -cp -r Ricochet.app osx-dmg-source/Ricochet.app - -# Create "fancy" DMG with shortcut to `Applications` and instruction to user. (See: https://github.com/create-dmg/create-dmg) -create-dmg --window-size 540 380 --icon-size 80 --text-size 12 --app-drop-link 370 225 --icon "Ricochet.app" 165 225 --volname "Ricochet" --hide-extension "Ricochet.app" --background "../icons/osx-dmg-background.tiff" "Ricochet.dmg" "osx-dmg-source/" +hdiutil create Ricochet.dmg -srcfolder Ricochet.app -format UDZO -volname Ricochet echo "---------" From 0ccbef1bd8adb4974da9eaf79980586edb20570d Mon Sep 17 00:00:00 2001 From: holmesworcester Date: Wed, 15 Jul 2020 16:54:45 -0400 Subject: [PATCH 6/6] Revert "Revert "Adds instructive background and shortcut to `Applications` to DMG"" This reverts commit 65c29997b3f8bd4faad68d632e53700e48532d5a. --- packaging/osx/release_osx.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packaging/osx/release_osx.sh b/packaging/osx/release_osx.sh index 149a848c..1486fac0 100755 --- a/packaging/osx/release_osx.sh +++ b/packaging/osx/release_osx.sh @@ -43,7 +43,16 @@ if [ ! -z "$CODESIGN_ID" ]; then codesign --verbose --sign "$CODESIGN_ID" --deep Ricochet.app fi -hdiutil create Ricochet.dmg -srcfolder Ricochet.app -format UDZO -volname Ricochet +# Since create-dmg does not clobber, be sure to delete previous DMG +[[ -f Ricochet.dmg ]] && rm Ricochet.dmg + +# Creates source folder required by create-dmg +# [[ -f osx-dmg-source ]] && rm -rf osx-dmg-source +mkdir osx-dmg-source +cp -r Ricochet.app osx-dmg-source/Ricochet.app + +# Create "fancy" DMG with shortcut to `Applications` and instruction to user. (See: https://github.com/create-dmg/create-dmg) +create-dmg --window-size 540 380 --icon-size 80 --text-size 12 --app-drop-link 370 225 --icon "Ricochet.app" 165 225 --volname "Ricochet" --hide-extension "Ricochet.app" --background "../icons/osx-dmg-background.tiff" "Ricochet.dmg" "osx-dmg-source/" echo "---------"