[console/wip/cdavis/gnome-version-scheme: 2/2] build: Rework development version string

[Christopher Davis <christopherdavis src gnome org>]

commit 5e893240563076c19f77647672375a98b31e8ac6
Author: Christopher Davis <christopherdavis gnome org>
Date:   Mon Dec 20 17:37:41 2021 -0800

    build: Rework development version string
    
    Instead of the raw VCS_TAG, use the project version
    with the latest commit appended. This is what most
    applications do.

 meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 216e45e..4577a4c 100644
--- a/meson.build
+++ b/meson.build
@@ -26,11 +26,13 @@ if get_option('devel')
   app_path = '/org/gnome/Console/Devel/'
   bin_name = 'kgx-devel'
   log_domain = 'KgxDevel'
+  package_version = meson.project_version() + '-@0@'.format(run_command('git', 'rev-parse', '--short', 
'HEAD').stdout().strip())
 else
   app_id = 'org.gnome.Console'
   app_path = '/org/gnome/Console/'
   bin_name = 'kgx'
   log_domain = 'Kgx'
+  package_version = meson.project_version()
 endif
 
 prefix = get_option('prefix')
@@ -41,7 +43,7 @@ pkglibdir = prefix / libdir / bin_name
 pkgdatadir = datadir / bin_name
 
 conf = configuration_data()
-conf.set_quoted('PACKAGE_VERSION', '@VCS_TAG@')
+conf.set_quoted('PACKAGE_VERSION', package_version)
 conf.set_quoted('GETTEXT_PACKAGE', bin_name)
 conf.set_quoted('KGX_APPLICATION_ID', app_id)
 conf.set('KGX_APPLICATION_ID_RAW', app_id)