From efa8a08407d58f68ca2efa6c810437f36d5ca57f Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Thu, 4 Jan 2024 22:00:30 +0100 Subject: [PATCH] Set main version to 2.13.99 (#5818) --- cli/main.cpp | 2 +- cmake/versions.cmake | 2 +- lib/version.h | 12 ++++++------ man/manual.md | 2 +- man/reference-cfg-format.md | 2 +- man/writing-addons.md | 2 +- win_installer/productInfo.wxi | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cli/main.cpp b/cli/main.cpp index 7e076dfbc..23c2103b4 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 cf2020d3f..8d307012f 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 85bb17033..d6bd74100 100644 --- a/lib/version.h +++ b/lib/version.h @@ -5,15 +5,15 @@ #define versionH #define CPPCHECK_MAJOR_VERSION 2 -#define CPPCHECK_MINOR_VERSION 12 -#define CPPCHECK_DEVMINOR_VERSION 13 -#define CPPCHECK_FIX_VERSION 0 +#define CPPCHECK_MINOR_VERSION 13 +#define CPPCHECK_DEVMINOR_VERSION 14 +#define CPPCHECK_BUGFIX_VERSION 99 #define STRINGIFY(x) STRING(x) #define STRING(VER) #VER -#if CPPCHECK_MINOR_VERSION == CPPCHECK_DEVMINOR_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 +#if CPPCHECK_BUGFIX_VERSION < 99 +#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_DEVMINOR_VERSION) " dev" #define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,99,0 diff --git a/man/manual.md b/man/manual.md index 819760925..8b7447a2a 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 70ff8b959..8c7d21285 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 63b5a2ca0..acd1cf9de 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 diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi index 1147bf2e5..0d9a8fa70 100644 --- a/win_installer/productInfo.wxi +++ b/win_installer/productInfo.wxi @@ -1,8 +1,8 @@ - + - +