Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set main version to 2.13.99 #5818

Merged
merged 5 commits into from
Jan 4, 2024
+13 −13
Merged

Set main version to 2.13.99 #5818

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5fe555b
Update productInfo.wxi
chrchr-github Jan 2, 2024
f608210
Set versions
chrchr-github Jan 3, 2024
e5caf18
Update version.h
chrchr-github Jan 3, 2024
a326eb2
Update version.h
chrchr-github Jan 4, 2024
fa99e44
Set devminor version
chrchr-github Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/**
*
* @mainpage Cppcheck
* @version 2.12.99
* @version 2.13.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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Version for libraries CPP
# Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
SET(VERSION "2.12.99")
SET(VERSION "2.13.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
8 changes: 4 additions & 4 deletions lib/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
#define versionH

#define CPPCHECK_MAJOR_VERSION 2
#define CPPCHECK_MINOR_VERSION 12
#define CPPCHECK_DEVMINOR_VERSION 13
#define CPPCHECK_MINOR_VERSION 13
#define CPPCHECK_BUGFIX_VERSION 99
#define CPPCHECK_FIX_VERSION 0

#define STRINGIFY(x) STRING(x)
#define STRING(VER) #VER
#if CPPCHECK_MINOR_VERSION == CPPCHECK_DEVMINOR_VERSION
#if CPPCHECK_BUGFIX_VERSION < 99
#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_MINOR_VERSION) "." STRINGIFY(CPPCHECK_FIX_VERSION)
#define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,CPPCHECK_FIX_VERSION,0
#else
#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_DEVMINOR_VERSION) " dev"
danmar marked this conversation as resolved.
Show resolved Hide resolved
#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_BUGFIX_VERSION) " dev"
#define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,99,0
#endif
#define LEGALCOPYRIGHT L"Copyright (C) 2007-2023 Cppcheck team."
Expand Down
2 changes: 1 addition & 1 deletion man/manual.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Cppcheck manual
subtitle: Version 2.12.99
subtitle: Version 2.13.99
author: Cppcheck team
lang: en
documentclass: report
Expand Down
2 changes: 1 addition & 1 deletion man/reference-cfg-format.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Cppcheck .cfg format
subtitle: Version 2.12.99
subtitle: Version 2.13.99
author: Cppcheck team
lang: en
documentclass: report
Expand Down
2 changes: 1 addition & 1 deletion man/writing-addons.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Writing addons
subtitle: Version 2.12.99
subtitle: Version 2.13.99
author: Cppcheck team
lang: en
documentclass: report
Expand Down
4 changes: 2 additions & 2 deletions win_installer/productInfo.wxi
View file
Open in desktop
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.13 dev" ?>
<?define ProductName = "Cppcheck $(var.Platform) 2.14 dev" ?>
<?define ProductNameShort = "Cppcheck" ?>
<?define ProductVersion = "2.12.99" ?>
<?define ProductVersion = "2.13.99" ?>

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