From ff3333e1bf9abd487aaa9ec7ddf87c8ee8a7b920 Mon Sep 17 00:00:00 2001 From: Martin Delille Date: Wed, 17 Jul 2019 22:05:41 +0200 Subject: [PATCH] Use create-dmg to generate MacOS release (#215) --- .travis.yml | 1 + dist/macos/create-dmg.sh.in | 11 +---------- dist/macos/dmg_background.png | Bin 0 -> 3263 bytes 3 files changed, 2 insertions(+), 10 deletions(-) create mode 100644 dist/macos/dmg_background.png diff --git a/.travis.yml b/.travis.yml index a6b67b8bb..88cecd997 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ before_install: brew install gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; brew install chromaprint; brew install libcdio libmtp libimobiledevice libplist; + brew install create-dmg; export Qt5_DIR=/usr/local/opt/qt5/lib/cmake; export Qt5LinguistTools_DIR=/usr/local/opt/qt5/lib/cmake/Qt5LinguistTools; export PATH="/usr/local/opt/gettext/bin:$PATH"; diff --git a/dist/macos/create-dmg.sh.in b/dist/macos/create-dmg.sh.in index 1ae449ceb..c4ef5d674 100755 --- a/dist/macos/create-dmg.sh.in +++ b/dist/macos/create-dmg.sh.in @@ -20,14 +20,5 @@ rm -rf "$temp_dir" rm -f "$output_file" mkdir -p "$temp_dir" -#mkdir -p "$temp_dir/.background" -#cp ../dist/macos/dmg_background.png "$temp_dir/.background/background.png" -#cp ../dist/macos/DS_Store.in "$temp_dir/.DS_Store" -#chmod go-rwx "$temp_dir/.DS_Store" -ln -s /Applications "$temp_dir/Applications" -# Copies the prepared bundle into the dir that will become the DMG -cp -R "$bundle_dir" "$temp_dir" -# Create dmg -hdiutil makehybrid -hfs -hfs-volume-name "$name" -hfs-openfolder "$temp_dir" "$temp_dir" -o tmp.dmg -hdiutil convert -format UDZO -imagekey zlib-level=9 tmp.dmg -o "$output_file" +create-dmg --volname "$name" --background ../dist/macos/dmg_background.png --app-drop-link 450 218 --icon $bundle_dir 150 218 --window-size 600 450 $output_file $bundle_dir diff --git a/dist/macos/dmg_background.png b/dist/macos/dmg_background.png new file mode 100644 index 0000000000000000000000000000000000000000..eb6c3907febefb46ac17c51a77bb91f8b256b7e5 GIT binary patch literal 3263 zcmd5<+jtQ~{MLx=`@3$bJ{a_K#)%>L1)WGxs~^ zp5O2M&iT$vCPk4EyPe4IkRb?i3JaA)K@dp}L3UP{1S0J&h!=Qmz=P#@G`1hlRv1u7 zl!~RGNSIcUhDM=^)SQfKr~raic&cS`TrSuTW}G97#db z)H)$;@?s|qQKt%NaXwO(R3C(@)S(9qX!L;yneu=}$xEdL1|R|x9}s9!T!EOh={h6d zB&03y^1+!1Gik^|3a$~-UW<}TBatA?fFeE&AG(so_C~lo2HS`2?Z^Hj!eOz!m@F?Q z+l$WT@L4=Q+Xs2`&_Fdq>VAHdB;-vk;0b9e9M|)i%?|Kb9A`EMAsQT7a1g|QE5=?aW$qx2u4K;mWc~#K^Meei0>=z83`<{} zVx$VgF{298BSAsPHmO3X))D^p1%On_57QZOg-(fvNrW^&!BDGH`N1I)mY5v^#>3^X z*}-07mMBE*#q#!Hvweg7f_xUS5=@z?MRoWhHuV>*Xh|%w3tBy>EI|$GEHpL5fN7D1 zp84vfwQ!f@dxK3~T8rP3SSAp|ByRRsH@z4F>q8vh?k#ZMZa%65>uvyhJra7s4uV#5 z!XzS@Y4E3iYQjC$ZuuiBJkbKvLL+Y%IA(nNTA~9$csWe|8 zm|2~0-8}Os`gC2^i@8IqpzxLn3WQjeslile*_s%JmZjxWNWZyVs%#pk>{8OpyZ_vA z?%dt{e2Tbebwj7;5yTQ1?ohrHi?A4AF&r#w+H94l&8H-sv7=hDTJ>MaWkb2f?5+E{ zVjV{|KJVM+z4LHCa$e302zV89&eWeXFATsE9t%^k8%Ufeh^Hz zU?Tw0Xy*OyMqJ84gTb}rsVT8yd#Scpor-MXXA2G>(Qpp3QNns9bqM$ zZ=1DsCerPxmQRkbY!3T2P@T3OB>bhg^u_iZ7-5LEo;a66EH86H&+0nlmgiMP z?GIXkAZy&Mk7ghBH22wrzD85;T+cW|JH3{ucgIOF_q0{xoQDnH8H-#`zdgNE1y~xs z{NmyD(a}-g$MdHj6uWn|2|nFJr0JN%l+xa&Q9A^{JTN62tNGv^nngt z+so`FX@fS7iVonX`UP*WHY^pzC~PvDfA^_T{-X&$HCe38N0NC~TP?~Zfwc$MOxR7Cy^2pJg?A1|p9-!MCQtg0_!UA^p) z76W8`vx9T=@HJQ2+Vr1lf9T1Q=}$R7t05!_U1C=^oISC@N?D=N)$i`A2f^Hy0?ovp z`ZRu6FJIW@j$zZF-SABPStNvE!N%NCTM$HkeQ!9vyFAy^r z41~Y=yBC;)o_!qD_9W zqobGncyf}E;O1g|xS<#{d+WjU@NhD=bz`j=vD~~t9xEN7W#$weTw`{2c4os_Nuzr& z5c1-Othp&6Yw~P1TUl8d&moo&5`W@S;=Rb@cauLy&TOtd?zkZ7PZmvWecs11Fs$m9 zwYgKz*Z=&g_O-%U0}NA}I}0lE0*{B0!1tRTq`>R+0f-`Are>i)%hss&(6Y2$@Fvo4 fKebndoet}vsfczg#eI*I_)8HM93g2GC!7BZ^ON2L literal 0 HcmV?d00001