From b2fec872deea1e4e08f02ac74df383da3cb6665a Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Wed, 24 Oct 2018 13:09:45 +0200 Subject: Add missing install items --- doc/meson.build | 12 ++++++++++++ meson.build | 1 + meson_options.txt | 3 +++ plugins/ConfigurationEditor/meson.build | 2 +- plugins/ProfileEditor/meson.build | 2 +- src/meson.build | 7 +++++++ 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 doc/meson.build diff --git a/doc/meson.build b/doc/meson.build new file mode 100644 index 0000000..0e1b49d --- /dev/null +++ b/doc/meson.build @@ -0,0 +1,12 @@ +if get_option('manpage').enabled() + asciidoctor = find_program('asciidoctor', required: true) + + custom_target('manpage', + input: 'smolbote.7.asciidoc', + output: 'smolbote.7', + command: [asciidoctor, '--backend=manpage', '--out-file=@OUTPUT@', '@INPUT@'], + build_by_default: true, + install: true, install_dir: join_paths(get_option('mandir'), 'man7') + ) + +endif diff --git a/meson.build b/meson.build index 93e5167..0993749 100644 --- a/meson.build +++ b/meson.build @@ -60,6 +60,7 @@ subdir('lib/web') subdir('3rd-party/SingleApplication') subdir('src') +subdir('doc') subdir('plugins/ConfigurationEditor') subdir('plugins/ProfileEditor') diff --git a/meson_options.txt b/meson_options.txt index 8982176..288b2d7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,9 @@ # Executable options option('poiName', description: 'Executable name', type: 'string', value: 'poi') +# Install options +option('manpage', description: 'Generate and install manpage', type: 'feature', value: 'auto') + # Feature options option('Breakpad', description: 'Enable breakpad crash reporting', type: 'feature', value: 'auto') option('Plasma', description: 'Enable KDE plasma integration', type: 'feature', value: 'auto') diff --git a/plugins/ConfigurationEditor/meson.build b/plugins/ConfigurationEditor/meson.build index d11ceac..6993531 100644 --- a/plugins/ConfigurationEditor/meson.build +++ b/plugins/ConfigurationEditor/meson.build @@ -9,5 +9,5 @@ ConfigurationEditorPlugin_lib = shared_library('ConfigurationEditorPlugin', [interfaces_moc, ConfigurationEditorPlugin_moc, 'configurationeditorplugin.cpp', 'forms/configurationdialog.cpp'], dependencies: dep_qt5, include_directories: include, - install: true, install_dir: join_paths(get_option('libexecdir'), 'smolbote/plugins') + install: true, install_dir: join_paths(get_option('libdir'), 'smolbote/plugins') ) diff --git a/plugins/ProfileEditor/meson.build b/plugins/ProfileEditor/meson.build index 2a39a2d..c1507ce 100644 --- a/plugins/ProfileEditor/meson.build +++ b/plugins/ProfileEditor/meson.build @@ -9,5 +9,5 @@ ProfileEditorPlugin_lib = shared_library('ProfileEditorPlugin', [interfaces_moc, ProfileEditorPlugin_moc, 'profileeditorplugin.cpp', 'forms/profilemanagerdialog.cpp', 'forms/profileview.cpp', 'forms/newprofiledialog.cpp', 'forms/newhttpheaderdialog.cpp'], dependencies: dep_qt5, include_directories: include, - install: true, install_dir: join_paths(get_option('libexecdir'), 'smolbote/plugins') + install: true, install_dir: join_paths(get_option('libdir'), 'smolbote/plugins') ) diff --git a/src/meson.build b/src/meson.build index e09b130..715e154 100644 --- a/src/meson.build +++ b/src/meson.build @@ -6,6 +6,7 @@ poi_moc = qt5.preprocess( 'webengine/filter.h', 'webengine/urlinterceptor.h', 'webengine/webpage.h', 'webengine/webview.h'], ui_files: ['mainwindow/mainwindow.ui', 'mainwindow/widgets/searchform.ui'], qresources: '../data/resources.qrc', + rcc_extra_arguments: ['--format-version=1'], dependencies: dep_qt5 ) @@ -44,3 +45,9 @@ poi = executable(get_option('poiName'), install: true, 'wallet/wallet.cpp', 'wallet/wallet.h'] ) +# install .desktop file and firejail profile +if ['linux', 'freebsd', 'netbsd', 'dragonflybsd'].contains(host_machine.system()) + install_data('../data/poi.svg', install_dir: join_paths(get_option('datadir'), 'icons/hicolor/scalable/apps')) + install_data('../linux/poi.desktop', install_dir: join_paths(get_option('datadir'), 'applications')) + install_data('../data/poi.profile', install_dir: join_paths(get_option('libdir'), 'smolbote')) +endif -- cgit v1.2.1