[dia: 80/105] #19 review: Use vcs_tag instead of get-git-sha.sh.



commit f4da09b0b202893ccb4c0635e04de84b28359fd4
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Fri Jan 18 19:01:23 2019 +0000

    #19 review: Use vcs_tag instead of get-git-sha.sh.
    
      - Note: we'll need to use semantic versioning to
        tag releases from now on.

 meson-helpers/get-git-sha.sh | 12 ------------
 meson.build                  |  9 ++++-----
 2 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/meson.build b/meson.build
index 535b657a..8e25c058 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,6 @@
 project('dia',
         ['c', 'cpp'],
-        version : '0.97.3+git' +
-            run_command(find_program('meson-helpers/get-git-sha.sh')).stdout().strip(),
+        version : '0.97.3',  # This is the base version, git suffix gets added to config.h.
         meson_version : '>= 0.49',
         default_options : []
 )
@@ -51,7 +50,7 @@ dialibdir = join_paths(get_option('prefix'),
                        meson.project_name())
 
 # Specify a header configuration file
-conf.set_quoted('VERSION', meson.project_version())
+conf.set_quoted('VERSION', '@VCS_TAG@')
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('PREFIX', get_option('prefix'))
 conf.set_quoted('PKGDATADIR', pkgdatadir)
@@ -68,8 +67,8 @@ foreach f : ['select', 'strcspn', 'strdup', 'strtol']
 endforeach
 
 configuration_inc = include_directories('.')
-configure_file(output : 'config.h',
-               configuration : conf)
+config_h_in = configure_file(output : 'config.h.in', configuration : conf)
+vcs_tag(input: config_h_in, output: 'config.h')
 
 # TODO: I don't think this should be defined.
 # To fix we should remove #ifdef HAVE_CONFIG_H checks from all source files.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]