averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix dmg installer to not have duplicate images and icons

Browse Source 
We added a new step in #1540 to generate the image / icon set for the
dmg installer during the dmg build step, but the intermediate files were
erroneously placed in the same folder as the one being copied over,
causing them to be in the final dmg as well. Just use a scratch folder
instead.
This commit is contained in:
Yee Cheng Chin
2025-02-01 18:25:22 -08:00
parent 7b4df97ece
commit d04d99de73
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+7 -4
View File
@@ -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
@@ -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 \