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 000000000..eb6c3907f Binary files /dev/null and b/dist/macos/dmg_background.png differ