From 5fe555baf267e02041941e882d75551e744c4550 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:05:08 +0100 Subject: [PATCH 1/5] Update productInfo.wxi --- win_installer/productInfo.wxi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi index 1147bf2e514..0d9a8fa70bb 100644 --- a/win_installer/productInfo.wxi +++ b/win_installer/productInfo.wxi @@ -1,8 +1,8 @@ - + - + From f608210fbc758061e3dac8c03d2948c0013d8dbe Mon Sep 17 00:00:00 2001 From: chrchr Date: Wed, 3 Jan 2024 14:30:47 +0100 Subject: [PATCH 2/5] Set versions --- cli/main.cpp | 2 +- cmake/versions.cmake | 2 +- lib/version.h | 8 ++++---- man/manual.md | 2 +- man/reference-cfg-format.md | 2 +- man/writing-addons.md | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/main.cpp b/cli/main.cpp index 7e076dfbcea..23c2103b44d 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -20,7 +20,7 @@ /** * * @mainpage Cppcheck - * @version 2.12.99 + * @version 2.13.99 * * @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 index cf2020d3fea..8d307012f63 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,6 +1,6 @@ # Version for libraries CPP # Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/ -SET(VERSION "2.12.99") +SET(VERSION "2.13.99") STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}") LIST(GET VERSION_PARTS 0 VERSION_MAJOR) LIST(GET VERSION_PARTS 1 VERSION_MINOR) diff --git a/lib/version.h b/lib/version.h index 85bb170338f..80cafb33305 100644 --- a/lib/version.h +++ b/lib/version.h @@ -5,17 +5,17 @@ #define versionH #define CPPCHECK_MAJOR_VERSION 2 -#define CPPCHECK_MINOR_VERSION 12 -#define CPPCHECK_DEVMINOR_VERSION 13 +#define CPPCHECK_MINOR_VERSION 13 +#define CPPCHECK_BUGFIX_VERSION 99 #define CPPCHECK_FIX_VERSION 0 #define STRINGIFY(x) STRING(x) #define STRING(VER) #VER -#if CPPCHECK_MINOR_VERSION == CPPCHECK_DEVMINOR_VERSION +#if CPPCHECK_MINOR_VERSION == CPPCHECK_BUGFIX_VERSION #define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_MINOR_VERSION) "." STRINGIFY(CPPCHECK_FIX_VERSION) #define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,CPPCHECK_FIX_VERSION,0 #else -#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_DEVMINOR_VERSION) " dev" +#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_BUGFIX_VERSION) " dev" #define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,99,0 #endif #define LEGALCOPYRIGHT L"Copyright (C) 2007-2023 Cppcheck team." diff --git a/man/manual.md b/man/manual.md index 819760925a7..8b7447a2a9e 100644 --- a/man/manual.md +++ b/man/manual.md @@ -1,6 +1,6 @@ --- title: Cppcheck manual -subtitle: Version 2.12.99 +subtitle: Version 2.13.99 author: Cppcheck team lang: en documentclass: report diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md index 70ff8b95918..8c7d21285fe 100644 --- a/man/reference-cfg-format.md +++ b/man/reference-cfg-format.md @@ -1,6 +1,6 @@ --- title: Cppcheck .cfg format -subtitle: Version 2.12.99 +subtitle: Version 2.13.99 author: Cppcheck team lang: en documentclass: report diff --git a/man/writing-addons.md b/man/writing-addons.md index 63b5a2ca0d5..acd1cf9de83 100644 --- a/man/writing-addons.md +++ b/man/writing-addons.md @@ -1,6 +1,6 @@ --- title: Writing addons -subtitle: Version 2.12.99 +subtitle: Version 2.13.99 author: Cppcheck team lang: en documentclass: report From e5caf181750ed282f2421e8ecd95a8cf69af9faf Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Wed, 3 Jan 2024 18:41:46 +0100 Subject: [PATCH 3/5] Update version.h --- lib/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.h b/lib/version.h index 80cafb33305..79fe0f9d1c2 100644 --- a/lib/version.h +++ b/lib/version.h @@ -11,7 +11,7 @@ #define STRINGIFY(x) STRING(x) #define STRING(VER) #VER -#if CPPCHECK_MINOR_VERSION == CPPCHECK_BUGFIX_VERSION +#if CPPCHECK_BUGFIX_VERSION < 99 #define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_MINOR_VERSION) "." STRINGIFY(CPPCHECK_FIX_VERSION) #define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,CPPCHECK_FIX_VERSION,0 #else From a326eb2318634d64794242dd2fd2a88bfa104e37 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Thu, 4 Jan 2024 12:01:49 +0100 Subject: [PATCH 4/5] Update version.h --- lib/version.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/version.h b/lib/version.h index 79fe0f9d1c2..d16e392eaa3 100644 --- a/lib/version.h +++ b/lib/version.h @@ -6,16 +6,16 @@ #define CPPCHECK_MAJOR_VERSION 2 #define CPPCHECK_MINOR_VERSION 13 +#define CPPCHECK_DEVMINOR_VERSION CPPCHECK_MINOR_VERSION+1 #define CPPCHECK_BUGFIX_VERSION 99 -#define CPPCHECK_FIX_VERSION 0 #define STRINGIFY(x) STRING(x) #define STRING(VER) #VER #if CPPCHECK_BUGFIX_VERSION < 99 -#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_MINOR_VERSION) "." STRINGIFY(CPPCHECK_FIX_VERSION) -#define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,CPPCHECK_FIX_VERSION,0 +#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_MINOR_VERSION) "." STRINGIFY(CPPCHECK_BUGFIX_VERSION) +#define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,CPPCHECK_BUGFIX_VERSION,0 #else -#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_BUGFIX_VERSION) " dev" +#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_DEVMINOR_VERSION) " dev" #define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,99,0 #endif #define LEGALCOPYRIGHT L"Copyright (C) 2007-2023 Cppcheck team." From fa99e44043ebef1c0f175ef19a098fd7481801f0 Mon Sep 17 00:00:00 2001 From: chrchr Date: Thu, 4 Jan 2024 16:51:58 +0100 Subject: [PATCH 5/5] Set devminor version --- lib/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.h b/lib/version.h index d16e392eaa3..d6bd74100cd 100644 --- a/lib/version.h +++ b/lib/version.h @@ -6,7 +6,7 @@ #define CPPCHECK_MAJOR_VERSION 2 #define CPPCHECK_MINOR_VERSION 13 -#define CPPCHECK_DEVMINOR_VERSION CPPCHECK_MINOR_VERSION+1 +#define CPPCHECK_DEVMINOR_VERSION 14 #define CPPCHECK_BUGFIX_VERSION 99 #define STRINGIFY(x) STRING(x)