michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Support ZEPHYR_BASE to be a git submodule

Browse source 
In 9170977 build-time version header generation was added. The test
for .git assumes this file to be a directory. In the case of git
submodules, .git is a regular file that in its contents points to
the actual git database for the submodule. This is a way to have
symlink like behaviour even on file systems that do not support
themselves support symlinks.

This consults git as to what the correct git database directory is,
in case the .git file is indeed a regular file, and adjusts the
git_dependency variable accordingly.

Fixes #43503

Signed-off-by: Frank Terbeck <ft@bewatermyfriend.org>
This commit is contained in:
Frank Terbeck 2022-03-08 20:09:51 +01:00 • committed by Marti Bolivar
commit a85a76d8c0
1 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

45
CMakeLists.txt
View file

@ -431,12 +431,47 @@ endif()
if(DEFINED BUILD_VERSION) if(DEFINED BUILD_VERSION)
set(build_version_argument "-DBUILD_VERSION=${BUILD_VERSION}") set(build_version_argument "-DBUILD_VERSION=${BUILD_VERSION}")
elseif(EXISTS ${ZEPHYR_BASE}/.git/index) elseif(NOT ZEPHYR_GIT_INDEX)
set(git_dependency ${ZEPHYR_BASE}/.git/index) set(ZEPHYR_GIT_INDEX ZEPHYR_GIT_INDEX-NOTFOUND CACHE PATH
else() "Path to Zephyr git repository index file")
message(WARNING "ZEPHYR_BASE=${ZEPHYR_BASE} doesn't appear to be a git " if(EXISTS ${ZEPHYR_BASE}/.git/index)
"repository, please specify '-DBUILD_VERSION=<version>'") set(ZEPHYR_GIT_DIR ${ZEPHYR_BASE}/.git/index CACHE PATH
"Path to Zephyr git repository index file" FORCE)
elseif(EXISTS ${ZEPHYR_BASE}/.git)
# Likely a git-submodule. Let's ask git where the real database is located.
find_package(Git QUIET)
if(GIT_FOUND)
execute_process(
COMMAND ${GIT_EXECUTABLE} rev-parse --absolute-git-dir
WORKING_DIRECTORY ${ZEPHYR_BASE}
OUTPUT_VARIABLE zephyr_git_dir
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE
ERROR_VARIABLE stderr
RESULT_VARIABLE return_code)
if(return_code)
message(WARNING "BUILD_VERSION: git rev-parse failed: ${stderr}")
else()
if(NOT "${stderr}" STREQUAL "")
message(WARNING "BUILD_VERSION: git rev-parse warned: ${stderr}")
endif()
set(ZEPHYR_GIT_INDEX ${zephyr_git_dir}/index CACHE PATH
"Path to Zephyr git repository index file" FORCE)
endif()
else()
message(WARNING "Could not find git installation, "
"please specify '-DBUILD_VERSION=<version>'")
endif()
else()
message(WARNING "ZEPHYR_BASE=${ZEPHYR_BASE} doesn't appear to be a git "
"repository, please specify '-DBUILD_VERSION=<version>'")
endif()
endif() endif()
if(ZEPHYR_GIT_INDEX)
set(git_dependency ${ZEPHYR_GIT_INDEX})
endif()
add_custom_command( add_custom_command(
OUTPUT ${PROJECT_BINARY_DIR}/include/generated/version.h OUTPUT ${PROJECT_BINARY_DIR}/include/generated/version.h
COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE} COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}