From 01a15f113be3b1d7fe8d26f904e677a0bb72dbed Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 5 Nov 2024 01:15:30 +0100 Subject: [PATCH] meson.build: post-release version bump to 3.0.0-RC1+git. Intermediate RC versions used to be suffixed "-git" but gi-docgen doesn't like this (or to be more accurate the packaging.version module used by gi-docgen considers this an invalid version). But it allows with a '+' (it calls it the local version segment). So let's go with this new formatting. --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 1dedef8b88..27d8e665ec 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('gimp', 'c', 'cpp', - version: '3.0.0-RC1', + version: '3.0.0-RC1+git', meson_version: '>=0.61.0', default_options: [ 'cpp_std=gnu++14', @@ -33,9 +33,13 @@ gimp_app_micro_rc = gimp_app_version_arr[2].split('-') gimp_app_version_micro = gimp_app_micro_rc[0].to_int() if gimp_app_micro_rc.length() > 1 if not gimp_app_micro_rc[1].startswith('RC') - error('Version format is: .. with optional "-RC" suffix.') + error('Version format is: .. with optional "-RC" suffix and optional "+git".') + endif + if gimp_app_micro_rc[1].endswith('+git') + gimp_app_version_rc = gimp_app_micro_rc[1].substring(2, -4).to_int() + else + gimp_app_version_rc = gimp_app_micro_rc[1].substring(2).to_int() endif - gimp_app_version_rc = gimp_app_micro_rc[1].substring(2).to_int() endif # Override for Release-candidates