[libgweather/benzea/40.alpha.1: 1/2] meson: Set GWEATHER_MICRO_VERSION correctly




commit 0892f113275b6247dcdfe1c6bd1b75190a72c6a5
Author: Benjamin Berg <bberg redhat com>
Date:   Fri Jan 15 13:13:39 2021 +0100

    meson: Set GWEATHER_MICRO_VERSION correctly
    
    If we do a fixup release on top of e.g. an alpha version, then the micro
    version is non-zero. Just add a 0 at the end of the version tuple, so
    that there is always a 3rd entry.

 libgweather/meson.build | 2 +-
 meson.build             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/libgweather/meson.build b/libgweather/meson.build
index 6a055a49..26f067e6 100644
--- a/libgweather/meson.build
+++ b/libgweather/meson.build
@@ -18,7 +18,7 @@ endif
 versionconf = configuration_data()
 versionconf.set('GWEATHER_MAJOR_VERSION', libgweather_version[0])
 versionconf.set('GWEATHER_MINOR_VERSION', libgweather_version[1])
-versionconf.set('GWEATHER_MICRO_VERSION', 0)
+versionconf.set('GWEATHER_MICRO_VERSION', libgweather_version[2])
 versionconf.set_quoted('GWEATHER_VERSION', meson.project_version())
 configure_file(
   input: 'gweather-version.h.in',
diff --git a/meson.build b/meson.build
index bc653961..e4c9c09b 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,8 @@ project('libgweather', 'c',
   meson_version: '>= 0.50.0',
 )
 
-libgweather_version = meson.project_version().split('.')
+# Add another 0, so that we can release without a suffix
+libgweather_version = meson.project_version().split('.') + [0]
 
 # We use libtool-version numbers because it's easier to understand.
 # Before making a release, the libgweather_so_*


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