diff --git a/cli/main.cpp b/cli/main.cpp index 38c5c90c6..8a60b9408 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -20,7 +20,7 @@ /** * * @mainpage Cppcheck - * @version 2.0 + * @version 2.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 index b21cdad4b..db2501091 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,5 +1,5 @@ # Version for libraries CPP -SET(VERSION "2.0.99") +SET(VERSION "2.1") 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/createrelease b/createrelease index b9e84299d..af50c33cb 100755 --- a/createrelease +++ b/createrelease @@ -20,12 +20,12 @@ # git log --format='%aN' 1.81..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less # # Update version numbers in: -# sed -i "s/1.[0-9][0-9].99/1.89/" cli/main.cpp -# sed -i "s/1.[0-9][0-9].99/1.89/" cmake/versions.cmake -# sed -i "s/MINOR [0-9][0-9]/MINOR 89/" lib/version.h -# sed -i "s/1.[0-9][0-9] dev/1.89/" win_installer/productInfo.wxi -# sed -i "s/1.[0-9][0-9].99/1.89/" win_installer/productInfo.wxi -# sed -i "s/Version 1.[0-9][0-9]/Version 1.89/" */*.md +# sed -i "s/[12].[0-9][0-9]*.99/2.1/" cli/main.cpp +# sed -i "s/[12].[0-9][0-9]*/2.1/" cmake/versions.cmake +# sed -i "s/MINOR [0-9][0-9]*/MINOR 1/" lib/version.h +# sed -i "s/[12].[0-9][0-9]* dev/2.1/" win_installer/productInfo.wxi +# sed -i "s/[12].[0-9][0-9]*/2.1/" win_installer/productInfo.wxi +# sed -i "s/Version [12].[0-9]+/Version 2.1/" */*.md # Verify: # grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]* # git commit -a -m "1.43: Set versions" diff --git a/lib/version.h b/lib/version.h index f3ed399fe..db285286e 100644 --- a/lib/version.h +++ b/lib/version.h @@ -2,7 +2,7 @@ // After a release the DEVMINOR is incremented. MAJOR=x MINOR=y, DEVMINOR=y+1 #define CPPCHECK_MAJOR 2 -#define CPPCHECK_MINOR 0 +#define CPPCHECK_MINOR 1 #define CPPCHECK_DEVMINOR 1 #define STRINGIFY(x) STRING(x) diff --git a/man/manual.md b/man/manual.md index 8fb21ca4b..5cee3d475 100644 --- a/man/manual.md +++ b/man/manual.md @@ -1,6 +1,6 @@ --- title: Cppcheck manual -subtitle: Version 2.0 +subtitle: Version 2.1 author: Cppcheck team lang: en documentclass: report diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md index 75d527c16..9e4d6b938 100644 --- a/man/reference-cfg-format.md +++ b/man/reference-cfg-format.md @@ -1,6 +1,6 @@ --- title: Cppcheck .cfg format -subtitle: Version 2.0 +subtitle: Version 2.1 author: Cppcheck team lang: en documentclass: report diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi index 9dc788c52..a245566e9 100644 --- a/win_installer/productInfo.wxi +++ b/win_installer/productInfo.wxi @@ -1,8 +1,8 @@ - + - +