From b6acd66cfef339580a981ca583de7a8f1b14770b Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Thu, 29 Sep 2022 05:20:39 -0400 Subject: [PATCH] set version to 2022.09.1 Starting with this release we will no longer use "unknown" as the default software version string used in cases where the version cannot be determined from context. Instead we commit the release version string to git so that any software built from the tagged commit will have the appropriate release version string. After the release we will commit a post-release version string as the new default. We will continue to use the commit hash as version string when the software is built inside a git repository. --- firmware/hackrf-common.cmake | 3 +-- host/cmake/set_release.cmake | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/firmware/hackrf-common.cmake b/firmware/hackrf-common.cmake index 6d7b0b58d..7728473f1 100644 --- a/firmware/hackrf-common.cmake +++ b/firmware/hackrf-common.cmake @@ -52,7 +52,6 @@ ExternalProject_Add(libopencm3_${PROJECT_NAME} INSTALL_COMMAND "" ) -#set(VERSION "") if (NOT DEFINED VERSION) execute_process( COMMAND git log -n 1 --format=%h @@ -63,7 +62,7 @@ if (NOT DEFINED VERSION) OUTPUT_STRIP_TRAILING_WHITESPACE ) if (GIT_VERSION_FOUND) - set(VERSION "unknown") + set(VERSION "2022.09.1") else (GIT_VERSION_FOUND) set(VERSION "git-${GIT_VERSION}") endif (GIT_VERSION_FOUND) diff --git a/host/cmake/set_release.cmake b/host/cmake/set_release.cmake index 875808f96..309763524 100644 --- a/host/cmake/set_release.cmake +++ b/host/cmake/set_release.cmake @@ -1,5 +1,3 @@ -#set(RELEASE "") - if(NOT DEFINED RELEASE) execute_process( COMMAND git log -n 1 --format=%h @@ -10,7 +8,7 @@ if(NOT DEFINED RELEASE) OUTPUT_STRIP_TRAILING_WHITESPACE ) if (GIT_EXIT_VALUE) - set(RELEASE "unknown") + set(RELEASE "2022.09.1") else (GIT_EXIT_VALUE) execute_process( COMMAND git status -s --untracked-files=no