diff --git a/cli/main.cpp b/cli/main.cpp index aca20505f..d7ba1bc79 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -20,7 +20,7 @@ /** * * @mainpage Cppcheck - * @version 2.7 + * @version 2.9.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 0ed072967..9f80eb508 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,5 +1,5 @@ # Version for libraries CPP -SET(VERSION "2.7") +SET(VERSION "2.9.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/createrelease b/createrelease index 981ea270a..205323e2f 100755 --- a/createrelease +++ b/createrelease @@ -17,38 +17,38 @@ # lupdate gui.pro # # Update copyright year -# git diff 2.6 -- */*.cpp */*.h | grep '^diff --git a/' | sed 's|.* b/||' | xargs sed -i 's/Copyright (C) 2007-20[12]./Copyright (C) 2007-2022/' +# git diff 2.8 -- */*.cpp */*.h | grep '^diff --git a/' | sed 's|.* b/||' | xargs sed -i 's/Copyright (C) 2007-20[12]./Copyright (C) 2007-2022/' # git diff | grep '^diff --git a/' # # Make sure "cppcheck --errorlist" works: # make clean && make -j4 && ./cppcheck --errorlist > errlist.xml && xmllint --noout errlist.xml # # Update AUTHORS using output from: -# git log --format='%aN' 1.81..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less +# git log --format='%aN' 2.7..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less # -# Create 2.6.x branch -# git checkout -b 2.6.x ; git push -u origin 2.6.x +# Create 2.8.x branch +# git checkout -b 2.8.x ; git push -u origin 2.8.x # # Update version numbers in: -# sed -i -r "s/version 2[.][0-9]+([.]99)*/version 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 +# sed -i -r "s/version 2[.][0-9]+([.]99)*/version 2.9/" cli/main.cpp +# sed -i -r "s|2[.][0-9]+([.]99)*|2.9|" cmake/versions.cmake +# sed -i -r "s/MINOR [0-9]+/MINOR 9/" lib/version.h +# sed -i -r "s/2[.][0-9]+([.]99)*/2.9/" win_installer/productInfo.wxi +# sed -i -r "s/subtitle: Version 2\.[0-9]+/subtitle: Version 2.9/" 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]* # egrep "2\.[0-9]+" */*.h */*.cpp man/*.md | grep -v "test/test" | less -# git commit -a -m "1.43: Set versions" +# git commit -a -m "2.8: Set versions" # # Build and test the windows installer # # Update the Makefile: # make dmake && ./dmake --release -# git commit -a -m "1.43: Updated Makefile" +# git commit -a -m "2.8: Updated Makefile" # # Tag: -# git tag 2.6-rc1 +# git tag 2.8-rc1 # git push --tags # # Release @@ -58,8 +58,8 @@ # # Remove "-rc1" from versions. Test: git grep "\-rc[0-9]" # -# git tag 2.6 ; git push --tags -# ./createrelease 2.6 +# git tag 2.8 ; git push --tags +# ./createrelease 2.8 # # Create a release folder on sourceforge: # https://sourceforge.net/projects/cppcheck/files/cppcheck/ @@ -75,7 +75,7 @@ # # compile new democlient: # ssh -t danielmarjamaki,cppcheck@shell.sourceforge.net create -# ./build-cppcheck.sh 1.43 +# ./build-cppcheck.sh 2.8 # # run daca with new release # 1. edit tools/donate-cpu-server.py. Update OLD_VERSION and VERSION diff --git a/lib/version.h b/lib/version.h index f958b5e1c..59e64f2b5 100644 --- a/lib/version.h +++ b/lib/version.h @@ -2,8 +2,8 @@ // After a release the DEVMINOR is incremented. MAJOR=x MINOR=y, DEVMINOR=y+1 #define CPPCHECK_MAJOR 2 -#define CPPCHECK_MINOR 7 -#define CPPCHECK_DEVMINOR 7 +#define CPPCHECK_MINOR 8 +#define CPPCHECK_DEVMINOR 9 #define STRINGIFY(x) STRING(x) #define STRING(VER) #VER diff --git a/man/manual.md b/man/manual.md index 1a6ad2c1b..756a75ba2 100644 --- a/man/manual.md +++ b/man/manual.md @@ -1,6 +1,6 @@ --- title: Cppcheck manual -subtitle: Version 2.7 +subtitle: Version 2.9 author: Cppcheck team lang: en documentclass: report diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi index 826aabd84..6e7a3eff2 100644 --- a/win_installer/productInfo.wxi +++ b/win_installer/productInfo.wxi @@ -1,8 +1,8 @@ - + - +