Skip to content

RPC: Clear RTE Projects on ConvertSolution and LoadSolution #2486

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.

Sign up for GitHub

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

Merged
edriouk merged 3 commits into from
May 21, 2026
Merged

RPC: Clear RTE Projects on ConvertSolution and LoadSolution #2486

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b05eda1
RPC: Clear RTE Projects on ConvertSolution and LoadSolution
edriouk May 21, 2026
230ed29
Merge branch 'main' into ClearModelOnSolutionLoad
edriouk May 21, 2026
4c8b12a
Potential fix for pull request finding
edriouk May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion tools/projmgr/src/ProjMgrRpcServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ RpcArgs::SuccessResult RpcHandler::LoadPacks(void) {
RpcArgs::SuccessResult result = {false};
m_manager.Clear();
m_solutionLoaded = false;
// clear project and global RTE data, packs stay loaded
ProjMgrKernel::Get()->GetGlobalModel()->Clear();
m_worker.InitializeModel();
m_worker.SetLoadPacksPolicy(LoadPacksPolicy::ALL);
Expand All @@ -317,7 +318,10 @@ RpcArgs::SuccessResult RpcHandler::LoadPacks(void) {

RpcArgs::SuccessResult RpcHandler::LoadSolution(const string& solution, const string& activeTarget) {
m_bUseAllPacks = false; // loading solution will first use only listed packs
m_packReferences.clear();
m_packReferences.clear(); // will be updated
m_solutionLoaded = false; // assume not loaded yet
// clear only projects, global RTE data and packs stay loaded
ProjMgrKernel::Get()->GetGlobalModel()->ClearProjects();
RpcArgs::SuccessResult result = {false};
const auto csolutionFile = RteFsUtils::MakePathCanonical(solution);
if(!regex_match(csolutionFile, regex(".*\\.csolution\\.(yml|yaml)"))) {
Expand Down Expand Up @@ -857,6 +861,9 @@ RpcArgs::ConvertSolutionResult RpcHandler::ConvertSolution(const string& solutio
}
m_bUseAllPacks = false; // loading solution will first use only listed packs
m_packReferences.clear(); // will be updated
m_solutionLoaded = false; // assume not loaded
// clear only projects, RTE data and packs stay loaded
ProjMgrKernel::Get()->GetGlobalModel()->ClearProjects();

if(!m_manager.RunConvert(csolutionFile, activeTarget, updateRte) || !ProjMgrLogger::Get().GetErrors().empty()) {
if(m_worker.HasVarDefineError()) {
Expand Down
Loading