From 23a7f3baa33265519840609dc54e950615ec39b1 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Fri, 3 Jan 2020 18:04:08 +0200 Subject: Merge some QoL improvements from staging branch - Build executable in top-level buildroot - Use meson sourceset - Pull in poi-crash and poi-update from staging - Remove extraneous scripts in tools/ - Pull in configure scripts in scripts/ --- src/meson.build | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) (limited to 'src/meson.build') diff --git a/src/meson.build b/src/meson.build index 3494112..25f94f0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,13 @@ -# poi -poi_moc = mod_qt5.preprocess( +python = import('python') +python3 = python.find_installation('python3') + +poi_settings_h = custom_target('default_config_value', + input: files('../scripts/gen-default-cfg.py', '../Kconfig', '..'/host_machine.system()/'.config', 'settings.h.in'), + output: 'settings.h', + command: [ python3, '@INPUT0@', '--kconfig=@INPUT1@', '--dotconfig=@INPUT2@', '--input=@INPUT3@', '--output=@OUTPUT@' ] +) + +poi_sourceset.add(mod_qt5.preprocess( moc_headers: ['browser.h', 'mainwindow/mainwindow.h', 'mainwindow/addressbar.h', 'mainwindow/menubar.h', 'mainwindow/widgets/completer.h', 'mainwindow/widgets/urllineedit.h', 'mainwindow/widgets/dockwidget.h', 'mainwindow/widgets/menusearch.h', 'mainwindow/widgets/navigationbar.h', 'mainwindow/widgets/searchform.h', 'session/savesessiondialog.h', 'session/sessiondialog.h', 'session/sessionform.h', @@ -9,14 +17,10 @@ poi_moc = mod_qt5.preprocess( qresources: '../data/resources.qrc', rcc_extra_arguments: ['--format-version=1'], dependencies: dep_qt5 -) +)) -poi = executable(get_option('poiName'), install: true, - cpp_args: ['-DQAPPLICATION_CLASS=QApplication'], - dependencies: [dep_qt5, dep_spdlog, dep_SingleApplication, dep_args, optional_deps, - dep_about, dep_bookmarks, dep_configuration, dep_downloads, dep_pluginloader, dep_urlfilter], - include_directories: [include], - sources: ['main.cpp', 'builtins.cpp', 'crashhandler.cpp', poi_moc, version_h, +poi_sourceset.add(files( + 'main.cpp', 'builtins.cpp', 'crashhandler.cpp', 'browser.cpp', 'util.cpp', 'util.h', @@ -43,29 +47,9 @@ poi = executable(get_option('poiName'), install: true, 'webengine/webview.cpp', 'webengine/webprofile.cpp', 'webengine/webprofilemanager.cpp', - interfaces_moc, - 'wallet/wallet.cpp', 'wallet/wallet.h'] + 'wallet/wallet.cpp', 'wallet/wallet.h' +), + interfaces_moc, version_h, poi_settings_h ) -# install .desktop file and firejail profile for systems in this array -if ['linux'].contains(host_machine.system()) - conf = configuration_data({ - 'exec_poi': get_option('prefix') / get_option('bindir') / get_option('poiName'), - 'firejail': get_option('firejail'), - 'firejail_profile': get_option('prefix') / get_option('libdir') / 'smolbote/poi.profile' - }) - - # application icon - install_data('../data/poi.svg', install_dir: get_option('datadir') / 'icons/hicolor/scalable/apps') - - # firejail profile - install_data('../linux/firejail/poi.profile', install_dir: get_option('libdir') / 'smolbote') - - # Install .desktop to $prefix/share/applications - desktop_install_dir = get_option('datadir') / 'applications' - configure_file(input: '../linux/poi.desktop.in', output: 'poi.desktop', configuration: conf, install_dir: desktop_install_dir ) - configure_file(input: '../linux/poi_firejail.desktop.in', output: 'poi_firejail.desktop', configuration: conf, install_dir: desktop_install_dir ) - configure_file(input: '../linux/poi_picksession.desktop.in', output: 'poi_picksession.desktop', configuration: conf, install_dir: desktop_install_dir ) - -endif -- cgit v1.2.1