diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index 2fddd4554..bfbb2fa6c 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -3,9 +3,7 @@ mkdir rssguard-build && cd rssguard-build qmake .. make -make install -macdeployqt rssguard.app -dmg -mv rssguard.dmg rssguard-osx.dmg +make dmg ls -lha @@ -14,7 +12,10 @@ otool -L rssguard.app/Contents/MacOS/rssguard git config --global user.email "rotter.martinos@gmail.com" git config --global user.name "martinrotter" git clone -q --depth=1 https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.wiki.git ./build-wiki -curl --upload-file ./rssguard-osx.dmg https://transfer.sh/rssguard-osx.dmg --silent >> ./build-wiki/Mac-OS-X-development-builds.md + +dmgname=*-osx.dmg + +curl --upload-file ./$dmgname https://transfer.sh/$dmgname --silent >> ./build-wiki/Mac-OS-X-development-builds.md echo >> ./build-wiki/Mac-OS-X-development-builds.md cat ./build-wiki/Mac-OS-X-development-builds.md diff --git a/rssguard.pro b/rssguard.pro index 9b16ef61e..40595157a 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -596,6 +596,17 @@ win32 { QMAKE_EXTRA_TARGETS += windows_all } +# Create "make dmg" target on Mac OS X. +mac { + dmg.target = dmg + dmg.depends = install + dmg.commands = \ + macdeployqt rssguard.app -dmg && \ + mv rssguard.dmg $$TARGET-$$APP_VERSION-$$APP_REVISION-osx.dmg + + QMAKE_EXTRA_TARGETS += dmg +} + # Install all files on Windows. win32 { target.path = $$PREFIX