FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix paths for resources in install step

Browse Source
This commit is contained in:
Martin Rotter 2019-06-11 12:42:53 +02:00
parent f12c395e80
commit 4a8f682a59
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pri/install.pri
View File

@ -175,21 +175,20 @@ win32 {
lib.path = $$PREFIX lib.path = $$PREFIX
lib.CONFIG = no_check_exist lib.CONFIG = no_check_exist
qt_dlls_root.files = ../../resources/binaries/windows/qt5-msvc2017/*.*
qt_dlls_root.files = resources/binaries/windows/qt5-msvc2017/*.*
qt_dlls_root.path = $$quote($$PREFIX/) qt_dlls_root.path = $$quote($$PREFIX/)
qt_dlls_plugins.files = resources/binaries/windows/qt5-msvc2017/* qt_dlls_plugins.files = ../../resources/binaries/windows/qt5-msvc2017/*
qt_dlls_plugins.path = $$quote($$PREFIX/) qt_dlls_plugins.path = $$quote($$PREFIX/)
INSTALLS += target lib qt_dlls_root qt_dlls_plugins INSTALLS += target lib qt_dlls_root qt_dlls_plugins
equals(USE_WEBENGINE, true) { equals(USE_WEBENGINE, true) {
# Copy extra resource files for QtWebEngine. # Copy extra resource files for QtWebEngine.
qtwebengine_dlls.files = resources/binaries/windows/qt5-msvc2017-webengine/* qtwebengine_dlls.files = ../../resources/binaries/windows/qt5-msvc2017-webengine/*
qtwebengine_dlls.path = $$quote($$PREFIX/) qtwebengine_dlls.path = $$quote($$PREFIX/)
qtwebengine.files = resources/binaries/windows/qt5-msvc2017-webengine/*.* qtwebengine.files = ../../resources/binaries/windows/qt5-msvc2017-webengine/*.*
qtwebengine.path = $$quote($$PREFIX/) qtwebengine.path = $$quote($$PREFIX/)
INSTALLS += qtwebengine_dlls qtwebengine INSTALLS += qtwebengine_dlls qtwebengine
@ -202,17 +201,17 @@ win32 {
unix:!mac:!android { unix:!mac:!android {
target.path = $$PREFIX/bin target.path = $$PREFIX/bin
desktop_file.files = resources/desktop/$${APP_REVERSE_NAME}.desktop desktop_file.files = ../../resources/desktop/$${APP_REVERSE_NAME}.desktop
desktop_file.path = $$quote($$PREFIX/share/applications/) desktop_file.path = $$quote($$PREFIX/share/applications/)
appdata.files = resources/desktop/$${APP_REVERSE_NAME}.appdata.xml appdata.files = ../../resources/desktop/$${APP_REVERSE_NAME}.appdata.xml
appdata.path = $$quote($$PREFIX/share/metainfo/) appdata.path = $$quote($$PREFIX/share/metainfo/)
lib.files = $$OUT_PWD/../librssguard/librssguard.so lib.files = $$OUT_PWD/../librssguard/librssguard.so
lib.path = $$quote($$PREFIX/lib/) lib.path = $$quote($$PREFIX/lib/)
lib.CONFIG = no_check_exist lib.CONFIG = no_check_exist
desktop_icon.files = resources/graphics/$${TARGET}.png desktop_icon.files = ../../resources/graphics/$${TARGET}.png
desktop_icon.path = $$quote($$PREFIX/share/icons/hicolor/512x512/apps/) desktop_icon.path = $$quote($$PREFIX/share/icons/hicolor/512x512/apps/)
INSTALLS += target lib desktop_file desktop_icon appdata INSTALLS += target lib desktop_file desktop_icon appdata
@ -223,7 +222,7 @@ unix:!mac:!android {
mac { mac {
IDENTIFIER = $$APP_REVERSE_NAME IDENTIFIER = $$APP_REVERSE_NAME
CONFIG -= app_bundle CONFIG -= app_bundle
ICON = resources/macosx/$${TARGET}.icns ICON = ../../resources/macosx/$${TARGET}.icns
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
LIBS += -framework AppKit LIBS += -framework AppKit
@ -236,11 +235,11 @@ mac {
lib.CONFIG = no_check_exist lib.CONFIG = no_check_exist
# Install app icon. # Install app icon.
icns_icon.files = resources/macosx/$${TARGET}.icns icns_icon.files = ../../resources/macosx/$${TARGET}.icns
icns_icon.path = $$quote($$PREFIX/Contents/Resources/) icns_icon.path = $$quote($$PREFIX/Contents/Resources/)
# Install Info.plist. # Install Info.plist.
info_plist.files = resources/macosx/Info.plist.in info_plist.files = ../../resources/macosx/Info.plist.in
info_plist.path = $$quote($$PREFIX/Contents/) info_plist.path = $$quote($$PREFIX/Contents/)
# Process the just installed Info.plist. # Process the just installed Info.plist.

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="3.5.9" date="2019-06-10"/> <release version="3.5.9" date="2019-06-11"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>