Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions tools/projmgr/src/ProjMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,9 @@ bool ProjMgr::Configure() {
vector<string> configFiles;
m_worker.ListConfigFiles(configFiles);
if (!configFiles.empty()) {
string infoMsg = "config files for each component:";
string infoMsg = "config files";
for (const auto& configFile : configFiles) {
infoMsg += "\n " + configFile;
infoMsg += "\n" + configFile;
}
ProjMgrLogger::Get().Info(infoMsg);
}
Expand Down
8 changes: 5 additions & 3 deletions tools/projmgr/src/ProjMgrWorker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5818,11 +5818,10 @@ bool ProjMgrWorker::ListConfigFiles(vector<string>& configFiles) {
const auto& context = m_contexts.at(contextName);
if (!context.configFiles.empty()) {
for (const auto& [component, fileInstances] : context.configFiles) {
string configEntry = component + ":";
for (const auto& fi : fileInstances) {
// get absolute path to file instance
const string absFile = fs::path(context.cproject->directory).append(fi.second->GetInstanceName()).generic_string();
configEntry += "\n - " + absFile;
string configEntry = absFile;
// get base version
const string baseVersion = fi.second->GetSemVer(true);
configEntry += " (base@" + baseVersion + ")";
Expand All @@ -5831,8 +5830,11 @@ bool ProjMgrWorker::ListConfigFiles(vector<string>& configFiles) {
if (updateVersion != baseVersion) {
configEntry += " (update@" + updateVersion + ")";
}
if (!component.empty()) {
configEntry += " - component: " + component;
}
CollectionUtils::PushBackUniquely(configFiles, configEntry);
}
CollectionUtils::PushBackUniquely(configFiles, configEntry);
}
}
}
Expand Down
12 changes: 5 additions & 7 deletions tools/projmgr/test/src/ProjMgrUnitTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5150,13 +5150,11 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_UpdateRte) {

// Check info message
const string expected = "\
info csolution: config files for each component:\n\
:\n\
- .*/TestSolution/.cmsis/test\\+CM0.dbgconf \\(base@0.0.2\\)\n\
ARM::Device:Startup&RteTest Startup@2.0.3:\n\
- .*/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct \\(base@1.0.0\\)\n\
- .*/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/startup_ARMCM0.c \\(base@2.0.1\\) \\(update@2.0.3\\)\n\
- .*/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/system_ARMCM0.c \\(base@1.0.0\\)\n\
info csolution: config files\n\
[^\\s-].*/TestSolution/.cmsis/test\\+CM0.dbgconf \\(base@0.0.2\\)\n\
[^\\s-].*/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct \\(base@1.0.0\\) - component: ARM::Device:Startup&RteTest Startup@2.0.3\n\
[^\\s-].*/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/startup_ARMCM0.c \\(base@2.0.1\\) \\(update@2.0.3\\) - component: ARM::Device:Startup&RteTest Startup@2.0.3\n\
[^\\s-].*/TestSolution/TestProject1/RTE/Device/RteTest_ARMCM0/system_ARMCM0.c \\(base@1.0.0\\) - component: ARM::Device:Startup&RteTest Startup@2.0.3\n\
";

auto outStr = streamRedirect.GetOutString();
Expand Down
Loading