From bac2e9096ac66562baabb57fdca41cddcaf5ba3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 2 Oct 2021 13:06:11 +0200
Subject: [PATCH] createrelease: creating release candidate

---
 createrelease | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/createrelease b/createrelease
index b159f4d05..7e9f1bd6c 100755
--- a/createrelease
+++ b/createrelease
@@ -2,6 +2,9 @@
 #
 # A script for creating release packages. The release packages are create in the home directory.
 #
+# Create release candidate
+# ========================
+#
 # Windows installer:
 # - ensure latest build was successful
 # - ensure cfg files etc are included (win_installer/cppcheck.wxs)
@@ -26,12 +29,16 @@
 # Update AUTHORS using output from:
 # git log --format='%aN' 1.81..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
+#
 # Update version numbers in:
 # sed -i "s/2.[0-9][0-9]*.99/2.5/" cli/main.cpp
 # sed -i "s/2.[0-9][0-9]*/2.5/" cmake/versions.cmake
 # sed -i "s/MINOR [0-9]+/MINOR 5/" lib/version.h
 # sed -i "s/2\.[0-9]+/2.5/" win_installer/productInfo.wxi
 # sed -i "s/subtitle: Version 2\.[0-9]+/subtitle: Version 2.5/" 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
@@ -44,25 +51,27 @@
 # git commit -a -m "1.43: Updated Makefile"
 #
 # Tag:
-# git tag 1.43
+# git tag 2.6-rc1
 # git push --tags
 #
-# Restore the Makefile:
-# make dmake && ./dmake
-# git commit -a -m "Makefile: Set debug mode"
+# Release
+# =======
+#
+# Write release notes
+#
+# Remove "-rc1" from versions. Test: git grep "\-rc[0-9]"
+#
+# git tag 2.6 ; git push --tags
+# ./createrelease 2.6
 #
 # Create a release folder on sourceforge:
 # https://sourceforge.net/projects/cppcheck/files/cppcheck/
 #
-# Create release:
-# ./createrelease 1.43
-
 # Update download link on index.php main page
 #
-#
 # write a news
 #
-# save "cppcheck --doc" output on wiki, write new release date on wikis
+# save "cppcheck --doc" output on wiki
 #
 # compile new democlient:
 # ssh -t danielmarjamaki,cppcheck@shell.sourceforge.net create
@@ -119,7 +128,7 @@ cp -R ~/cppcheck/cfg .
 cp -R ~/cppcheck/addons .
 cp -R ~/cppcheck/platforms .
 cd ~/cppcheck
-make clean ; make -j4 FILESDIR=~/.cppcheck/2.5 MATCHCOMPILER=yes USE_Z3=yes 
+make clean ; make -j4 FILESDIR=~/.cppcheck/$tag MATCHCOMPILER=yes USE_Z3=yes
 mv cppcheck ~/.cppcheck/cppcheck-$tag
 
 git checkout main