From: Scott Murray Date: Mon, 20 Dec 2021 20:03:36 +0000 (-0500) Subject: Add .desktop and icon file installation X-Git-Tag: 12.91.0^0 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=apps%2Fhvac.git;a=commitdiff_plain;h=c173b5b5fbdb9013304ad62e0dc8f8bb9a072e7d Add .desktop and icon file installation Add initial .desktop file and icon copied from the launcher source tree, and updated .pro files to install them. Also removed potentially confusing use of non-existent $$PREFIX variable. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray Change-Id: I5b6a0fee2b02e4e5132689b8d892ce5f8480cc42 --- diff --git a/app/app.pro b/app/app.pro index 7d3fb4a..8c4c5a4 100644 --- a/app/app.pro +++ b/app/app.pro @@ -19,7 +19,7 @@ RESOURCES += \ LANGUAGES = ja_JP fr_FR include(translations.pri) -target.path = $${PREFIX}/usr/bin +target.path = /usr/bin target.files += $${OUT_PWD}/$${TARGET} target.CONFIG = no_check_exist executable diff --git a/hvac.pro b/hvac.pro index 5cf7e78..e6d6e34 100644 --- a/hvac.pro +++ b/hvac.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -SUBDIRS = app +SUBDIRS = app package diff --git a/package/hvac.desktop b/package/hvac.desktop new file mode 100644 index 0000000..9d560b4 --- /dev/null +++ b/package/hvac.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=HVAC +Comment=HVAC +GenericName=HVAC +Exec=hvac +Icon=hvac +Terminal=false +Type=Application +Categories=System; +StartupNotify=true diff --git a/package/hvac.svg b/package/hvac.svg new file mode 100644 index 0000000..67918e6 --- /dev/null +++ b/package/hvac.svg @@ -0,0 +1,349 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/package/icon.svg b/package/icon.svg deleted file mode 100644 index 411d130..0000000 --- a/package/icon.svg +++ /dev/null @@ -1,489 +0,0 @@ - - - -image/svg+xmlHVAC - \ No newline at end of file diff --git a/package/package.pro b/package/package.pro index 4a4be66..7cd9cde 100644 --- a/package/package.pro +++ b/package/package.pro @@ -1,24 +1,11 @@ +TEMPLATE = aux -DISTFILES = icon.svg config.xml +icon.path = /usr/share/icons/hicolor/scalable +icon.files += $$_PRO_FILE_PWD_/hvac.svg +icon.CONFIG = no_check_exist -copy_icon.target = $$OUT_PWD/root/icon.svg -copy_icon.depends = $$_PRO_FILE_PWD_/icon.svg -copy_icon.commands = $(COPY_FILE) \"$$replace(copy_icon.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_icon.target, /, $$QMAKE_DIR_SEP)\" -QMAKE_EXTRA_TARGETS += copy_icon -PRE_TARGETDEPS += $$copy_icon.target +desktop.path = /usr/share/applications +desktop.files = $$_PRO_FILE_PWD_/hvac.desktop +desktop.CONFIG = no_check_exist -copy_config.target = $$OUT_PWD/root/config.xml -copy_config.depends = $$_PRO_FILE_PWD_/config.xml -copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_config.target, /, $$QMAKE_DIR_SEP)\" -QMAKE_EXTRA_TARGETS += copy_config -PRE_TARGETDEPS += $$copy_config.target - -WGT_TYPE = -CONFIG(debug, debug|release) { - WGT_TYPE = -debug -} - -wgt.target = package -wgt.commands = wgtpkg-pack -f -o hvac$${WGT_TYPE}.wgt root - -QMAKE_EXTRA_TARGETS += wgt +INSTALLS += desktop icon