Fix version number for Meson build

diff --git a/meson/version/meson.build b/meson/version/meson.build
index 5fdf56938bf4075b2c829ddbe53b1f9163c6d9ac..621272ce4ef6581acbec37c4025bc894cae36736 100644 (file)
--- a/meson/version/meson.build
+++ b/meson/version/meson.build
@@ -1,4 +1,2 @@
-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)
-product_version = gen_version_prog_res.stdout().strip()
+product_version = meson.project_version()
 conf.set_quoted('VERSION', product_version, description: 'Version')

diff --git a/pdns/recursordist/meson-dist-script b/pdns/recursordist/meson-dist-script.sh
similarity index 100%
rename from pdns/recursordist/meson-dist-script
rename to pdns/recursordist/meson-dist-script.sh

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 3c9976c87b45658aa7ffda6ee5baec20b79f8bcf..c9ddfe2750cbe2d7245e3c4c4f61c62a9d7a2637 100644 (file)
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -1,7 +1,7 @@
 project(
   'pdns-recursor',
   ['c', 'cpp'],
-  version: run_command('builder-support' / 'gen-version', check: true).stdout().strip(),
+  version: run_command('version.sh', 'get-vcs', check: true).stdout().strip(),
   license: 'GPLv2',
   license_files: 'NOTICE',
   meson_version: '>= 1.2.1',
@@ -11,7 +11,11 @@ project(
     'cpp_std=c++17',
   ],
 )
-meson.add_dist_script('meson-dist-script')
+meson.add_dist_script('meson-dist-script.sh')
+
+# When runniog meson dist, the command below produces multiple lines on stderr:
+# Unable to evaluate subdir([]) in AstInterpreter --> Skipping
+meson.add_dist_script('version.sh', 'set-dist', meson.project_version())
 
 add_project_arguments('-DRECURSOR', language: 'cpp')
 

diff --git a/pdns/recursordist/version.sh b/pdns/recursordist/version.sh
new file mode 100755 (executable)
index 0000000..320e6d0
--- /dev/null
+++ b/pdns/recursordist/version.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "get-vcs" ]; then
+  builder-support/gen-version
+elif [ "$1" = "set-dist" ]; then
+  $MESONREWRITE -V --sourcedir="$MESON_PROJECT_DIST_ROOT" kwargs set project / version "$2"
+else
+  exit 1
+fi