Skip to content

Commit 7b77daa

Browse files
authored
update version numbers in advance of 2.1 release (#25324)
prepare for release of v2.1 by updating the official release flag and a few other places where version number has an impact, including documentation and testing. (#24588 demonstrates changes from last release cycle) TESTING: - [x] paratest `[Summary: #Successes = 17278 | #Failures = 0 | #Futures = 928]`
2 parents 916ca4c + ab285c8 commit 7b77daa

File tree

8 files changed

+15
-14
lines changed

8 files changed

+15
-14
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ set(CHPL_BUILD_VERSION 0)
4242

4343
# Flip this to 'true' when we're ready to roll out a release; then back
4444
# after branching
45-
set(CHPL_OFFICIAL_RELEASE false)
45+
set(CHPL_OFFICIAL_RELEASE true)
4646

4747
### END config.h version value setting - configured_prefix set below ###
4848

doc/rst/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ def setup(app):
8787
html_context = {"chplversion":chplversion}
8888

8989
# The full version, including alpha/beta/rc tags.
90-
release = '2.1.0 (pre-release)'
91-
#release = '2.1.0'
90+
#release = '2.1.0 (pre-release)'
91+
release = '2.1.0'
9292

9393
# General information about the project.
9494
project = u'Chapel Documentation'

doc/rst/language/archivedSpecs.rst

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Documentation Archives
55

66
Online Documentation Archives
77
-----------------------------
8+
* `Chapel 2.0 <https://chapel-lang.org/docs/2.0/index.html>`_
89
* `Chapel 1.33 <https://chapel-lang.org/docs/1.33/index.html>`_
910
* `Chapel 1.32 <https://chapel-lang.org/docs/1.32/index.html>`_
1011
* `Chapel 1.31 <https://chapel-lang.org/docs/1.31/index.html>`_

doc/rst/usingchapel/QUICKSTART.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ to :ref:`using-a-more-full-featured-chapel` below.
2121
packages you should have available to build and run Chapel.
2222

2323

24-
1) If you don't already have the Chapel 2.0 source release, see
24+
1) If you don't already have the Chapel 2.1 source release, see
2525
https://chapel-lang.org/download.html.
2626

2727

@@ -31,14 +31,14 @@ to :ref:`using-a-more-full-featured-chapel` below.
3131

3232
.. code-block:: bash
3333
34-
tar xzf chapel-2.0.0.tar.gz
34+
tar xzf chapel-2.1.0.tar.gz
3535
3636
b. Make sure that you are in the directory that was created when
3737
unpacking the source release, for example:
3838

3939
.. code-block:: bash
4040
41-
cd chapel-2.0.0
41+
cd chapel-2.1.0
4242
4343
c. Set up your environment for Chapel's Quickstart mode.
4444
If you are using a shell other than ``bash`` or ``zsh``,

doc/rst/usingchapel/chplenv.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CHPL_HOME
3737

3838
.. code-block:: sh
3939
40-
export CHPL_HOME=~/chapel-2.0.0
40+
export CHPL_HOME=~/chapel-2.1.0
4141
4242
.. note::
4343
This, and all other examples in the Chapel documentation, assumes you're

man/confchpl.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
:Version: 2.1 pre-release
2+
:Version: 2.1
33
:Manual section: 1
44
:Title: \\fBchpl\\fP
55
:Subtitle: Compiler for the Chapel Programming Language

test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ compiler=$3
55
echo -n `basename $compiler`
66
cat $CWD/../../../compflags/bradc/printstuff/version.goodstart
77
# During pre-release mode
8-
diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
9-
{ echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
8+
# diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
9+
# { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
1010
# During release mode:
11-
# echo ""
11+
echo ""
1212

1313
# print Sphinx and chapeldomain versions
1414
python=$($CWD/../../../../util/config/find-python.sh)

test/compflags/bradc/printstuff/versionhelp.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ compiler=$3
55
echo -n `basename $compiler`
66
cat $CWD/version.goodstart
77
# During pre-release mode
8-
diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
9-
{ echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
8+
# diff $CWD/../../../../compiler/main/BUILD_VERSION $CWD/zero.txt > /dev/null 2>&1 && echo "" || \
9+
# { echo -n " pre-release (" && cat $CWD/../../../../compiler/main/BUILD_VERSION | tr -d \"\\n && echo ")" ; }
1010
# During release mode:
11-
# echo ""
11+
echo ""
1212

1313
if [ "$CHPL_LLVM" != "none" ]
1414
then

0 commit comments

Comments
 (0)