From 787a5ebf981e2b336bf2a75cb919a826cd93fc79 Mon Sep 17 00:00:00 2001 From: Tim Zinsky Date: Tue, 17 Sep 2024 15:32:51 -0500 Subject: [PATCH 1/2] Version number update for 2.2 release This PR updates the Chapel tree for the official 2.2 release by updating the offical release flag and documentation variables. Signed-off-by: Tim Zinsky --- CMakeLists.txt | 2 +- doc/rst/conf.py | 4 ++-- doc/rst/language/archivedSpecs.rst | 1 + doc/rst/usingchapel/QUICKSTART.rst | 6 +++--- doc/rst/usingchapel/chplenv.rst | 2 +- man/confchpl.rst | 2 +- man/confchpldoc.rst | 2 +- test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh | 6 +++--- test/compflags/bradc/printstuff/versionhelp.sh | 6 +++--- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 153d05c8173a..b11b31b6bca4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ 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 false) +set(CHPL_OFFICIAL_RELEASE true) ### END config.h version value setting - configured_prefix set below ### diff --git a/doc/rst/conf.py b/doc/rst/conf.py index 1829459811fe..26164bdbb5f2 100644 --- a/doc/rst/conf.py +++ b/doc/rst/conf.py @@ -87,8 +87,8 @@ def setup(app): html_context = {"chplversion":chplversion} # The full version, including alpha/beta/rc tags. -release = '2.2.0 (pre-release)' -#release = '2.2.0' +#release = '2.2.0 (pre-release)' +release = '2.2.0' # General information about the project. project = u'Chapel Documentation' diff --git a/doc/rst/language/archivedSpecs.rst b/doc/rst/language/archivedSpecs.rst index b6ce3f413d04..d8e040718bc4 100644 --- a/doc/rst/language/archivedSpecs.rst +++ b/doc/rst/language/archivedSpecs.rst @@ -5,6 +5,7 @@ Documentation Archives Online Documentation Archives ----------------------------- +* `Chapel 2.1 `_ * `Chapel 2.0 `_ * `Chapel 1.33 `_ * `Chapel 1.32 `_ diff --git a/doc/rst/usingchapel/QUICKSTART.rst b/doc/rst/usingchapel/QUICKSTART.rst index 3bf5c2e5a556..7fa9808ef95e 100644 --- a/doc/rst/usingchapel/QUICKSTART.rst +++ b/doc/rst/usingchapel/QUICKSTART.rst @@ -21,7 +21,7 @@ to :ref:`using-a-more-full-featured-chapel` below. packages you should have available to build and run Chapel. -1) If you don't already have the Chapel 2.1 source release, see +1) If you don't already have the Chapel 2.2 source release, see https://chapel-lang.org/download.html. @@ -31,14 +31,14 @@ to :ref:`using-a-more-full-featured-chapel` below. .. code-block:: bash - tar xzf chapel-2.1.0.tar.gz + tar xzf chapel-2.2.0.tar.gz b. Make sure that you are in the directory that was created when unpacking the source release, for example: .. code-block:: bash - cd chapel-2.1.0 + cd chapel-2.2.0 c. Set up your environment for Chapel's Quickstart mode. If you are using a shell other than ``bash`` or ``zsh``, diff --git a/doc/rst/usingchapel/chplenv.rst b/doc/rst/usingchapel/chplenv.rst index 117aea978c79..0fc6c54e253b 100644 --- a/doc/rst/usingchapel/chplenv.rst +++ b/doc/rst/usingchapel/chplenv.rst @@ -37,7 +37,7 @@ CHPL_HOME .. code-block:: sh - export CHPL_HOME=~/chapel-2.1.0 + export CHPL_HOME=~/chapel-2.2.0 .. note:: This, and all other examples in the Chapel documentation, assumes you're diff --git a/man/confchpl.rst b/man/confchpl.rst index e028bf661389..40840eed694b 100644 --- a/man/confchpl.rst +++ b/man/confchpl.rst @@ -1,5 +1,5 @@ -:Version: 2.2 pre-release +:Version: 2.2 :Manual section: 1 :Title: \\fBchpl\\fP :Subtitle: Compiler for the Chapel Programming Language diff --git a/man/confchpldoc.rst b/man/confchpldoc.rst index 0506c79d69a5..92fee8259ae6 100644 --- a/man/confchpldoc.rst +++ b/man/confchpldoc.rst @@ -1,5 +1,5 @@ -:Version: 2.2 pre-release +:Version: 2.2 :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 3fe81cda7fe1..2d14e3592222 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/versionhelp.sh b/test/compflags/bradc/printstuff/versionhelp.sh index f4bf76583f25..9cd9ccab8a78 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 98239d55ddf81a84d13a4d564caf10c5075318c6 Mon Sep 17 00:00:00 2001 From: Tim Zinsky Date: Tue, 17 Sep 2024 22:48:24 -0500 Subject: [PATCH 2/2] Fix versionhelp.sh comment for release mode Signed-off-by: Tim Zinsky --- test/compflags/bradc/printstuff/versionhelp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/compflags/bradc/printstuff/versionhelp.sh b/test/compflags/bradc/printstuff/versionhelp.sh index 9cd9ccab8a78..5d55c06d2caf 100755 --- a/test/compflags/bradc/printstuff/versionhelp.sh +++ b/test/compflags/bradc/printstuff/versionhelp.sh @@ -6,7 +6,7 @@ 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 ")" ; } +# { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; } # During release mode: echo ""