Skip to content

Fix dmg installer to not have duplicate images and icons #1545

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
merged 1 commit into from
Feb 2, 2025
Merged

Fix dmg installer to not have duplicate images and icons #1545

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
11 changes: 7 additions & 4 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3717,6 +3717,7 @@ RUNTIME_FOLDER_LIST = MacVim/auto/runtime_folder_list.xcfilelist

RELEASEDIR = MacVim/build/Release
DMGDIR = MacVim/build/dmg
DMGSCRATCHDIR = MacVim/build/dmg_scratch
DMGFILE = MacVim.dmg
ENTITLEMENTS = MacVim/MacVim.entitlements

Expand Down Expand Up @@ -3753,18 +3754,20 @@ macvim-dmg-legacy: macvim-dmg
# Finder this will still clip the bottom but there's nothing we can do about
# that.
macvim-dmg:
rm -rf $(DMGSCRATCHDIR)
mkdir -p $(DMGSCRATCHDIR)
tiffutil -cathidpicheck MacVim/dmg/background@1x.png MacVim/dmg/background@2x.png -out $(DMGSCRATCHDIR)/background.tiff
MacVim/scripts/create_icns MacVim/dmg/volume_icons $(DMGSCRATCHDIR) volume
rm -rf $(DMGDIR)
mkdir -p $(DMGDIR)
cp -a $(RELEASEDIR)/MacVim.app $(DMGDIR)/
tiffutil -cathidpicheck MacVim/dmg/background@1x.png MacVim/dmg/background@2x.png -out $(DMGDIR)/background.tiff
MacVim/scripts/create_icns MacVim/dmg/volume_icons $(DMGDIR) volume
rm -rf $(RELEASEDIR)/$(DMGFILE)
MacVim/create-dmg/create-dmg \
--filesystem "$(DMGFILESYSTEM)" \
--format "$(DMGFORMAT)" \
--volname "MacVim" \
--volicon $(DMGDIR)/volume.icns \
--background $(DMGDIR)/background.tiff \
--volicon $(DMGSCRATCHDIR)/volume.icns \
--background $(DMGSCRATCHDIR)/background.tiff \
--window-size 650 500 \
--icon-size 128 \
--icon MacVim.app 210 290 \
Expand Down