From c373be0b16b5d2ec6df4a8e733eb4b74f904da38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 3 Oct 2020 10:47:35 +0200
Subject: [PATCH] 2.2: Update versions

---
 cli/main.cpp                  | 2 +-
 cmake/versions.cmake          | 2 +-
 createrelease                 | 2 +-
 lib/version.h                 | 2 +-
 man/manual.md                 | 2 +-
 man/reference-cfg-format.md   | 2 +-
 win_installer/productInfo.wxi | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cli/main.cpp b/cli/main.cpp
index 9351dedd7..c0b911e45 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.1.99
+ * @version 2.2
  *
  * @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 01fb1c13e..c14c1904d 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,5 +1,5 @@
 # Version for libraries CPP
-SET(VERSION "2.1.99")
+SET(VERSION "2.2")
 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 7b80ed113..3786bddc5 100755
--- a/createrelease
+++ b/createrelease
@@ -29,7 +29,7 @@
 # sed -i "s/MINOR [0-9][0-9]*/MINOR 1/" lib/version.h
 # sed -i "s/[12].[0-9][0-9]* dev/2.1/" win_installer/productInfo.wxi
 # sed -i "s/[12].[0-9][0-9]*/2.1/" win_installer/productInfo.wxi
-# sed -i "s/Version [12].[0-9]+/Version 2.1/" */*.md
+# sed -i "s/subtitle: Version 2[.0-9]*/subtitle: Version 2.2/" man/*.md
 # Verify:
 # grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]*
 # git commit -a -m "1.43: Set versions"
diff --git a/lib/version.h b/lib/version.h
index 179effa53..7a5e2cd21 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 1
+#define CPPCHECK_MINOR 2
 #define CPPCHECK_DEVMINOR 2
 
 #define STRINGIFY(x) STRING(x)
diff --git a/man/manual.md b/man/manual.md
index e70b6b182..bc0bec642 100644
--- a/man/manual.md
+++ b/man/manual.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck manual
-subtitle: Version 2.1.99
+subtitle: Version 2.2
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md
index f14f647e2..fa67d7d40 100644
--- a/man/reference-cfg-format.md
+++ b/man/reference-cfg-format.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck .cfg format
-subtitle: Version 2.1.99
+subtitle: Version 2.2
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index cf513c7e2..b26ebb537 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck $(var.Platform) 2.2 dev" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.2" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.1.99" ?>
+  <?define ProductVersion = "2.2" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>