Browse Source

🆕 Update backup version (#2958)

* Bump backup version to: 1.5.1 24102308 ea34859

* Bump backup version to: 1.7.3+25012014-8d559673-dev

* Modify regex matching in deps.txt to use new semver

---------

Co-authored-by: donhardman <[email protected]>
Co-authored-by: Sergey Nikolaev <[email protected]>
Co-authored-by: githubmanticore <[email protected]>
Co-authored-by: Don Hardman <[email protected]>
Manticore Team 1 year ago
parent
commit
0893df7449
2 changed files with 20 additions and 19 deletions
  1. 19 18
      cmake/builds/VersionDeps.cmake
  2. 1 1
      deps.txt

+ 19 - 18
cmake/builds/VersionDeps.cmake

@@ -1,24 +1,25 @@
 # Deps versions parsing
 file(STRINGS "${MANTICORE_SOURCE_DIR}/deps.txt" lines)
 foreach(line ${lines})
-  if(line STREQUAL "---")
-    break()
-  endif()
-    message("Parsing deps.txt line: ${line}")
-    string(REGEX MATCH "^([^ ]+) ([^+ ]+)([+][^ ]*|) *([^ ]*) *([^ ]*)" _ ${line})
-    string(TOUPPER ${CMAKE_MATCH_1} dep)
-    set(vernum ${CMAKE_MATCH_2})
-    set(verdate ${CMAKE_MATCH_4})
-    set(verhash ${CMAKE_MATCH_5})
-    set("${dep}_VERNUM" ${vernum})
-    set("${dep}_VERDATE" ${verdate})
-    set("${dep}_VERHASH" ${verhash})
+	if(line STREQUAL "---")
+		break()
+	endif()
 
-    # Increment first number in semver and assign it to max (incompatible)
-    string(REGEX REPLACE "^([0-9]+)\\..*$" "\\1" major_version "${CMAKE_MATCH_2}")
-    math(EXPR major_version "${major_version} + 1")
-    set(vernum_max "${major_version}.0.0")
-    set("${dep}_VERNUM_MAX" ${vernum_max})
+	message("Parsing deps.txt line: ${line}")
+	string(REGEX MATCH "^([^ ]+) ([^+ ]+)[+ ]*([^ -]*)[ -]*([^ -]*)[ -]*([^ ]*)" _ "${line}")
+	string(TOUPPER ${CMAKE_MATCH_1} dep)
+	set(vernum ${CMAKE_MATCH_2})
+	set(verdate ${CMAKE_MATCH_3})
+	set(verhash ${CMAKE_MATCH_4})
+	set("${dep}_VERNUM" ${vernum})
+	set("${dep}_VERDATE" ${verdate})
+	set("${dep}_VERHASH" ${verhash})
 
-    message("${dep} version: >= ${vernum}-${verdate}-${verhash} & < ${vernum_max}")
+	# Increment first number in semver and assign it to max (incompatible)
+	string(REGEX REPLACE "^([0-9]+)\\..*$" "\\1" major_version "${CMAKE_MATCH_2}")
+	math(EXPR major_version "${major_version} + 1")
+	set(vernum_max "${major_version}.0.0")
+	set("${dep}_VERNUM_MAX" ${vernum_max})
+
+	message("${dep} version: >= ${vernum}-${verdate}-${verhash} & < ${vernum_max}")
 endforeach()

+ 1 - 1
deps.txt

@@ -1,4 +1,4 @@
-backup 1.5.1 24102308 ea34859
+backup 1.7.3+25012014-8d559673-dev
 buddy 3.0.1 25011709 ed387a3
 mcl 2.3.1 25011420 10fe2da
 executor 1.3.1 25011510 1856ac9