Skip to content

Commit

Permalink
Update Chapel versions to 2.2 pre-release (chapel-lang#25366)
Browse files Browse the repository at this point in the history
Update version numbers for the next Chapel release and ran printstuff to
verify results:

`[Test Summary - 240626.154334]
[Error matching compiler output for compflags/bradc/printstuff/version]
[Error matching compiler output for compflags/bradc/printstuff/zall]
[Error matching compiler output for
compflags/bradc/printstuff/zcopyvers]
[Error matching compiler output for
compflags/bradc/printstuff/zhelpvers]
[Error matching compiler output for
compflags/bradc/printstuff/zlicevers]
[Summary: #Successes = 5 | #Failures = 5 | #Futures = 0 | #Warnings = 0
]
[Summary: #Passing Suppressions = 0 | #Passing Futures = 0 ]
[END]`

New test run after updating versions and removing LF at the end of a
file:

`[Test Summary - 240626.174407]
[Summary: #Successes = 10 | #Failures = 0 | #Futures = 0 | #Warnings = 0
]
[Summary: #Passing Suppressions = 0 | #Passing Futures = 0 ]
[END]`
  • Loading branch information
tzinsky authored Jun 27, 2024
2 parents 68ed9b8 + a504e49 commit 60c0b8f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###

Expand Down
2 changes: 1 addition & 1 deletion man/confchpl.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

:Version: 2.1
:Version: 2.2 pre-release
:Manual section: 1
:Title: \\fBchpl\\fP
:Subtitle: Compiler for the Chapel Programming Language
2 changes: 1 addition & 1 deletion man/confchpldoc.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

:Version: 2.1 pre-release
:Version: 2.2 pre-release
:Manual section: 1
:Title: \\fBchpldoc\\fP
:Subtitle: the Chapel Documentation Tool
6 changes: 3 additions & 3 deletions test/chpldoc/compflags/combinations/versionhelp-chpldoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/compflags/bradc/printstuff/version.goodstart
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version 2.1.0
version 2.2.0
6 changes: 3 additions & 3 deletions test/compflags/bradc/printstuff/versionhelp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 60c0b8f

Please sign in to comment.