2.4.1: Set version

.github/workflows/valgrind.yml

@@ -16,6 +16,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install debian-goodies ubuntu-dbgsym-keyring
+          # the key expired and the ubuntu-dbgsym-keyring package does not yet include the latest one - see https://bugs.launchpad.net/ubuntu/+source/ubuntu-keyring/+bug/1920640
+          wget -O - http://ddebs.ubuntu.com/dbgsym-release-key.asc | sudo apt-key add -
 
       - name: Add debug repos on ubuntu
         run:  |

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.

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 "")

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."

win_installer/cppcheck.wxs

@@ -150,6 +150,7 @@
               <File Id='findcasts.py' Name='findcasts.py' Source='$(var.AddonsDir)\findcasts.py' />
               <File Id='misc.py' Name='misc.py' Source='$(var.AddonsDir)\misc.py' />
               <File Id='misra.py' Name='misra.py' Source='$(var.AddonsDir)\misra.py' />
+              <File Id='misra_9.py' Name='misra_9.py' Source='$(var.AddonsDir)\misra_9.py' />
               <File Id='naming.py' Name='naming.py' Source='$(var.AddonsDir)\naming.py' />
               <File Id='namingng.py' Name='namingng.py' Source='$(var.AddonsDir)\namingng.py' />
               <File Id='ROS_naming.json' Name='ROS_naming.json' Source='$(var.AddonsDir)\ROS_naming.json' />

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" ?>