Skip to content

[projmgr] Fixes for RPC methods (#1352) #2272

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 1 commit into from
Nov 18, 2025
Merged

[projmgr] Fixes for RPC methods (#1352) #2272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions tools/projmgr/include/ProjMgrWorker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,8 @@ class ProjMgrWorker {
m_missingFiles.clear();
m_types = {};
m_activeTargetType.clear();
m_undefCompiler = false;
m_isSetupCommand = false;
};

protected:
Expand Down
7 changes: 7 additions & 0 deletions tools/projmgr/src/ProjMgrRpcServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,10 @@ RpcArgs::ConvertSolutionResult RpcHandler::ConvertSolution(const string& solutio
if (m_worker.HasVarDefineError()) {
const auto& vars = m_worker.GetUndefLayerVars();
result.undefinedLayers = StrVec(vars.begin(), vars.end());
const auto& selectCompiler = m_worker.GetSelectableCompilers();
if (!selectCompiler.empty()) {
result.selectCompiler = selectCompiler;
}
result.message = "Layer variables undefined, names can be found under 'undefinedLayers'";
} else if (m_worker.HasCompilerDefineError()) {
result.selectCompiler = m_worker.GetSelectableCompilers();
Expand Down Expand Up @@ -769,6 +773,9 @@ RpcArgs::DiscoverLayersInfo RpcHandler::DiscoverLayers(const string& solution, c
if (!variable.file.empty()) {
lv.file = variable.file;
}
if (!variable.description.empty()) {
lv.description = variable.description;
}
if (!variable.copyTo.empty()) {
lv.copyTo = variable.copyTo;
}
Expand Down
8 changes: 8 additions & 0 deletions tools/projmgr/test/data/TestLayers/ref/rpc-discover-layers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{
"clayer": "${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Layers/config1.clayer.yml",
"copy-to": "path/to/config1",
"description": "Config1 Layer Description",
"file": "config1.clayer.yml",
"name": "Config1-Layer",
"path": "${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Layers",
Expand All @@ -23,6 +24,7 @@
{
"clayer": "${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Layers/config2.clayer.yml",
"copy-to": "path/to/config2",
"description": "Config2 Layer Description",
"file": "Layers/config2.clayer.yml",
"name": "Config2-Layer",
"path": "${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0",
Expand All @@ -43,6 +45,7 @@
{
"clayer": "${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Layers/config1.clayer.yml",
"copy-to": "path/to/config1",
"description": "Config1 Layer Description",
"file": "config1.clayer.yml",
"name": "Config1-Layer",
"path": "${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Layers",
Expand All @@ -58,6 +61,7 @@
{
"clayer": "${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Layers/config3.clayer.yml",
"copy-to": "path/to/config3",
"description": "Config3 Layer Description",
"file": "Layers/config3.clayer.yml",
"name": "Config2-Layer",
"path": "${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0",
Expand All @@ -78,6 +82,7 @@
{
"clayer": "${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Layers/config1.clayer.yml",
"copy-to": "path/to/config1",
"description": "Config1 Layer Description",
"file": "config1.clayer.yml",
"name": "Config1-Layer",
"path": "${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Layers",
Expand All @@ -93,6 +98,7 @@
{
"clayer": "${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Layers/config2.clayer.yml",
"copy-to": "path/to/config2",
"description": "Config2 Layer Description",
"file": "Layers/config2.clayer.yml",
"name": "Config2-Layer",
"path": "${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0",
Expand All @@ -113,6 +119,7 @@
{
"clayer": "${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Layers/config1.clayer.yml",
"copy-to": "path/to/config1",
"description": "Config1 Layer Description",
"file": "config1.clayer.yml",
"name": "Config1-Layer",
"path": "${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0/Layers",
Expand All @@ -128,6 +135,7 @@
{
"clayer": "${CMSIS_PACK_ROOT}/ARM/RteTest_DFP/0.2.0/Layers/config3.clayer.yml",
"copy-to": "path/to/config3",
"description": "Config3 Layer Description",
"file": "Layers/config3.clayer.yml",
"name": "Config2-Layer",
"path": "${DEVTOOLS(packs)}/ARM/RteTest_DFP/0.2.0",
Expand Down
3 changes: 2 additions & 1 deletion tools/projmgr/test/src/ProjMgrRpcTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,8 @@ TEST_F(ProjMgrRpcTests, RpcDiscoverLayers) {
auto responses = RunRpcMethods(requests);

// valid configurations: compare response with golden reference
EXPECT_TRUE(CompareRpcResponse(responses[0], testinput_folder + "/TestLayers/ref/rpc-discover-layers.json"));
EXPECT_TRUE(CompareRpcResponse(responses[0], testinput_folder + "/TestLayers/ref/rpc-discover-layers.json"))
<< "json response:\n" << ProjMgrTestEnv::StripAbsoluteFunc(responses[0].dump(2));

// unknown active target set
csolutionPath = testinput_folder + "/TestLayers/config.csolution.yml";
Expand Down
Loading