[hamradio-commits] [gnss-sdr] 24/27: version update

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit 3b3eb45499b442e607e12402ba7525c0c1530797
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Jan 13 11:11:23 2015 +0100

    version update
---
 CMakeLists.txt   | 41 ++++++++++++++++++++++++-----------------
 src/main/main.cc |  2 +-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f7a9e0..aede3be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,27 +52,34 @@ endif(ENABLE_PACKAGING)
 ###############################
 # GNSS-SDR version information 
 ###############################
-# Get the current working branch
-execute_process(
-    COMMAND git rev-parse --abbrev-ref HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-# Get the latest abbreviated commit hash of the working branch
-execute_process(
-    COMMAND git log -1 --format=%h
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_COMMIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+set(THIS_IS_A_RELEASE ON)   # only related to version name, no further implications. 
+if(NOT ${THIS_IS_A_RELEASE})
+    # Get the current working branch
+    execute_process(
+        COMMAND git rev-parse --abbrev-ref HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_BRANCH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    # Get the latest abbreviated commit hash of the working branch
+    execute_process(
+        COMMAND git log -1 --format=%h
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE GIT_COMMIT_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+endif(NOT ${THIS_IS_A_RELEASE})
 
 set(VERSION_INFO_MAJOR_VERSION 0)
 set(VERSION_INFO_API_COMPAT    0)
-set(VERSION_INFO_MINOR_VERSION 4.git-${GIT_BRANCH}-${GIT_COMMIT_HASH})
-set(VERSION ${VERSION_INFO_MAJOR_VERSION}.${VERSION_INFO_API_COMPAT}.${VERSION_INFO_MINOR_VERSION})
+if(${THIS_IS_A_RELEASE})
+    set(VERSION_INFO_MINOR_VERSION 5)
+else(${THIS_IS_A_RELEASE})
+    set(VERSION_INFO_MINOR_VERSION 4.git-${GIT_BRANCH}-${GIT_COMMIT_HASH})
+endif(${THIS_IS_A_RELEASE})
 
+set(VERSION ${VERSION_INFO_MAJOR_VERSION}.${VERSION_INFO_API_COMPAT}.${VERSION_INFO_MINOR_VERSION})
 
 
 ########################################################################
diff --git a/src/main/main.cc b/src/main/main.cc
index da71cb9..4382d89 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -31,7 +31,7 @@
 * -------------------------------------------------------------------------
 */
 #ifndef GNSS_SDR_VERSION
-#define GNSS_SDR_VERSION "0.0.4"
+#define GNSS_SDR_VERSION "0.0.5"
 #endif
 
 #include <ctime>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git