Updating APEX version

CMakeLists.txt

@@ -9,6 +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 3 CACHE STRING "APEX Minor 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)

src/apex/CMakeLists.hpx

@@ -19,6 +19,7 @@ hpx_info("apex" "Will build APEX")
 
 set (APEX_VERSION_MAJOR 2)
 set (APEX_VERSION_MINOR 3)
+set (APEX_VERSION_PATCH 1)
 
 if (NOT APEX_ROOT)
   if (EXISTS ${HPX_SOURCE_DIR}/apex)

src/apex/apex.cpp

@@ -204,7 +204,9 @@ void apex::_initialize()
 #if defined (GIT_TAG)
     tmp << GIT_TAG;
 #else
-    tmp << APEX_VERSION_MAJOR + (APEX_VERSION_MINOR/10.0);
+    tmp << APEX_VERSION_MAJOR << "."
+        << APEX_VERSION_MINOR << "."
+        << APEX_VERSION_PATCH;
 #endif
 #if defined (GIT_COMMIT_HASH)
     tmp << "-" << GIT_COMMIT_HASH ;

src/scripts/make_release.txt

@@ -1,3 +1,13 @@
+0) Update develop and master, merge develop into master
+
+update the version number in CMakeLists.txt, src/apex/CMakeLists.hpx and docs/Doxyfile.in
+
+git checkout develop
+git pull
+git checkout master
+git pull
+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