dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove create-dmg.sh script and use create-dmg directly from CMake

Browse Source
This commit is contained in:
Jonas Kvinge
2020-08-01 03:31:01 +02:00
parent 2c72302087
commit b4125fa56c
6 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -104,7 +104,6 @@ Thumbs.db
# Stuff in dist # Stuff in dist
maketarball.sh maketarball.sh
create-dmg.sh
changelog changelog
PKGBUILD PKGBUILD

2
cmake/Dmg.cmake
View File

@@ -1,6 +1,6 @@
add_custom_target(dmg add_custom_target(dmg
COMMAND /usr/local/opt/qt5/bin/macdeployqt strawberry.app COMMAND /usr/local/opt/qt5/bin/macdeployqt strawberry.app
COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app
COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/create-dmg.sh strawberry.app COMMAND create-dmg --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}.dmg strawberry.app
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )

1
debian/rules vendored
View File

@@ -5,7 +5,6 @@
override_dh_auto_clean: override_dh_auto_clean:
rm -f dist/macos/Info.plist rm -f dist/macos/Info.plist
rm -f dist/macos/create-dmg.sh
rm -f dist/unix/PKGBUILD rm -f dist/unix/PKGBUILD
rm -f dist/unix/strawberry.spec rm -f dist/unix/strawberry.spec
rm -f dist/scripts/maketarball.sh rm -f dist/scripts/maketarball.sh

1
dist/CMakeLists.txt vendored
View File

@@ -3,7 +3,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/unix/PKGBUILD.in ${CMAKE_CURRENT_SOUR
if (APPLE) if (APPLE)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/create-dmg.sh)
endif (APPLE) endif (APPLE)
if (WIN32) if (WIN32)

24
dist/macos/create-dmg.sh.in vendored
View File

@@ -1,24 +0,0 @@
#!/bin/sh
version="@STRAWBERRY_VERSION_PACKAGE@"
if [ -z "$1" ]; then
echo "Usage: $0 <bundle.app> (append)"
exit 1
fi
name=$(basename "$1" | perl -pe 's/(.*).app/\1/')
bundle_dir="$1"
temp_dir="dmg/$name"
if [ -z "$2" ]; then
output_file="$name-$version.dmg"
else
output_file="$name-$2-$version.dmg"
fi
rm -rf "$temp_dir"
rm -f "$output_file"
mkdir -p "$temp_dir"
/usr/local/bin/create-dmg --volname "$name" --background "@CMAKE_SOURCE_DIR@/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon $bundle_dir 150 218 --window-size 600 450 $output_file $bundle_dir

1
dist/scripts/maketarball.sh.in vendored
View File

@@ -38,7 +38,6 @@ tar -cJf $name-$version.tar.xz \
--exclude="$root/debian/changelog" \ --exclude="$root/debian/changelog" \
--exclude="$root/dist/scripts/maketarball.sh" \ --exclude="$root/dist/scripts/maketarball.sh" \
--exclude="$root/dist/unix/PKGBUILD" \ --exclude="$root/dist/unix/PKGBUILD" \
--exclude="$root/dist/macos/create-dmg.sh" \
--exclude="$root/dist/macos/Info.plist" \ --exclude="$root/dist/macos/Info.plist" \
--exclude="$root/dist/windows/windres.rc" \ --exclude="$root/dist/windows/windres.rc" \
--exclude="$root/src/translations/translations.pot" \ --exclude="$root/src/translations/translations.pot" \