Skip to content

[WIP] scripts/cmake: update fw versioning process / git describe parsing #6952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dnikodem wants to merge 1 commit into from
Closed

[WIP] scripts/cmake: update fw versioning process / git describe parsing #6952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions scripts/cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,37 +52,42 @@ if(EXISTS ${TARBALL_VERSION_SOURCE_PATH})
message(STATUS "Found ${TARBALL_VERSION_SOURCE_PATH}")
else()
# execute_process() errors are not fatal by default!
execute_process(
COMMAND git describe --tags --abbrev=12 --match v* --dirty
execute_process(COMMAND git log --pretty=format:%h -1
WORKING_DIRECTORY ${SOF_ROOT_SOURCE_DIRECTORY}
OUTPUT_VARIABLE GIT_TAG
OUTPUT_VARIABLE GIT_LOG_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)

execute_process(COMMAND git log --pretty=format:%h -1
execute_process(
COMMAND git describe --tags ${GIT_LOG_HASH} --abbrev=12
WORKING_DIRECTORY ${SOF_ROOT_SOURCE_DIRECTORY}
OUTPUT_VARIABLE GIT_LOG_HASH
OUTPUT_VARIABLE GIT_TAG
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()

if(NOT GIT_TAG MATCHES "^v")
if(NOT GIT_TAG)
message(WARNING
"git describe found ${GIT_TAG} / nothing starting with 'v'. Shallow clone?")
set(GIT_TAG "v0.0-0-g0000")
endif()

message(STATUS "GIT_TAG / GIT_LOG_HASH : ${GIT_TAG} / ${GIT_LOG_HASH}")
string(REGEX MATCH "v([0-9]+).?([0-9])[\.]?((-hotfix|-rc)?([0-9]+))?-?(([0-9]+))?" ignored "${GIT_TAG}")

string(REGEX MATCH "^v([0-9]+)[.]([0-9]+)([.]([0-9]+))?" ignored "${GIT_TAG}")
set(SOF_MAJOR ${CMAKE_MATCH_1})
set(SOF_MINOR ${CMAKE_MATCH_2})
set(SOF_MICRO ${CMAKE_MATCH_4})
set(SOF_MICRO ${CMAKE_MATCH_5})
set(SOF_BUILD ${CMAKE_MATCH_7})

if(NOT SOF_MICRO MATCHES "^[0-9]+$")
set(SOF_MICRO 0)
endif()

if(NOT SOF_BUILD MATCHES "^[0-9]+$")
set(SOF_BUILD 0)
endif()

string(SUBSTRING "${GIT_LOG_HASH}" 0 5 SOF_TAG)
if(NOT SOF_TAG)
set(SOF_TAG 0)
Expand Down Expand Up @@ -140,9 +145,6 @@ source content hash cannot computed for the .ldc. Using SOF_SRC_HASH=${SOF_SRC_H
from GIT_LOG_HASH instead")
endif()

# for SOF_BUILD
include(${CMAKE_CURRENT_LIST_DIR}/version-build-counter.cmake)

# (Re)-generate "${VERSION_H_PATH}" but overwrite the old one only if
# different to avoid a full rebuild. TODO: check how Zephyr solves this
# problem, see Zephyr commit 91709778a4878c
Expand Down