From ccf8da5869b36252cd398ae2d6ba480f65d49f26 Mon Sep 17 00:00:00 2001
From: Tim Zinsky <tim.zinsky@hpe.com>
Date: Wed, 26 Jun 2024 16:28:04 -0500
Subject: [PATCH 1/2] Update Chapel versions to 2.2 pre-release

Signed-off-by: Tim Zinsky <tim.zinsky@hpe.com>
---
 CMakeLists.txt                                             | 4 ++--
 man/confchpl.rst                                           | 2 +-
 man/confchpldoc.rst                                        | 2 +-
 test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh | 6 +++---
 test/compflags/bradc/printstuff/version.goodstart          | 2 +-
 test/compflags/bradc/printstuff/versionhelp.sh             | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38abed8bb2e6..9c37ce6fd3af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,13 +36,13 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # These values will be written to <build_dir>/frontend/include/chpl/config/config.h
 
 set(CHPL_MAJOR_VERSION 2)
-set(CHPL_MINOR_VERSION 1)
+set(CHPL_MINOR_VERSION 2)
 set(CHPL_PATCH_VERSION 0)
 set(CHPL_BUILD_VERSION 0)
 
 # Flip this to 'true' when we're ready to roll out a release; then back
 # after branching
-set(CHPL_OFFICIAL_RELEASE true)
+set(CHPL_OFFICIAL_RELEASE false)
 
 ### END config.h version value setting - configured_prefix set below ###
 
diff --git a/man/confchpl.rst b/man/confchpl.rst
index 3659ecc30f32..cb0de498b65a 100644
--- a/man/confchpl.rst
+++ b/man/confchpl.rst
@@ -1,5 +1,5 @@
 
-:Version: 2.1
+:Version: 2.2.0 pre-release
 :Manual section: 1
 :Title: \\fBchpl\\fP
 :Subtitle: Compiler for the Chapel Programming Language
diff --git a/man/confchpldoc.rst b/man/confchpldoc.rst
index da6fcf03e247..719760279985 100644
--- a/man/confchpldoc.rst
+++ b/man/confchpldoc.rst
@@ -1,5 +1,5 @@
 
-:Version: 2.1 pre-release
+:Version: 2.2.0 pre-release
 :Manual section: 1
 :Title: \\fBchpldoc\\fP
 :Subtitle: the Chapel Documentation Tool
diff --git a/test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh b/test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh
index c863b796c699..3fe81cda7fe1 100755
--- a/test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh
+++ b/test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh
@@ -5,10 +5,10 @@ compiler=$3
 echo -n `basename $compiler`
 cat $CWD/../../../compflags/bradc/printstuff/version.goodstart
 # During pre-release mode
-# diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
-#  { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
+diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
+  { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
 # During release mode:
-echo ""
+# echo ""
 
 # print Sphinx and chapeldomain versions
 python=$($CWD/../../../../util/config/find-python.sh)
diff --git a/test/compflags/bradc/printstuff/version.goodstart b/test/compflags/bradc/printstuff/version.goodstart
index 9edd439ee658..a93359f406bb 100644
--- a/test/compflags/bradc/printstuff/version.goodstart
+++ b/test/compflags/bradc/printstuff/version.goodstart
@@ -1 +1 @@
- version 2.1.0
\ No newline at end of file
+ version 2.2.0
diff --git a/test/compflags/bradc/printstuff/versionhelp.sh b/test/compflags/bradc/printstuff/versionhelp.sh
index 5d55c06d2caf..f4bf76583f25 100755
--- a/test/compflags/bradc/printstuff/versionhelp.sh
+++ b/test/compflags/bradc/printstuff/versionhelp.sh
@@ -5,10 +5,10 @@ compiler=$3
 echo -n `basename $compiler`
 cat $CWD/version.goodstart
 # During pre-release mode
-# diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
-#  { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
+diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
+ { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
 # During release mode:
-echo ""
+# echo ""
 
 if [ "$CHPL_LLVM" != "none" ]
 then

From a504e49ac67de4f74dff3bb405b825d88f6c932e Mon Sep 17 00:00:00 2001
From: Tim Zinsky <tim.zinsky@hpe.com>
Date: Wed, 26 Jun 2024 17:44:56 -0500
Subject: [PATCH 2/2] Update versions to align with major.minor and fix EOF

Signed-off-by: Tim Zinsky <tim.zinsky@hpe.com>
---
 man/confchpl.rst                                  | 2 +-
 man/confchpldoc.rst                               | 2 +-
 test/compflags/bradc/printstuff/version.goodstart | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/confchpl.rst b/man/confchpl.rst
index cb0de498b65a..e028bf661389 100644
--- a/man/confchpl.rst
+++ b/man/confchpl.rst
@@ -1,5 +1,5 @@
 
-:Version: 2.2.0 pre-release
+:Version: 2.2 pre-release
 :Manual section: 1
 :Title: \\fBchpl\\fP
 :Subtitle: Compiler for the Chapel Programming Language
diff --git a/man/confchpldoc.rst b/man/confchpldoc.rst
index 719760279985..0506c79d69a5 100644
--- a/man/confchpldoc.rst
+++ b/man/confchpldoc.rst
@@ -1,5 +1,5 @@
 
-:Version: 2.2.0 pre-release
+:Version: 2.2 pre-release
 :Manual section: 1
 :Title: \\fBchpldoc\\fP
 :Subtitle: the Chapel Documentation Tool
diff --git a/test/compflags/bradc/printstuff/version.goodstart b/test/compflags/bradc/printstuff/version.goodstart
index a93359f406bb..b5338b5875d7 100644
--- a/test/compflags/bradc/printstuff/version.goodstart
+++ b/test/compflags/bradc/printstuff/version.goodstart
@@ -1 +1 @@
- version 2.2.0
+ version 2.2.0
\ No newline at end of file