Amend platform repo paths with version specific path#9503
Merged
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
|
||
| // 2. XDG data path ($HOME/.local/share) is also a candidate | ||
| if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg) | ||
| if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg) { |
Contributor
There was a problem hiding this comment.
warning: function is not thread safe [concurrency-mt-unsafe]
if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg) {
^| // 2. XDG data path ($HOME/.local/share) is also a candidate | ||
| if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg) | ||
| if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg) { | ||
| paths.push_back(sfs::path(xdg) / xrt / XRT_VERSION_STRING); |
Contributor
There was a problem hiding this comment.
warning: use of undeclared identifier 'XRT_VERSION_STRING' [clang-diagnostic-error]
paths.push_back(sfs::path(xdg) / xrt / XRT_VERSION_STRING);
^| paths.push_back(sfs::path(xdg) / "xrt"); | ||
| else if (const char* home = std::getenv("HOME"); home && *home) | ||
| } | ||
| else if (const char* home = std::getenv("HOME"); home && *home) { |
Contributor
There was a problem hiding this comment.
warning: function is not thread safe [concurrency-mt-unsafe]
else if (const char* home = std::getenv("HOME"); home && *home) {
^| else if (const char* home = std::getenv("HOME"); home && *home) | ||
| } | ||
| else if (const char* home = std::getenv("HOME"); home && *home) { | ||
| paths.push_back(sfs::path(home) / ".local/share/xrt" / XRT_VERSION_STRING); |
Contributor
There was a problem hiding this comment.
warning: use of undeclared identifier 'XRT_VERSION_STRING' [clang-diagnostic-error]
paths.push_back(sfs::path(home) / ".local/share/xrt" / XRT_VERSION_STRING);
^
Under XDG_DATA_DIR use XRT_VERSION_STRING for application data dir directory. Make sure version specific directory is searched prior to non-versioned directory. This is facilitating xrt-smi in its search for validation artifact archives, such that the search can be specific to an XRT version. Signed-off-by: Soren Soe <2106410+stsoe@users.noreply.github.com>
| @@ -14,6 +19,10 @@ | |||
| # error "XRT_INSTALL_PREFIX is undefined" | |||
Contributor
There was a problem hiding this comment.
warning: "XRT_INSTALL_PREFIX is undefined" [clang-diagnostic-error]
# error "XRT_INSTALL_PREFIX is undefined"
^| #endif | ||
|
|
||
| #ifndef XRT_VERSION_STRING | ||
| # error "XRT_VERSION_STRING is undefined" |
Contributor
There was a problem hiding this comment.
warning: "XRT_VERSION_STRING is undefined" [clang-diagnostic-error]
# error "XRT_VERSION_STRING is undefined"
^| @@ -29,11 +38,36 @@ xilinx_xrt() | |||
| if (std::string(info.dli_fname).find("libxrt_coreutil") == std::string::npos) | |||
| return sfs::path(XRT_INSTALL_PREFIX); | |||
Contributor
There was a problem hiding this comment.
warning: use of undeclared identifier 'XRT_INSTALL_PREFIX' [clang-diagnostic-error]
return sfs::path(XRT_INSTALL_PREFIX);
^| return so_path.parent_path().parent_path(); | ||
| } | ||
| catch (const std::exception&) { | ||
| return sfs::path(XRT_INSTALL_PREFIX); |
Contributor
There was a problem hiding this comment.
warning: use of undeclared identifier 'XRT_INSTALL_PREFIX' [clang-diagnostic-error]
return sfs::path(XRT_INSTALL_PREFIX);
^| // 2. XDG data path ($HOME/.local/share) is also a candidate | ||
| if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg) | ||
| if (const char* xdg = std::getenv("XDG_DATA_HOME"); xdg && *xdg) { | ||
| paths.push_back(sfs::path(xdg) / "xrt" / XRT_VERSION_STRING); |
Contributor
There was a problem hiding this comment.
warning: use of undeclared identifier 'XRT_VERSION_STRING' [clang-diagnostic-error]
paths.push_back(sfs::path(xdg) / "xrt" / XRT_VERSION_STRING);
^
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem solved by the commit
Under XDG_DATA_DIR use XRT_VERSION_STRING for application data dir directory. Make sure version specific directory is searched prior to non-versioned directory.
This is facilitating xrt-smi in its search for validation artifact archives, such that the search can be specific to an XRT version.