2.4.1: Set version

danmar · Mar 22, 2021 · b01c926 · b01c926
1 parent d0afc4b
commit b01c926
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/cli/main.cpp b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.4
+ * @version 2.4.1
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.

diff --git a/cmake/versions.cmake b/cmake/versions.cmake
@@ -1,9 +1,10 @@
 # Version for libraries CPP
-SET(VERSION "2.4")
+SET(VERSION "2.4.1")
 STRING(REGEX MATCHALL "[0-9]" VERSION_PARTS "${VERSION}")
 LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
 LIST(GET VERSION_PARTS 1 VERSION_MINOR)
-SET(SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
+LIST(GET VERSION_PARTS 2 VERSION_DEVMINOR)
+SET(SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_DEVMINOR}")
 
 # Postfix of so's:
 SET(DLLVERSION "")

diff --git a/lib/version.h b/lib/version.h
@@ -7,11 +7,8 @@
 
 #define STRINGIFY(x) STRING(x)
 #define STRING(VER) #VER
-#if CPPCHECK_MINOR == CPPCHECK_DEVMINOR
-#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR) "." STRINGIFY(CPPCHECK_DEVMINOR)
-#define CPPCHECK_VERSION CPPCHECK_MAJOR,CPPCHECK_MINOR,0,0
-#else
-#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR) "." STRINGIFY(CPPCHECK_DEVMINOR) " dev"
-#define CPPCHECK_VERSION CPPCHECK_MAJOR,CPPCHECK_MINOR,99,0
-#endif
-#define LEGALCOPYRIGHT L"Copyright (C) 2007-2020 Cppcheck team."
+
+#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR) "." STRINGIFY(CPPCHECK_MINOR) ".1"
+#define CPPCHECK_VERSION CPPCHECK_MAJOR,CPPCHECK_MINOR,1,0
+
+#define LEGALCOPYRIGHT L"Copyright (C) 2007-2021 Cppcheck team."
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
- <?define ProductName = "Cppcheck $(var.Platform) 2.4" ?>
+ <?define ProductName = "Cppcheck $(var.Platform) 2.4.1" ?>
  <?define ProductNameShort = "Cppcheck" ?>
- <?define ProductVersion = "2.4" ?>
+ <?define ProductVersion = "2.4.1" ?>
 
  <?define ProductManufacturer = "The Cppcheck team" ?>
  <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>