Meson: Auth version summary

diff --git a/meson.build b/meson.build
index b7d7effc0f3241a8f215feae639c4ffa44e166a6..2e67e80adeecfc99048b0c38790f60da9bd82658 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -11,6 +11,7 @@ project(
   ],
 )
 
+# TODO Meson 0.56 introduces meson.project_source_root().
 product_source_dir = meson.current_source_dir()
 product_build_dir = meson.current_build_dir()
 summary('Source Dir', product_source_dir, section: 'Build')

diff --git a/meson/summary/meson.build b/meson/summary/meson.build
index d146dadb0df0e5844d32aa64e6319b3c5c50408b..c0d689c73b19c41961d942bf410de05817b2fa89 100644 (file)
--- a/meson/summary/meson.build
+++ b/meson/summary/meson.build
@@ -7,7 +7,8 @@ summary('C++ Compiler Command', cxx.cmd_array(), section: 'System')
 summary('Linker', cxx.get_linker_id(), section: 'System')
 
 summary('Name', meson.project_name(), section: 'PowerDNS')
-summary('Version', meson.project_version(), section: 'PowerDNS')
+summary('Version', product_version, section: 'PowerDNS')
+# summary('Version', meson.project_version(), section: 'PowerDNS')
 
 # summary('Source Root', meson.project_source_root(), section: 'PowerDNS') # TODO Meson 0.56
 # summary('Build Root', meson.project_build_root(), section: 'PowerDNS')   # TODO Meson 0.56

diff --git a/meson/version/meson.build b/meson/version/meson.build
index 745586b9a0e2f2cbea5efc7fe3d1c3b0a331cdda..69b39a7de684b325cb565744abf75f5e23b710f7 100644 (file)
--- a/meson/version/meson.build
+++ b/meson/version/meson.build
@@ -1,9 +1,7 @@
 # Generate version define
 # Inputs: conf
 
-# TODO Find a way to fix these ../.. because meson.current_source_dir() returns
-# $GIT_ROOT/meson/version. Meson 0.56 introduces meson.project_source_root().
-gen_version_prog = find_program('gen-version', dirs: meson.current_source_dir() / '..' / '..' / 'builder-support', required: true)
+gen_version_prog = find_program('gen-version', dirs: product_source_dir / 'builder-support', required: true)
 gen_version_prog_res = run_command(gen_version_prog, check: true)
-version = gen_version_prog_res.stdout().strip()
-conf.set_quoted('VERSION', version, description: 'Version')
+product_version = gen_version_prog_res.stdout().strip()
+conf.set_quoted('VERSION', product_version, description: 'Version')