Skip to content
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.

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

cmake: Improve source hash calculation #3356

Merged
merged 4 commits into from
Sep 1, 2020

Conversation

ktrzcinx
Copy link
Member

.git folder should be looked for in SOF_ROOT_SOURCE_DIRECTORY. Moreover addressed @marc-hb suggestions from #3195 (comment)

This message shoulddn't be in imperative mode, to follow rules.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
This is possible location of .git folder, instead of CMAKE_SOURCE_DIR.
Without this patch, checked condition always return false and
GIT_LOG_HASH is used instead source code hash.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
Temporary files are useful to understand and debug the build.
Moving output to another directory, keeps binary directory clean.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
@ktrzcinx ktrzcinx requested a review from jajanusz as a code owner August 27, 2020 10:10
@ktrzcinx ktrzcinx mentioned this pull request Aug 27, 2020
@ktrzcinx ktrzcinx changed the title cmake: Improce source hash calculation cmake: Improve source hash calculation Aug 27, 2020
@lgirdwood
Copy link
Member

@marc-hb good for you ?

SOF_SRC_HASH always must have integer value, because of usage
them to initialize global variable in source code.
Variables, which may be empty should be used inside quotation
to prevent cmake incorect number of arguments error.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
@lgirdwood
Copy link
Member

Jenkins known CI issues on ICL unrelated.

@lgirdwood lgirdwood merged commit b2a325a into thesofproject:master Sep 1, 2020
@marc-hb marc-hb added bug Something isn't working as expected logger Dictionary and logger labels Mar 3, 2021
string(SUBSTRING ${SOF_SRC_HASH_LONG} 0 8 SOF_SRC_HASH)
message(STATUS "Source content hash: ${SOF_SRC_HASH}")
else()
string(SUBSTRING ${GIT_LOG_HASH} 0 8 SOF_SRC_HASH)
message(WARNING "Source content hash can't be calculated, use GIT_LOG_HASH")
if("${GIT_LOG_HASH}")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is broken, fix submitted in PR #5129

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working as expected logger Dictionary and logger
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants