Skip to content

Commit 6550dff

Browse files
committed
Fix dmg installer to not have duplicate images and icons
We added a new step in macvim-dev#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.
1 parent 7b4df97 commit 6550dff

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/Makefile

+7-4
Original file line numberDiff line numberDiff line change
@@ -3717,6 +3717,7 @@ RUNTIME_FOLDER_LIST = MacVim/auto/runtime_folder_list.xcfilelist
37173717

37183718
RELEASEDIR = MacVim/build/Release
37193719
DMGDIR = MacVim/build/dmg
3720+
DMGIMGDIR = MacVim/build/dmg_images
37203721
DMGFILE = MacVim.dmg
37213722
ENTITLEMENTS = MacVim/MacVim.entitlements
37223723

@@ -3753,18 +3754,20 @@ macvim-dmg-legacy: macvim-dmg
37533754
# Finder this will still clip the bottom but there's nothing we can do about
37543755
# that.
37553756
macvim-dmg:
3757+
rm -rf $(DMGIMGDIR)
3758+
mkdir -p $(DMGIMGDIR)
3759+
tiffutil -cathidpicheck MacVim/dmg/[email protected] MacVim/dmg/[email protected] -out $(DMGIMGDIR)/background.tiff
3760+
MacVim/scripts/create_icns MacVim/dmg/volume_icons $(DMGIMGDIR) volume
37563761
rm -rf $(DMGDIR)
37573762
mkdir -p $(DMGDIR)
37583763
cp -a $(RELEASEDIR)/MacVim.app $(DMGDIR)/
3759-
tiffutil -cathidpicheck MacVim/dmg/[email protected] MacVim/dmg/[email protected] -out $(DMGDIR)/background.tiff
3760-
MacVim/scripts/create_icns MacVim/dmg/volume_icons $(DMGDIR) volume
37613764
rm -rf $(RELEASEDIR)/$(DMGFILE)
37623765
MacVim/create-dmg/create-dmg \
37633766
--filesystem "$(DMGFILESYSTEM)" \
37643767
--format "$(DMGFORMAT)" \
37653768
--volname "MacVim" \
3766-
--volicon $(DMGDIR)/volume.icns \
3767-
--background $(DMGDIR)/background.tiff \
3769+
--volicon $(DMGIMGDIR)/volume.icns \
3770+
--background $(DMGIMGDIR)/background.tiff \
37683771
--window-size 650 500 \
37693772
--icon-size 128 \
37703773
--icon MacVim.app 210 290 \

0 commit comments

Comments
 (0)