From: Oto Šťáva <oto.stava@nic.cz>
Date: Fri, 26 Jul 2024 13:09:45 +0000 (+0200)
Subject: meson_options: re-add 'manager' but deprecate it
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmanager-option-deprecated;p=thirdparty%2Fknot-resolver.git

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.
---

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',