From 4b6da0cc69ad113f4e72f0ffae4e3d36476a1d4f Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 5 Apr 2017 07:27:23 +0200 Subject: [PATCH] Experimental better compilation for Mac OS. --- resources/scripts/.travis-before-install.sh | 2 + resources/scripts/.travis-install-osx.sh | 9 ++-- resources/text/CHANGELOG | 2 +- rssguard.pro | 49 ++++++++------------- 4 files changed, 28 insertions(+), 34 deletions(-) diff --git a/resources/scripts/.travis-before-install.sh b/resources/scripts/.travis-before-install.sh index 0bad9331c..621291d06 100755 --- a/resources/scripts/.travis-before-install.sh +++ b/resources/scripts/.travis-before-install.sh @@ -3,6 +3,8 @@ if test "$TRAVIS_OS_NAME" = "osx"; then # Mac OS X. brew update + brew install p7zip + brew link --force p7zip brew install qt5 brew link --force qt5 brew install curl diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index c25c25451..6afe30be6 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -3,17 +3,20 @@ mkdir rssguard-build && cd rssguard-build qmake .. make -make dmg +make install +make zip ls -lha - otool -L rssguard.app/Contents/MacOS/rssguard +cd rssguard.app +ls -lha + 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 -set -- *.dmg +set -- *.zip dmgname="$1" echo $dmgname diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 1badda172..fcb65f7d4 100755 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -2,7 +2,7 @@ ————— Added: -▪ Auto-update status of feeds is now more general and complete. ( +▪ Auto-update status of feeds is now more general and complete. (issue #91) Changed: ▪ Better ATOM parsing, respects now XML namespaces, bit better link parsing and other stuff. (issue #104) diff --git a/rssguard.pro b/rssguard.pro index 802513612..396006081 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -86,9 +86,13 @@ APP_DONATE_URL = "https://goo.gl/YFVJ0j" isEmpty(PREFIX) { message(rssguard: PREFIX variable is not set. This might indicate error.) - win32|mac { + win32 { PREFIX = $$OUT_PWD/app } + + mac { + PREFIX = $$OUT_PWD/$$APP_LOW_NAME.app + } unix:!mac { PREFIX = $$OUT_PWD/usr @@ -572,14 +576,14 @@ win32 { QMAKE_EXTRA_TARGETS += seven_zip zip } -unix:!mac { +unix|mac { seven_zip.target = 7zip seven_zip.depends = install - seven_zip.commands = 7za a -t7z $$TARGET-$$APP_VERSION-$$APP_REVISION-win32.7z $$shell_path($$PREFIX/*) + seven_zip.commands = 7za a -t7z $$TARGET-$$APP_VERSION-$$APP_REVISION-unix-mac.7z $$shell_path($$PREFIX/*) zip.target = zip zip.depends = install - zip.commands = 7za a -tzip $$TARGET-$$APP_VERSION-$$APP_REVISION-win32.zip $$shell_path($$PREFIX/*) + zip.commands = 7za a -tzip $$TARGET-$$APP_VERSION-$$APP_REVISION-unix-mac.zip $$shell_path($$PREFIX/*) QMAKE_EXTRA_TARGETS += seven_zip zip } @@ -604,17 +608,6 @@ 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 @@ -733,46 +726,42 @@ unix:!mac { } mac { - CONFIG += app_bundle QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 - QMAKE_RPATHDIR += @executable_path/../Frameworks - QMAKE_INFO_PLIST = resources/macosx/Info.plist.in ICON = resources/macosx/$${TARGET}.icns IDENTIFIER = org.$${TARGET}.RSSGuard + target.path = $$quote($$PREFIX/Contents/MacOs/) + # Install SQL initializers. misc_sql.files = resources/sql - misc_sql.path = Contents/Resources + misc_sql.path = $$quote($$PREFIX/Contents/Resources/) # Misc icons. misc_icons.files = resources/graphics/misc - misc_icons.path = Contents/Resources/icons + misc_icons.path = $$quote($$PREFIX/Contents/Resources/icons/) faenza.files = resources/graphics/Faenza - faenza.path = Contents/Resources/icons + faenza.path = $$quote($$PREFIX/Contents/Resources/icons/) # Initial feeds. misc_feeds.files = resources/initial_feeds - misc_feeds.path = Contents/Resources + misc_feeds.path = $$quote($$PREFIX/Contents/Resources/) skins.files = resources/skins - skins.path = Contents/Resources + skins.path = $$quote($$PREFIX/Contents/Resources) misc_icon.files = resources/graphics/$${TARGET}.png - misc_icon.path = Contents/Resources/icons + misc_icon.path = $$quote($$PREFIX/Contents/Resources/icons) misc_plain_icon.files = resources/graphics/$${TARGET}_plain.png - misc_plain_icon.path = Contents/Resources/icons + misc_plain_icon.path = $$quote($$PREFIX/Contents/Resources/icons/) misc_texts.files = $$TEXTS - misc_texts.path = Contents/Resources/information + misc_texts.path = $$quote($$PREFIX/Contents/Resources/information/) translations.files = $$OUT_PWD/translations - translations.path = Contents/Resources - - QMAKE_BUNDLE_DATA += misc_sql misc_icons faenza misc_feeds skins \ - misc_icon misc_plain_icon misc_texts translations + translations.path = $$quote($$PREFIX/Contents/Resources/) INSTALLS += misc_sql misc_icons faenza misc_feeds skins \ misc_icon misc_plain_icon misc_texts translations