From fd7b431297c45b2d520225247c6bd80ded0fcf7c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 30 Jun 2014 19:26:55 +0200 Subject: [PATCH 1/7] Bumped version number to 0.0.3 --- CMakeLists.txt | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8736a4242..0253dd5ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # GNSS-SDR is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or -# at your option) any later version. +# (at your option) any later version. # # GNSS-SDR is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -30,25 +30,9 @@ project(gnss-sdr CXX C) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) # Set the version information here -# 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(VERSION_INFO_MAJOR_VERSION 0) set(VERSION_INFO_API_COMPAT 0) -set(VERSION_INFO_MINOR_VERSION 2.git-${GIT_BRANCH}-${GIT_COMMIT_HASH}) +set(VERSION_INFO_MINOR_VERSION 3) set(VERSION ${VERSION_INFO_MAJOR_VERSION}.${VERSION_INFO_API_COMPAT}.${VERSION_INFO_MINOR_VERSION}) file(RELATIVE_PATH RELATIVE_CMAKE_CALL ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) From f6c938498e020f632ba07cf55fd37e1fd7b44698 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 30 Jun 2014 19:35:24 +0200 Subject: [PATCH 2/7] Adding GNSS-SDR version number to the welcome message of the configuration process --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0253dd5ce..e04e58871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,7 +129,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(LINUX_DISTRIBUTION "Generic") set(LINUX_VER "Unknown") endif(NOT LINUX_DISTRIBUTION) - message(STATUS "Configuring GNSS-SDR to be built on ${LINUX_DISTRIBUTION} GNU/Linux Release ${LINUX_VER} ${ARCH_}") + message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on ${LINUX_DISTRIBUTION} GNU/Linux Release ${LINUX_VER} ${ARCH_}") endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") # Detect Mac OS X Version From 63626658cb7c2294f2835c2329ba31c31170df85 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 30 Jun 2014 20:03:23 +0200 Subject: [PATCH 3/7] Adding GNSS-SDR version number to the configuration welcome message --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e04e58871..cf9d1bcda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,16 +143,16 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11") set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION="com.apple.compilers.llvm.clang.1_0") - message(STATUS "Configuring GNSS-SDR to be built on Mac OS X 10.9 Mavericks") + message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.9 Mavericks") endif(${DARWIN_VERSION} MATCHES "13") if(${DARWIN_VERSION} MATCHES "12") - message(STATUS "Configuring GNSS-SDR to be built on Mac OS X 10.8 Mountain Lion") + message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.8 Mountain Lion") endif(${DARWIN_VERSION} MATCHES "12") if(${DARWIN_VERSION} MATCHES "11") - message(STATUS "Configuring GNSS-SDR to be built on Mac OS X 10.7 Lion") + message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.7 Lion") endif(${DARWIN_VERSION} MATCHES "11") if(${DARWIN_VERSION} MATCHES "10") - message(STATUS "Configuring GNSS-SDR to be built on Mac OS X 10.6 Snow Leopard") + message(STATUS "Configuring GNSS-SDR v${VERSION} to be built on Mac OS X 10.6 Snow Leopard") endif(${DARWIN_VERSION} MATCHES "10") endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") From 490879c33a5aa39e255d1f4c414872f95cfc7bfc Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 30 Jun 2014 21:59:48 +0200 Subject: [PATCH 4/7] Adding Digital Object Identifier (DOI) from zenodo.org, making the code citable --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f6b0ed6d4..16f52f9d7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ![](./docs/doxygen/images/gnss-sdr_logo.png) +[![DOI 10.5281/zenodo.10708](https://zenodo.org/badge/4043/gnss-sdr/gnss-sdr.png)](http://dx.doi.org/10.5281/zenodo.10708) + **Welcome to GNSS-SDR!** Visit [gnss-sdr.org](http://gnss-sdr.org "GNSS-SDR's Homepage") for more information about this open source GNSS software defined receiver. From 941b4a2bfe96ad8557269b247d4b70442dda041d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 8 Sep 2014 16:00:46 +0200 Subject: [PATCH 5/7] Bump version number --- CMakeLists.txt | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fa4050f1..b31b4b4ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,32 +42,13 @@ option(ENABLE_GPERFTOOLS "Enable linking to Gperftools libraries (tcmalloc and p option(ENABLE_GENERIC_ARCH "Builds a portable binary" OFF) -############################### -# 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 the version information here set(VERSION_INFO_MAJOR_VERSION 0) -set(VERSION_INFO_API_COMPAT 0) -set(VERSION_INFO_MINOR_VERSION 3.git-${GIT_BRANCH}-${GIT_COMMIT_HASH}) +set(VERSION_INFO_API_COMPAT 0) +set(VERSION_INFO_MINOR_VERSION 4) set(VERSION ${VERSION_INFO_MAJOR_VERSION}.${VERSION_INFO_API_COMPAT}.${VERSION_INFO_MINOR_VERSION}) - ######################################################################## # Environment setup ######################################################################## From 89a87561464ae63619d19e43aeda8b21739d4cd0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 8 Sep 2014 16:20:52 +0200 Subject: [PATCH 6/7] Removing old DOI --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 6af1d6023..7ed96219e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ ![](./docs/doxygen/images/gnss-sdr_logo.png) -[![DOI 10.5281/zenodo.10708](https://zenodo.org/badge/4043/gnss-sdr/gnss-sdr.png)](http://dx.doi.org/10.5281/zenodo.10708) **Welcome to GNSS-SDR!** From 347dceb136bfc45bacf2304037dcf53300df19b1 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 8 Sep 2014 16:31:29 +0200 Subject: [PATCH 7/7] Adding new DOI --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7ed96219e..9d71ae147 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ![](./docs/doxygen/images/gnss-sdr_logo.png) +[![DOI 10.5281/zenodo.11628](https://zenodo.org/badge/doi/10.5281/zenodo.11628.png)](http://dx.doi.org/10.5281/zenodo.11628) **Welcome to GNSS-SDR!**