diff --git a/tools/projmgr/src/ProjMgr.cpp b/tools/projmgr/src/ProjMgr.cpp index fc1082a6a..985099e3d 100644 --- a/tools/projmgr/src/ProjMgr.cpp +++ b/tools/projmgr/src/ProjMgr.cpp @@ -709,9 +709,9 @@ bool ProjMgr::Configure() { vector 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); } diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp index b5c0bbf08..9be692d86 100644 --- a/tools/projmgr/src/ProjMgrWorker.cpp +++ b/tools/projmgr/src/ProjMgrWorker.cpp @@ -5818,11 +5818,10 @@ bool ProjMgrWorker::ListConfigFiles(vector& 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 + ")"; @@ -5831,8 +5830,11 @@ bool ProjMgrWorker::ListConfigFiles(vector& configFiles) { if (updateVersion != baseVersion) { configEntry += " (update@" + updateVersion + ")"; } + if (!component.empty()) { + configEntry += " - component: " + component; + } + CollectionUtils::PushBackUniquely(configFiles, configEntry); } - CollectionUtils::PushBackUniquely(configFiles, configEntry); } } } diff --git a/tools/projmgr/test/src/ProjMgrUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUnitTests.cpp index 199f98188..b6bfeb85c 100644 --- a/tools/projmgr/test/src/ProjMgrUnitTests.cpp +++ b/tools/projmgr/test/src/ProjMgrUnitTests.cpp @@ -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();