diff --git a/cli/main.cpp b/cli/main.cpp index 604f3fec2..7b3bcb6aa 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -20,7 +20,7 @@ /** * * @mainpage Cppcheck - * @version 2.6.99 + * @version 2.7 * * @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 d17ff45f5..0ed072967 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,5 +1,5 @@ # Version for libraries CPP -SET(VERSION "2.6.99") +SET(VERSION "2.7") 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 2aafb152d..3e140dc1e 100755 --- a/createrelease +++ b/createrelease @@ -33,11 +33,11 @@ # git checkout -b 2.6.x ; git push -u origin 2.6.x # # Update version numbers in: -# sed -i "s/2.[0-9][0-9]*.99/2.5/" cli/main.cpp -# sed -i "s/2.[0-9][0-9]*/2.5/" cmake/versions.cmake -# sed -i "s/MINOR [0-9]+/MINOR 5/" lib/version.h -# sed -i "s/2\.[0-9]+/2.5/" win_installer/productInfo.wxi -# sed -i "s/subtitle: Version 2\.[0-9]+/subtitle: Version 2.5/" man/*.md +# sed -i -r "s/version 2[.][0-9]+([.]99)*/2.7/" cli/main.cpp +# sed -i -r "s|2[.][0-9]+([.]99)*|2.7|" cmake/versions.cmake +# sed -i -r "s/MINOR [0-9]+/MINOR 7/" lib/version.h +# sed -i -r "s/2[.][0-9]+([.]99)*/2.7/" win_installer/productInfo.wxi +# sed -i -r "s/subtitle: Version 2\.[0-9]+/subtitle: Version 2.7/" man/*.md # Ensure that "-rc1" is added in productInfo.wxi and lib/version.h # Verify: # grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]* diff --git a/lib/version.h b/lib/version.h index 2ebae99a7..f958b5e1c 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 6 +#define CPPCHECK_MINOR 7 #define CPPCHECK_DEVMINOR 7 #define STRINGIFY(x) STRING(x) diff --git a/man/manual.md b/man/manual.md index 6b47a0648..1c7ce36e6 100644 --- a/man/manual.md +++ b/man/manual.md @@ -1,6 +1,6 @@ --- title: Cppcheck manual -subtitle: Version 2.6 +subtitle: Version 2.7 author: Cppcheck team lang: en documentclass: report diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md index bb486ffcf..723e2203b 100644 --- a/man/reference-cfg-format.md +++ b/man/reference-cfg-format.md @@ -1,6 +1,6 @@ --- title: Cppcheck .cfg format -subtitle: Version 2.6 +subtitle: Version 2.7 author: Cppcheck team lang: en documentclass: report diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi index da6ddf341..0804f6f6a 100644 --- a/win_installer/productInfo.wxi +++ b/win_installer/productInfo.wxi @@ -1,8 +1,8 @@ - + - +