From 0edc541cb3e749cea56048da8a9c4d95ca4219b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= <lukasz.stolarczuk@intel.com>
Date: Mon, 20 Jan 2025 12:41:12 +0100
Subject: [PATCH 1/3] Order entries in libumf.def for 0.11 version

this change is purely aesthetic.
---
 src/libumf.def | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libumf.def b/src/libumf.def
index 42d7cfaf3c..090b3a86f3 100644
--- a/src/libumf.def
+++ b/src/libumf.def
@@ -31,9 +31,6 @@ EXPORTS
     umfFileMemoryProviderParamsSetPath
     umfFileMemoryProviderParamsSetProtection
     umfFileMemoryProviderParamsSetVisibility
-    umfFixedMemoryProviderOps
-    umfFixedMemoryProviderParamsCreate
-    umfFixedMemoryProviderParamsDestroy
     umfFree
     umfGetIPCHandle
     umfGetLastFailedMemoryProvider
@@ -121,4 +118,7 @@ EXPORTS
     umfScalablePoolParamsSetGranularity
     umfScalablePoolParamsSetKeepAllMemory
 ; Added in UMF_0.11
+    umfFixedMemoryProviderOps
+    umfFixedMemoryProviderParamsCreate
+    umfFixedMemoryProviderParamsDestroy
     umfLevelZeroMemoryProviderParamsSetFreePolicy

From ade44f56dc5296aa8c69b4618e752fd9fc4e59f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= <lukasz.stolarczuk@intel.com>
Date: Mon, 20 Jan 2025 18:55:30 +0100
Subject: [PATCH 2/3] Update RELEASE_STEPS with dev tags on main

---
 RELEASE_STEPS.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE_STEPS.md b/RELEASE_STEPS.md
index 09a972598b..9cac9f815b 100644
--- a/RELEASE_STEPS.md
+++ b/RELEASE_STEPS.md
@@ -49,6 +49,10 @@ Do changes for a release:
   - If stable branch for this release is required, create it:
     - `git checkout -b v$VER.x`
     - For some early versions (like `0.1.0`) we may omit creation of the branch
+- For major/minor release, when release is done, add an extra "dev" tag on the `main` branch:
+  - `git tag -a -s -m "Development version $VERSION+1" v$VERSION+1-dev`
+    - for example, when `v0.1.0` is released, the dev tag would be `v0.2.0-dev`
+  - This way, the `main` branch will introduce itself as the next version
 
 ## Publish changes
 

From eb7c46d51b580b64e0c84e05c152433c2c821aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= <lukasz.stolarczuk@intel.com>
Date: Tue, 21 Jan 2025 10:36:59 +0100
Subject: [PATCH 3/3] [CMake] Allow '-devX' tags

-devX tag may be required when e.g. a first -dev tag was "replaced"
with new patch release incoming from stable branch into main.
E.g., at this moment, the main branch is introduced as v0.10.1-...
instead of v0.11.0-dev... and this is not desired.
---
 RELEASE_STEPS.md    |  1 +
 cmake/helpers.cmake | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/RELEASE_STEPS.md b/RELEASE_STEPS.md
index 9cac9f815b..92c38c79d0 100644
--- a/RELEASE_STEPS.md
+++ b/RELEASE_STEPS.md
@@ -52,6 +52,7 @@ Do changes for a release:
 - For major/minor release, when release is done, add an extra "dev" tag on the `main` branch:
   - `git tag -a -s -m "Development version $VERSION+1" v$VERSION+1-dev`
     - for example, when `v0.1.0` is released, the dev tag would be `v0.2.0-dev`
+    - if needed, further in time, an extra dev tag can be introduced, e.g. `v0.2.0-dev1`
   - This way, the `main` branch will introduce itself as the next version
 
 ## Publish changes
diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake
index 2d14e2f45f..d6f12031d6 100644
--- a/cmake/helpers.cmake
+++ b/cmake/helpers.cmake
@@ -121,12 +121,12 @@ function(set_version_variables)
         return()
     endif()
 
-    # v1.5.0-dev - we're on a development tag -> UMF ver: "1.5.0-dev"
-    string(REGEX MATCHALL "\^v([0-9]+\.[0-9]+\.[0-9]+)-dev\$" MATCHES
+    # v1.5.0-dev1 - we're on a development tag -> UMF ver: "1.5.0-dev1"
+    string(REGEX MATCHALL "\^v([0-9]+\.[0-9]+\.[0-9]+)-(dev[0-9]?)\$" MATCHES
                  ${GIT_VERSION})
     if(MATCHES)
         set(UMF_VERSION
-            "${CMAKE_MATCH_1}-dev"
+            "${CMAKE_MATCH_1}-${CMAKE_MATCH_2}"
             PARENT_SCOPE)
         set(UMF_CMAKE_VERSION
             "${CMAKE_MATCH_1}"
@@ -157,12 +157,12 @@ function(set_version_variables)
         return()
     endif()
 
-    # v1.5.0-dev-19-gb8f7a32 -> UMF ver: "1.5.0-dev.git19.gb8f7a32"
-    string(REGEX MATCHALL "v([0-9.]*)-dev-([0-9]*)-([0-9a-g]*)" MATCHES
+    # v1.5.0-dev2-19-gb8f7a32 -> UMF ver: "1.5.0-dev2.git19.gb8f7a32"
+    string(REGEX MATCHALL "v([0-9.]*)-(dev[0-9]?)-([0-9]*)-([0-9a-g]*)" MATCHES
                  ${GIT_VERSION})
     if(MATCHES)
         set(UMF_VERSION
-            "${CMAKE_MATCH_1}-dev.git${CMAKE_MATCH_2}.${CMAKE_MATCH_3}"
+            "${CMAKE_MATCH_1}-${CMAKE_MATCH_2}.git${CMAKE_MATCH_3}.${CMAKE_MATCH_4}"
             PARENT_SCOPE)
         set(UMF_CMAKE_VERSION
             "${CMAKE_MATCH_1}"