Skip to content

Switch to create-dmg #2207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ann0see merged 1 commit into from
Feb 20, 2022
Merged

Switch to create-dmg #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions mac/deploy_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ cert_name=""

while getopts 'hs:' flag; do
case "${flag}" in
s)
cert_name=$OPTARG
s)
cert_name=$OPTARG
if [[ -z "$cert_name" ]]; then
echo "Please add the name of the certificate to use: -s \"<name>\""
fi
# shift 2
;;
h)
echo "Usage: -s <cert name> for signing mac build"
exit 0
h)
echo "Usage: -s <cert name> for signing mac build"
exit 0
;;
*)
exit 1
;;

esac
done

Expand Down Expand Up @@ -67,18 +67,30 @@ build_app()

build_installer_image()
{
# Install dmgbuild (for the current user), this is required to build the installer image
python -m ensurepip --user --default-pip
python -m pip install --user dmgbuild==1.4.2
local dmgbuild_bin="$(python -c 'import site; print(site.USER_BASE)')/bin/dmgbuild"

# Install create-dmg via brew. brew needs to be installed first.
# Download and later install. This is done to make caching possible
local create_dmg_version="1.0.9"
brew extract --version="${create_dmg_version}" create-dmg homebrew/cask
brew install /usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask/Formula/create-dmg@"${create_dmg_version}".rb
# Get Jamulus version
local app_version="$(cat "${project_path}" | sed -nE 's/^VERSION *= *(.*)$/\1/p')"

# Build installer image
"${dmgbuild_bin}" -s "${macdeploy_path}/deployment_settings.py" -D background="${resources_path}/installerbackground.png" \
-D app_path="${deploy_path}/$1.app" -D server_path="${deploy_path}/$2.app" \
-D license="${root_path}/COPYING" "$1 Installer" "${deploy_path}/$1-${app_version}-installer-mac.dmg"

create-dmg \
--volname "${1} Installer" \
--background "${resources_path}/installerbackground.png" \
--window-pos 200 400 \
--window-size 900 320 \
--app-drop-link 820 210 \
--text-size 12 \
--icon-size 72 \
--icon "${1}.app" 630 210 \
--icon "${2}.app" 530 210 \
--eula "${root_path}/COPYING" \
"${deploy_path}/$1-${app_version}-installer-mac.dmg" \
"${deploy_path}/"

}


Expand Down
96 changes: 0 additions & 96 deletions mac/deployment_settings.py
View file
Open in desktop

This file was deleted.