From f783bf3d4c911e7f419bbfe9d5a2d7d9a04b05fc Mon Sep 17 00:00:00 2001 From: weefuzzy Date: Mon, 15 Nov 2021 23:49:02 +0000 Subject: [PATCH 1/2] Include SHAs for flucoma-core and current project in version string --- script/flucoma_version.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/script/flucoma_version.cmake b/script/flucoma_version.cmake index b7b324f1c..16e7d977d 100644 --- a/script/flucoma_version.cmake +++ b/script/flucoma_version.cmake @@ -10,6 +10,19 @@ include_guard() find_package(Git REQUIRED) +macro(getsha workingDir varName) + execute_process( + COMMAND ${GIT_EXECUTABLE} log -1 --format=%h + WORKING_DIRECTORY ${${workingDir}} + OUTPUT_VARIABLE ${varName} + # ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +endmacro() + +getSha(CMAKE_CURRENT_LIST_DIR FLUID_CORE_SHA) +getSha(CMAKE_CURRENT_SOURCE_DIR FLUID_VERSION_SHA) + execute_process( COMMAND ${GIT_EXECUTABLE} describe --abbrev=0 --always WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} @@ -19,6 +32,8 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) +set(FLUID_VERSION_TAG "${FLUID_VERSION_TAG}-${FLUID_VERSION_SHA} (core: ${FLUID_CORE_SHA})") + if(result) message(VERBOSE "Failed to get version string from Git, falling back to indexed header") else() From 1a36207dbee368a4964af7585e145b6f8366e66f Mon Sep 17 00:00:00 2001 From: weefuzzy Date: Mon, 15 Nov 2021 23:56:02 +0000 Subject: [PATCH 2/2] Conform version string with SHAs to semantic versioning spec --- script/flucoma_version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/flucoma_version.cmake b/script/flucoma_version.cmake index 16e7d977d..88fc8e5a5 100644 --- a/script/flucoma_version.cmake +++ b/script/flucoma_version.cmake @@ -32,7 +32,7 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) -set(FLUID_VERSION_TAG "${FLUID_VERSION_TAG}-${FLUID_VERSION_SHA} (core: ${FLUID_CORE_SHA})") +set(FLUID_VERSION_TAG "${FLUID_VERSION_TAG}+sha.${FLUID_VERSION_SHA}.core.sha.${FLUID_CORE_SHA}") if(result) message(VERBOSE "Failed to get version string from Git, falling back to indexed header")