From 623379c11ac8e577c5b1c734fd7077a84bcc8ebf Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 9 Oct 2017 12:14:19 +0200 Subject: [PATCH] move hdutil to make target. --- resources/scripts/.travis-install-osx.sh | 4 ++-- rssguard.pro | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index 99661285e..f8e2f5b7c 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -10,9 +10,9 @@ rm -rfv "RSS Guard.app/Contents/Frameworks" ls "RSS Guard.app/Contents" make zip +make dmg -hdiutil create -fs HFS+ -srcfolder "./RSS Guard.app/" -volname "RSS Guard" rssguard.dmg - +#hdiutil create -fs HFS+ -srcfolder "./RSS Guard.app/" -volname "RSS Guard" rssguard.dmg #make dmg ls -lha diff --git a/rssguard.pro b/rssguard.pro index 1acb4d500..cfa98e2f8 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -662,7 +662,7 @@ mac { zip.commands = 7za a -tzip "$$TARGET-$$APP_VERSION-$$APP_REVISION-mac.zip" $$shell_quote($$shell_path($$PREFIX)) dmg.target = dmg - dmg.commands = macdeployqt $$shell_quote($$shell_path($$PREFIX)) -executable=$$shell_quote($$shell_path($$PREFIX/Contents/MacOS/$$TARGET)) -dmg + dmg.commands = hdiutil create -fs HFS+ -srcfolder $$shell_quote($$shell_path($$PREFIX)) -volname "$$APP_NAME" $$TARGET.dmg QMAKE_EXTRA_TARGETS += seven_zip zip dmg }