Skip to content

Commit

Permalink
Updating version number
Browse files Browse the repository at this point in the history
  • Loading branch information
khuck committed Apr 25, 2022
1 parent fda7eff commit 493a012
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ project (APEX CXX C)
set (APEX_DESCRIPTION "Autonomic Performance Environment for eXascale" CACHE STRING "APEX project description")
set (APEX_VERSION_MAJOR 2 CACHE STRING "APEX Major Version")
set (APEX_VERSION_MINOR 5 CACHE STRING "APEX Minor Version")
set (APEX_VERSION_PATCH "alpha" CACHE STRING "APEX Patch Version")
set (APEX_VERSION_PATCH 1 CACHE STRING "APEX Patch Version")
set (APEX_HOMEPAGE_URL "http://github.com/khuck/xpress-apex" CACHE STRING "APEX homepage URL")

cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "Autonomic Performance Environment for eXascale (APEX)"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 2.5.0
PROJECT_NUMBER = 2.5.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion src/apex/CMakeLists.hpx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ hpx_info("apex" "Will build APEX")

set (APEX_VERSION_MAJOR 2)
set (APEX_VERSION_MINOR 5)
set (APEX_VERSION_PATCH "alpha")
set (APEX_VERSION_PATCH 1)

if (NOT APEX_ROOT)
if (EXISTS ${HPX_SOURCE_DIR}/apex)
Expand Down
4 changes: 2 additions & 2 deletions src/scripts/make_release.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
0) Update develop and master, merge develop into master

update the version number in CMakeLists.txt, src/apex/CMakeLists.hpx and docs/Doxyfile.in
update the version number in CMakeLists.txt, src/apex/CMakeLists.hpx and doc/Doxyfile.in

git checkout develop
git pull
Expand All @@ -10,7 +10,7 @@ git merge develop

1) Generate a changelog from the last tag:

git log $(git describe --tags --abbrev=0)..HEAD --pretty=format:'<li> <a href="http://github.com/khuck/xpress-apex/commit/%H">view commit &bull;</a> %s</li> ' --reverse > changelog.txt
git log $(git describe --tags --abbrev=0)..HEAD --pretty=format:'<li> <a href="http://github.com/UO-OACISS/apex/commit/%H">view commit &bull;</a> %s</li> ' --reverse > changelog.txt

2) create a new tag

Expand Down

0 comments on commit 493a012

Please sign in to comment.