summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-12-19 15:32:53 +0100
committerMaksim Denisov <denisov.maksim@huawei.com>2024-12-19 15:39:21 +0100
commitfbff0ddfb6c4c68593765d5e23e8b864e2c32538 (patch)
tree7a0cfd96816844ac053b66843d13461d365bcd52
parent821f56dc989e4e5174dce11e25f62fb42e2cff86 (diff)
downloadjustbuild-fbff0ddfb6c4c68593765d5e23e8b864e2c32538.tar.gz
JustMr: update output config for computed roots
-rw-r--r--src/other_tools/repo_map/repos_to_setup_map.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp
index 87dd7812..1470297b 100644
--- a/src/other_tools/repo_map/repos_to_setup_map.cpp
+++ b/src/other_tools/repo_map/repos_to_setup_map.cpp
@@ -637,6 +637,7 @@ void GitTreeCheckout(ExpressionPtr const& repo_desc,
}
void ComputedRootCheckout(ExpressionPtr const& repo_desc,
+ ExpressionPtr&& repos,
std::string const& repo_name,
ReposToSetupMap::SetterPtr const& setter,
ReposToSetupMap::SubCallerPtr const& subcaller,
@@ -661,9 +662,14 @@ void ComputedRootCheckout(ExpressionPtr const& repo_desc,
std::string target_repo = result_root->repository;
(*subcaller)(
{std::move(target_repo)},
- [setter, result = *std::move(result_root)](auto const& /*unused*/) {
+ [setter,
+ repos = std::move(repos),
+ repo_name,
+ result = *std::move(result_root)](auto const& /*unused*/) {
nlohmann::json cfg{};
auto& ws_root = cfg["workspace_root"];
+ SetReposTakeOver(&cfg, repos, repo_name);
+
ws_root.push_back("computed");
ws_root.push_back(result.repository);
ws_root.push_back(result.target_module);
@@ -861,6 +867,7 @@ auto CreateReposToSetupMap(
}
case CheckoutType::Computed: {
ComputedRootCheckout(*resolved_repo_desc,
+ std::move(repos),
key,
setter,
subcaller,