diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index f8e2f5b7c..b45903a53 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -5,9 +5,8 @@ qmake .. make make install -rm -rfv "RSS Guard.app/Contents/Frameworks" - -ls "RSS Guard.app/Contents" +#rm -rfv "RSS Guard.app/Contents/Frameworks" +#ls "RSS Guard.app/Contents" make zip make dmg diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 2dd89d10a..c5ddf5663 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -4,7 +4,7 @@ Added: ▪ All application resources (skins, icons, ...) are now compiled into the executable file. This allows for easier deployment. ▪ "Add account" dialog is displayed when app is launched and no accounts exist so far. -▪ New plugin for Inoreader. This is supported only in full RSS Guard "web-engine" version, because of web OAuth 2.0. +▪ New plugin for Inoreader. This is supported only in full RSS Guard "web-engine" version, because of web OAuth 2.0. The new plugins is in EXPERIMENTAL phase, expect errors and report them. ▪ NextCloud plugin now allows to persistently set max number of messages to get downloaded per feed. ▪ Added support for arbitrary external tools (settings category "Web browser & e-mail & proxy") which can open URLs of selected messages. (#136) ▪ Standard account is now automatically added if RSS Guard is started with empty database. diff --git a/rssguard.pro b/rssguard.pro index 6bfef9102..b6a34b007 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -656,13 +656,16 @@ unix:!mac { mac { seven_zip.target = 7zip + seven_zip.depends = install seven_zip.commands = 7za a -t7z "$$TARGET-$$APP_VERSION-$$APP_REVISION-mac.7z" $$shell_quote($$shell_path($$PREFIX)) zip.target = zip + zip.depends = install zip.commands = 7za a -tzip "$$TARGET-$$APP_VERSION-$$APP_REVISION-mac.zip" $$shell_quote($$shell_path($$PREFIX)) dmg.target = dmg - dmg.commands = hdiutil create -fs HFS+ -srcfolder $$shell_quote($$shell_path($$PREFIX)) -volname "$$APP_NAME" $$TARGET.dmg + dmg.depends = install + dmg.commands = macdeployqt $$shell_quote($$shell_path($$PREFIX)) -dmg QMAKE_EXTRA_TARGETS += seven_zip zip dmg }