Skip to content

Commit

Permalink
fixed Cppcheck version (danmar#4292)
Browse files Browse the repository at this point in the history
  • Loading branch information
firewave authored Jul 19, 2022
1 parent 5e537a6 commit f644938
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion cli/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cmake/versions.cmake
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
30 changes: 15 additions & 15 deletions createrelease
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
Expand All @@ -75,7 +75,7 @@
#
# compile new democlient:
# ssh -t danielmarjamaki,[email protected] 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
Expand Down
4 changes: 2 additions & 2 deletions lib/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/manual.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Cppcheck manual
subtitle: Version 2.7
subtitle: Version 2.9
author: Cppcheck team
lang: en
documentclass: report
Expand Down
4 changes: 2 additions & 2 deletions win_installer/productInfo.wxi
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<?define ProductName = "Cppcheck $(var.Platform) 2.8" ?>
<?define ProductName = "Cppcheck $(var.Platform) 2.9 dev" ?>
<?define ProductNameShort = "Cppcheck" ?>
<?define ProductVersion = "2.8" ?>
<?define ProductVersion = "2.9.99" ?>

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

0 comments on commit f644938

Please sign in to comment.