Browse Source
Rename freedesktop and metainfo files to reverse DNS schema
Based on the suggestion made by Mart Raudsepp.
"Regular installs should have reverse DNS notation desktop and
metainfo files as well. This becomes important if we ever make use
of things like dbus service activation further down the line. And
renaming it then will break peoples app shortcuts and other things."
Signed-off-by: Leon Marz <main@lmarz.org>
Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
Helped-by: Mart Raudsepp <leio@gentoo.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/642
pull/647/head
lmarz
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
8 additions and
9 deletions
help/CMakeLists.txt
help/org.tenacityaudio.Tenacity.metainfo.xml
packaging/flatpak/org.tenacity.Tenacity.json
src/CMakeLists.txt
src/org.tenacityaudio.Tenacity.desktop.in
src/org.tenacityaudio.Tenacity.xml
@ -51,8 +51,8 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if ( NOT WIN32 )
install ( DIRECTORY "${dst}" OPTIONAL
D E S T I N A T I O N " $ { _ D A T A D I R } / t e n a c i t y / h e l p " )
install ( FILES "${_SRCDIR}/tenacity.metainfo.xml"
install ( FILES "${_SRCDIR}/org. tenacityaudio.T enacity.metainfo.xml"
D E S T I N A T I O N " $ { _ D A T A D I R } / m e t a i n f o " )
endif ( )
endif ( )
@ -64,7 +64,7 @@ cmake_dependent_option(BUILD_MANPAGE "Build manpage" ON "NOT SCDOC_CMD STREQUAL
if ( BUILD_MANPAGE )
add_custom_command ( COMMENT "Generating manpage"
C O M M A N D $ { S C D O C _ C M D } < " $ { _ S R C D I R } / t e n a c i t y . 1 . s c d " > " $ { C M A K E _ B I N A R Y _ D I R } / h e l p / t e n a c i t y . 1 "
C O M M A N D $ { S C D O C _ C M D } < " $ { _ S R C D I R } / t e n a c i t y . 1 . s c d " > " $ { C M A K E _ B I N A R Y _ D I R } / h e l p / t e n a c i t y . 1 "
D E P E N D S " $ { _ S R C D I R } / t e n a c i t y . 1 . s c d "
O U T P U T " $ { C M A K E _ B I N A R Y _ D I R } / h e l p / t e n a c i t y . 1 " )
@ -6,7 +6,6 @@
"command" : "tenacity" ,
"rename-desktop-file" : "tenacity.desktop" ,
"rename-icon" : "tenacity" ,
"rename-appdata-file" : "tenacity.metainfo.xml" ,
"finish-args" : [
"--share=ipc" ,
"--socket=x11" ,
@ -189,7 +188,7 @@
"-DWX_CONFIG=/app/bin/wx-config"
] ,
"post-install" : [
"install -Dm644 ../help/tenacity.metainfo.xml -t /app/share/metainfo" ,
"install -Dm644 ../help/org. tenacityaudio.T enacity.metainfo.xml -t /app/share/metainfo" ,
"install -d /app/extensions/Plugins"
] ,
"cleanup" : [
@ -209,7 +208,7 @@
{
"type" : "shell" ,
"commands" : [
"sed -e '43i <release version=\"master\" date=\"2021-08-12\"/>' -i help/tenacity.metainfo.xml"
"sed -e '43i <release version=\"master\" date=\"2021-08-12\"/>' -i help/org. tenacityaudio.T enacity.metainfo.xml"
]
}
]
@ -1263,7 +1263,7 @@ else()
endif ( )
# C r e a t e t h e d e s k t o p f i l e
configure_file ( tenacity.desktop.in ${ _INTDIR } /tenacity.desktop )
configure_file ( org. tenacityaudio.T enacity.desktop.in ${ _INTDIR } /org. tenacityaudio.T enacity.desktop )
# C o p y t h e r e q u i r e d w x W i d g e t s l i b s i n t o t h e b u n d l e
add_custom_command (
@ -1369,7 +1369,7 @@ else()
P A T T E R N " * . s o * "
)
install (
F I L E S " $ { _ I N T D I R } / t e n a c i t y . d e s k t o p "
F I L E S " $ { _ I N T D I R } / o r g . t e n a c i t y a u d i o . T e n a c i t y . d e s k t o p "
D E S T I N A T I O N " $ { _ D A T A D I R } / a p p l i c a t i o n s "
)
install (
@ -1377,7 +1377,7 @@ else()
D E S T I N A T I O N " $ { _ D A T A D I R } / d o c / $ { A U D A C I T Y _ N A M E } "
)
install (
F I L E S " $ { _ S R C D I R } / t e n a c i t y . x m l "
F I L E S " $ { _ S R C D I R } / o r g . t e n a c i t y a u d i o . T e n a c i t y . x m l "
D E S T I N A T I O N " $ { _ D A T A D I R } / m i m e / p a c k a g e s "
)
install (