From 92b3c2dcff3e85ad3d455f6ab845d9a97d3b525b Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 7 Dec 2020 12:22:15 +0200 Subject: Rewrite meson build scripts into cmakelists --- linux/CMakeLists.txt | 8 ++++++++ linux/meson.build | 18 ------------------ linux/poi.desktop | 21 +++++++++++++++++++++ linux/poi.desktop.in | 21 --------------------- linux/poi.fish | 11 ----------- linux/poi_firejail.desktop.in | 21 --------------------- linux/poi_picksession.desktop.in | 13 ------------- 7 files changed, 29 insertions(+), 84 deletions(-) create mode 100644 linux/CMakeLists.txt delete mode 100644 linux/meson.build create mode 100644 linux/poi.desktop delete mode 100644 linux/poi.desktop.in delete mode 100644 linux/poi.fish delete mode 100644 linux/poi_firejail.desktop.in delete mode 100644 linux/poi_picksession.desktop.in (limited to 'linux') diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt new file mode 100644 index 0000000..f9937ff --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,8 @@ +find_program(XDG_VALIDATE desktop-file-validate) + +add_test(NAME verify_poi.desktop COMMAND ${XDG_VALIDATE} poi.desktop + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + +install(FILES firejail/poi.profile DESTINATION ${CMAKE_INSTALL_LIBDIR}/smolbote) +install(FILES ${CMAKE_SOURCE_DIR}/data/poi.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps) +install(FILES poi.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) diff --git a/linux/meson.build b/linux/meson.build deleted file mode 100644 index 87154f9..0000000 --- a/linux/meson.build +++ /dev/null @@ -1,18 +0,0 @@ -# application icon -install_data('../data/poi.svg', install_dir: get_option('datadir') / 'icons/hicolor/scalable/apps') - -# firejail profile -install_data('firejail/poi.profile', install_dir: get_option('libdir') / 'smolbote') - -# .desktop files -conf = configuration_data({ - 'exec_poi': get_option('prefix')/get_option('bindir')/get_option('poi'), - 'firejail': get_option('firejail'), - 'firejail_profile': get_option('prefix')/get_option('libdir')/'smolbote/poi.profile' -}) -desktop_files = ['poi.desktop', 'poi_firejail.desktop', 'poi_picksession.desktop'] -desktop_dir = get_option('datadir')/'applications' -foreach f : desktop_files - configure_file(input: f + '.in', output: f, configuration: conf, install_dir: desktop_dir) -endforeach - diff --git a/linux/poi.desktop b/linux/poi.desktop new file mode 100644 index 0000000..56c3217 --- /dev/null +++ b/linux/poi.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +# (required) Application, Link or Directory +Type=Application +# The version of the desktop entry specification to which this file complies +Version=1.0 + +# (required) +Name=smolbote +GenericName=Web Browser +Comment=yet another no-frills browser +Exec=poi %u +Icon=poi +Terminal=false +MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +Categories=Network;WebBrowser; +Keywords=web;browser;internet; +Actions=pickSession + +[Desktop Action pickSession] +Name=Pick Session +Exec=poi session --pick diff --git a/linux/poi.desktop.in b/linux/poi.desktop.in deleted file mode 100644 index a31a84c..0000000 --- a/linux/poi.desktop.in +++ /dev/null @@ -1,21 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=smolbote -GenericName=Web Browser -Comment=yet another no-frills browser -Exec=@exec_poi@ %u -Icon=poi -Terminal=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; -Categories=Network;WebBrowser; -Keywords=web;browser;internet; -Actions=pickSession;configure - -[Desktop Action pickSession] -Name=Pick Session -Exec=@exec_poi@ --pick-session - -[Desktop Action configure] -Name=Configure smolbote -Exec=@exec_poi@ configure diff --git a/linux/poi.fish b/linux/poi.fish deleted file mode 100644 index d0b3e21..0000000 --- a/linux/poi.fish +++ /dev/null @@ -1,11 +0,0 @@ -# -c short option -# -l long option -# -a accepts option "option1 option2" - -complete -c poi -s h -l help --description 'Display command-line options list.' -complete -c poi -s v -l version --description 'Display version information.' -complete -c poi -l build --description 'Display build commit.' -complete -c poi -s c -l config -r --description 'Set configuration file.' -complete -c poi -l no-remote --description 'Do not accept or send remote commands.' -complete -c poi -s s -l session -r --description 'Open the selected session' -complete -c poi -l pick-session --description 'Show all available sessions and select which one to open.' diff --git a/linux/poi_firejail.desktop.in b/linux/poi_firejail.desktop.in deleted file mode 100644 index 31e5b64..0000000 --- a/linux/poi_firejail.desktop.in +++ /dev/null @@ -1,21 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=smolbote (in firejail) -GenericName=Web Browser -Comment=yet another no-frills browser -Exec=@firejail@ --profile=@firejail_profile@ @exec_poi@ --mainwindow.title="[[smolbote]]" %u -Icon=poi -Terminal=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; -Categories=Network;WebBrowser; -Keywords=web;browser;internet; -Actions=pickSession;configure - -[Desktop Action pickSession] -Name=Pick Session -Exec=@firejail@ --profile=@firejail_profile@ @exec_poi@ --pick-session - -[Desktop Action configure] -Name=Configure smolbote -Exec=@firejail@ --profile=@firejail_profile@ @exec_poi@ configure diff --git a/linux/poi_picksession.desktop.in b/linux/poi_picksession.desktop.in deleted file mode 100644 index 7cfb7a9..0000000 --- a/linux/poi_picksession.desktop.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=smolbote (Pick Session) -GenericName=Web Browser -Comment=yet another no-frills browser -Exec=@exec_poi@ --pick-session -Icon=poi -Terminal=false -Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; -Categories=Network;WebBrowser; -Keywords=web;browser;internet; - -- cgit v1.2.1