Skip to content

Commit f644938

Browse files
authored
fixed Cppcheck version (#4292)
1 parent 5e537a6 commit f644938

6 files changed

Lines changed: 22 additions & 22 deletions

File tree

cli/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**
2121
*
2222
* @mainpage Cppcheck
23-
* @version 2.7
23+
* @version 2.9.99
2424
*
2525
* @section overview_sec Overview
2626
* Cppcheck is a simple tool for static analysis of C/C++ code.

cmake/versions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Version for libraries CPP
2-
SET(VERSION "2.7")
2+
SET(VERSION "2.9.99")
33
STRING(REGEX MATCHALL "[0-9]" VERSION_PARTS "${VERSION}")
44
LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
55
LIST(GET VERSION_PARTS 1 VERSION_MINOR)

createrelease

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,38 @@
1717
# lupdate gui.pro
1818
#
1919
# Update copyright year
20-
# 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/'
20+
# 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/'
2121
# git diff | grep '^diff --git a/'
2222
#
2323
# Make sure "cppcheck --errorlist" works:
2424
# make clean && make -j4 && ./cppcheck --errorlist > errlist.xml && xmllint --noout errlist.xml
2525
#
2626
# Update AUTHORS using output from:
27-
# git log --format='%aN' 1.81..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
27+
# git log --format='%aN' 2.7..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
2828
#
29-
# Create 2.6.x branch
30-
# git checkout -b 2.6.x ; git push -u origin 2.6.x
29+
# Create 2.8.x branch
30+
# git checkout -b 2.8.x ; git push -u origin 2.8.x
3131
#
3232
# Update version numbers in:
33-
# sed -i -r "s/version 2[.][0-9]+([.]99)*/version 2.7/" cli/main.cpp
34-
# sed -i -r "s|2[.][0-9]+([.]99)*|2.7|" cmake/versions.cmake
35-
# sed -i -r "s/MINOR [0-9]+/MINOR 7/" lib/version.h
36-
# sed -i -r "s/2[.][0-9]+([.]99)*/2.7/" win_installer/productInfo.wxi
37-
# sed -i -r "s/subtitle: Version 2\.[0-9]+/subtitle: Version 2.7/" man/*.md
33+
# sed -i -r "s/version 2[.][0-9]+([.]99)*/version 2.9/" cli/main.cpp
34+
# sed -i -r "s|2[.][0-9]+([.]99)*|2.9|" cmake/versions.cmake
35+
# sed -i -r "s/MINOR [0-9]+/MINOR 9/" lib/version.h
36+
# sed -i -r "s/2[.][0-9]+([.]99)*/2.9/" win_installer/productInfo.wxi
37+
# sed -i -r "s/subtitle: Version 2\.[0-9]+/subtitle: Version 2.9/" man/*.md
3838
# Ensure that "-rc1" is added in productInfo.wxi and lib/version.h
3939
# Verify:
4040
# grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]*
4141
# egrep "2\.[0-9]+" */*.h */*.cpp man/*.md | grep -v "test/test" | less
42-
# git commit -a -m "1.43: Set versions"
42+
# git commit -a -m "2.8: Set versions"
4343
#
4444
# Build and test the windows installer
4545
#
4646
# Update the Makefile:
4747
# make dmake && ./dmake --release
48-
# git commit -a -m "1.43: Updated Makefile"
48+
# git commit -a -m "2.8: Updated Makefile"
4949
#
5050
# Tag:
51-
# git tag 2.6-rc1
51+
# git tag 2.8-rc1
5252
# git push --tags
5353
#
5454
# Release
@@ -58,8 +58,8 @@
5858
#
5959
# Remove "-rc1" from versions. Test: git grep "\-rc[0-9]"
6060
#
61-
# git tag 2.6 ; git push --tags
62-
# ./createrelease 2.6
61+
# git tag 2.8 ; git push --tags
62+
# ./createrelease 2.8
6363
#
6464
# Create a release folder on sourceforge:
6565
# https://sourceforge.net/projects/cppcheck/files/cppcheck/
@@ -75,7 +75,7 @@
7575
#
7676
# compile new democlient:
7777
# ssh -t danielmarjamaki,cppcheck@shell.sourceforge.net create
78-
# ./build-cppcheck.sh 1.43
78+
# ./build-cppcheck.sh 2.8
7979
#
8080
# run daca with new release
8181
# 1. edit tools/donate-cpu-server.py. Update OLD_VERSION and VERSION

lib/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// After a release the DEVMINOR is incremented. MAJOR=x MINOR=y, DEVMINOR=y+1
33

44
#define CPPCHECK_MAJOR 2
5-
#define CPPCHECK_MINOR 7
6-
#define CPPCHECK_DEVMINOR 7
5+
#define CPPCHECK_MINOR 8
6+
#define CPPCHECK_DEVMINOR 9
77

88
#define STRINGIFY(x) STRING(x)
99
#define STRING(VER) #VER

man/manual.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Cppcheck manual
3-
subtitle: Version 2.7
3+
subtitle: Version 2.9
44
author: Cppcheck team
55
lang: en
66
documentclass: report

win_installer/productInfo.wxi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Include>
3-
<?define ProductName = "Cppcheck $(var.Platform) 2.8" ?>
3+
<?define ProductName = "Cppcheck $(var.Platform) 2.9 dev" ?>
44
<?define ProductNameShort = "Cppcheck" ?>
5-
<?define ProductVersion = "2.8" ?>
5+
<?define ProductVersion = "2.9.99" ?>
66

77
<?define ProductManufacturer = "The Cppcheck team" ?>
88
<?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>

0 commit comments

Comments
 (0)