OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

version.cmake: do not discard stderr from git commands 

Never discard stderr.

Also fix my older, misleading comment and add a warning.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2021-03-31 19:57:25 +00:00 committed by Liam Girdwood
parent 9d78c35de9
commit b5219d844c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/cmake/version.cmake
View File

@ -23,24 +23,24 @@ if(EXISTS ${TARBALL_VERSION_SOURCE_PATH})
list(GET lines 1 GIT_LOG_HASH) list(GET lines 1 GIT_LOG_HASH)
message(STATUS "Found ${TARBALL_VERSION_FILE_NAME}") message(STATUS "Found ${TARBALL_VERSION_FILE_NAME}")
else() else()
# execute_process() errors are not fatal by default!
execute_process( execute_process(
COMMAND git describe --tags --abbrev=12 --match v* --dirty COMMAND git describe --tags --abbrev=12 --match v* --dirty
WORKING_DIRECTORY ${SOF_ROOT_SOURCE_DIRECTORY} WORKING_DIRECTORY ${SOF_ROOT_SOURCE_DIRECTORY}
OUTPUT_VARIABLE GIT_TAG OUTPUT_VARIABLE GIT_TAG
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
) )
execute_process(COMMAND git log --pretty=format:%h -1 execute_process(COMMAND git log --pretty=format:%h -1
WORKING_DIRECTORY ${SOF_ROOT_SOURCE_DIRECTORY} WORKING_DIRECTORY ${SOF_ROOT_SOURCE_DIRECTORY}
OUTPUT_VARIABLE GIT_LOG_HASH OUTPUT_VARIABLE GIT_LOG_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
) )
endif() endif()
# We have ERROR_QUIET above so git issues are not fatal
if(NOT GIT_TAG MATCHES "^v") if(NOT GIT_TAG MATCHES "^v")
message(WARNING
"git describe found ${GIT_TAG} / nothing starting with 'v'. Shallow clone?")
set(GIT_TAG "v0.0-0-g0000") set(GIT_TAG "v0.0-0-g0000")
endif() endif()