From 58569f0315242632e5aaa87ffd0f0eaf7092ffd5 Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Sun, 28 Mar 2021 08:01:45 +0300
Subject: [PATCH] separate major and minor numbers

---
 .bumpversion.cfg  | 14 +++++++++++---
 src/libs/config.h | 11 ++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 4eaa928..04cc8f4 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -2,13 +2,21 @@
 commit = True
 tag = True
 current_version = 3.23
-parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
+parse = (?P<major>\d+)\.(?P<minor>\d+)
 serialize = 
 	{major}.{minor}
 
 [bumpversion:file:src/libs/config.h]
-search = VERSION "{current_version}"
-replace = VERSION "{new_version}"
+parse = (?P<major>\d+)
+serialize = {major}
+search = VERSION_MAJOR {current_version}
+replace = VERSION_MAJOR {new_version}
+
+[bumpversion:file:./src/libs/config.h]
+parse = <major>\d+\.(?P<minor>\d+)
+serialize = {minor}
+search = VERSION_MINOR {current_version}
+replace = VERSION_MINOR {new_version}
 
 [bumpversion:file:python/setup.py]
 search = version="{current_version}"
diff --git a/src/libs/config.h b/src/libs/config.h
index 88fe3e9..fe7edbb 100644
--- a/src/libs/config.h
+++ b/src/libs/config.h
@@ -22,6 +22,11 @@
 
 #pragma once
 
-#ifndef VERSION
-#	define VERSION "3.23"
-#endif
+#define VERSION_MAJOR 3
+#define VERSION_MINOR 23
+
+#define MAKE_VERSION2(_major, _minor) #_major "." #_minor
+#define MAKE_VERSION1(_major, _minor) MAKE_VERSION2(_major, _minor)
+#define VERSION MAKE_VERSION1(VERSION_MAJOR, VERSION_MINOR)
+
+#define VERSION_U ((unsigned)(VERSION_MAJOR * 1000 + VERSION_MINOR))