From 071841200137244a623a6adccee1bd7ddd5bcb0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oto=20=C5=A0=C5=A5=C3=A1va?= Date: Fri, 26 Jul 2024 15:09:45 +0200 Subject: [PATCH] meson_options: re-add 'manager' but deprecate it Meson, in its infinite wisdom started erroring out when the build dir has an unknown option configured, so we need to keep this and mark it deprecated, apparently. --- manager/meson.build | 37 ------------------------------------- meson_options.txt | 13 +++++++++++++ 2 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 manager/meson.build diff --git a/manager/meson.build b/manager/meson.build deleted file mode 100644 index 476532e5b..000000000 --- a/manager/meson.build +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later - -build_manager = false - -if get_option('manager') != 'disabled' - message('--- manager dependencies ---') - - pymod = import('python') - py3 = pymod.find_installation('python3') - py3_deps = run_command(py3, 'tests/packaging/dependencies.py', 'setup.py', check: false) - - if py3.language_version().version_compare('<3.6') - error('At least Python 3.6 is required.') - elif py3_deps.returncode() != 0 - error(py3_deps.stderr().strip()) - else - message('all dependencies found') - build_manager = true - endif - - message('----------------------------') -endif - -if build_manager - - # shell completion - subdir('shell-completion') - - # installation script - meson.add_install_script('scripts/install.sh', py3.path()) - - # YAML config configuration file - install_data( - sources: 'etc/knot-resolver/config.yaml', - install_dir: etc_dir, - ) -endif \ No newline at end of file diff --git a/meson_options.txt b/meson_options.txt index 0f4048503..0d94c81bd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -125,6 +125,19 @@ option( description: 'build benchmarks', ) +option( + 'manager', + type: 'combo', + choices: [ + 'auto', + 'enabled', + 'disabled', + ], + value: 'disabled', + description: 'deprecated - do not use', + deprecated: true, +) + option( 'utils', type: 'combo', -- 2.47.2