From 6a7eada417a35fee220cae7a35a09af6c90d9f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 26 May 2020 23:29:12 +0200 Subject: [PATCH] Reverted and fixed changes in version.h --- lib/version.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/version.h b/lib/version.h index 06bdc6861..f3ed399fe 100644 --- a/lib/version.h +++ b/lib/version.h @@ -1,14 +1,17 @@ +// For a release version x.y the MAJOR should be x and both MINOR and DEVMINOR should be y. +// After a release the DEVMINOR is incremented. MAJOR=x MINOR=y, DEVMINOR=y+1 + #define CPPCHECK_MAJOR 2 #define CPPCHECK_MINOR 0 -#define CPPCHECK_DEVMINOR 99 +#define CPPCHECK_DEVMINOR 1 #define STRINGIFY(x) STRING(x) #define STRING(VER) #VER -#if CPPCHECK_DEVMINOR < 99 -#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR) "." STRINGIFY(CPPCHECK_MINOR) +#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_MINOR) " dev" +#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."