[#3732] Meson: Fix hardcoded tarball in version in some places

diff --git a/meson.build b/meson.build
index f66a543e53e6e3dfbed4bc0f7812699a4d5677f2..ee3edb85aa0a8174e80648a3e4089ee938b61264 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -548,7 +548,7 @@ kea_pkg_version_in_configure = run_command(
     check: true,
 ).stdout().strip()
 if kea_pkg_type_in_configure != '' and kea_pkg_version_in_configure != ''
-    extended_version = f'@kea_pkg_version_in_configure@ @kea_pkg_type_in_configure@'
+    SOURCE_OF_INSTALLATION = f'@kea_pkg_version_in_configure@ @kea_pkg_type_in_configure@'
 else
     if fs.is_dir('.git') and git.found()
         result = run_command(
@@ -560,13 +560,16 @@ else
             check: false,
         )
         if result.returncode() == 0
-            extended_version = 'git ' + result.stdout().strip()
+            SOURCE_OF_INSTALLATION = 'git ' + result.stdout().strip()
         endif
     else
-        extended_version = 'tarball'
+        SOURCE_OF_INSTALLATION = 'tarball'
     endif
 endif
-conf_data.set('EXTENDED_VERSION', f'"@PROJECT_VERSION@ (@extended_version@)"')
+conf_data.set(
+    'EXTENDED_VERSION',
+    f'"@PROJECT_VERSION@ (@SOURCE_OF_INSTALLATION@)"',
+)
 
 if PROJECT_VERSION.split('.')[1].to_int() % 2 == 0
     package_version_type = 'stable'
@@ -650,7 +653,10 @@ endif
 premium = fs.is_dir('premium')
 if premium
     conf_data.set('PREMIUM', 'yes')
-    conf_data.set('PREMIUM_EXTENDED_VERSION', f'"yes (@extended_version@)"')
+    conf_data.set(
+        'PREMIUM_EXTENDED_VERSION',
+        f'"yes (@SOURCE_OF_INSTALLATION@)"',
+    )
 else
     conf_data.set('PREMIUM', 'no')
     conf_data.set('PREMIUM_EXTENDED_VERSION', '"no"')
@@ -675,7 +681,7 @@ report_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 report_conf_data.set('PACKAGE_VERSION_TYPE', package_version_type)
 report_conf_data.set(
     'EXTENDED_VERSION',
-    f'@PROJECT_VERSION@ (@extended_version@)',
+    f'@PROJECT_VERSION@ (@SOURCE_OF_INSTALLATION@)',
 )
 report_conf_data.set('OS_TYPE', OS_TYPE)
 report_conf_data.set('PREFIX', PREFIX)

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 73f551ce36fa2f281b914a8a603872b74cab9882..c08b48209b2119e938b8860fcfa2d5fdc489f721 100755 (executable)
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -25,7 +25,7 @@
 # used.
 set -eu
 
-# Shell ${variables} derived from autoconf @variables@. Some depend on others, so mind the order.
+# Shell variables derived from meson variables. Some depend on others, so mind the order.
 prefix="@prefix@"
 export prefix
 exec_prefix="@exec_prefix@"

diff --git a/src/bin/admin/meson.build b/src/bin/admin/meson.build
index 0c6e0bded942aad16ce39b0ee6f732cd83d5e385..300c462d079384f8e65a594ee890b5c9bf5efe9a 100644 (file)
--- a/src/bin/admin/meson.build
+++ b/src/bin/admin/meson.build
@@ -5,7 +5,10 @@ kea_admin_conf_data.set('datarootdir', f'${prefix}/@DATADIR@')
 kea_admin_conf_data.set('PACKAGE', 'kea')
 kea_admin_conf_data.set('PACKAGE_NAME', 'kea')
 kea_admin_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
-kea_admin_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
+kea_admin_conf_data.set(
+    'EXTENDED_VERSION',
+    PROJECT_VERSION + f' (@SOURCE_OF_INSTALLATION@)',
+)
 kea_admin_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
 kea_admin_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR)
 kea_admin_conf_data.set('sbindir', f'${prefix}/@SBINDIR@')

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index 56bd805ed0bc855fd6f8ef1555b1ad7fde2a2bf9..9012825977a825cd3ecb5fb95ec922681b6c0532 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -9,7 +9,10 @@ if NETCONF_DEP.found()
 else
     keactrl_conf_data.set('HAVE_NETCONF', 'no')
 endif
-keactrl_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
+keactrl_conf_data.set(
+    'EXTENDED_VERSION',
+    PROJECT_VERSION + f' (@SOURCE_OF_INSTALLATION@)',
+)
 keactrl_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 keactrl_conf_data.set('runstatedir', '${prefix}/' + LOCALSTATEDIR + '/run')
 keactrl_conf_data.set('localstatedir', '${prefix}/' + LOCALSTATEDIR)

diff --git a/src/bin/shell/meson.build b/src/bin/shell/meson.build
index e2f738f1acd6008e752958f1f7150a315788e84d..273293d85006793aefada84ead2c58b978f6d09d 100644 (file)
--- a/src/bin/shell/meson.build
+++ b/src/bin/shell/meson.build
@@ -1,7 +1,10 @@
 kea_shell_conf_data = configuration_data()
 kea_shell_conf_data.set('PYTHON', PYTHON.full_path())
 kea_shell_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
-kea_shell_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
+kea_shell_conf_data.set(
+    'EXTENDED_VERSION',
+    PROJECT_VERSION + f' (@SOURCE_OF_INSTALLATION@)',
+)
 kea_shell_conf_data.set('PKGPYTHONDIR', PKGPYTHONDIR)
 
 configure_file(