From 3b3eb45499b442e607e12402ba7525c0c1530797 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 13 Jan 2015 11:11:23 +0100 Subject: [PATCH] version update --- CMakeLists.txt | 39 +++++++++++++++++++++++---------------- src/main/main.cc | 2 +- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f7a9e0bd..aede3be3c 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 -) +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 -) + # 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 da71cb9af..4382d89e9 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