[projmgr] Remove orphaned cbuild-run.yml

Author: grasci-arm

tools/projmgr/src/ProjMgrCbuildRun.cpp

@@ -271,6 +271,21 @@ void ProjMgrCbuildRun::SetProcessorsNode(YAML::Node node, const vector<Processor
 
 //-- ProjMgrYamlEmitter::GenerateCbuildRun --------------------------------------------------------
 bool ProjMgrYamlEmitter::GenerateCbuildRun(const RunDebugType& debugRun) {
+  // remove cbuild-run file if it was generated in the $SolutionDir()$ by csolution lower than 2.11.0
+  const string olderCbuildRun = RteFsUtils::ParentPath(debugRun.solution) + '/' +
+    debugRun.solutionName + '+' + debugRun.targetType + ".cbuild-run.yml";
+  if (RteFsUtils::Exists(olderCbuildRun)) {
+    try {
+      const YAML::Node& cbuildRun = YAML::LoadFile(olderCbuildRun);
+      const auto& generatedBy = cbuildRun["cbuild-run"]["generated-by"].as<string>();
+      const auto& tool = RteUtils::ExtractPrefix(generatedBy, " version");
+      const auto& version = RteUtils::ExtractSuffix(generatedBy, "version ");
+      if (tool == "csolution" && VersionCmp::Compare(version, "2.11.0") < 0) {
+        RteFsUtils::RemoveFile(olderCbuildRun);
+      }
+    } catch (YAML::Exception&) {}
+  }
+
   // generate cbuild-run.yml
   m_cbuildRun = debugRun.cbuildRun;
   RteFsUtils::NormalizePath(m_cbuildRun, m_outputDir);

tools/projmgr/src/ProjMgrRpcServer.cpp

@@ -676,7 +676,7 @@ RpcArgs::DraftProjectsInfo RpcHandler::GetDraftProjects(const RpcArgs::DraftProj
 }
 
 RpcArgs::ConvertSolutionResult RpcHandler::ConvertSolution(const string& solution, const string& activeTarget, const bool& updateRte) {
-  RpcArgs::ConvertSolutionResult result = { false };
+  RpcArgs::ConvertSolutionResult result = {{ false }};
   const auto csolutionFile = RteFsUtils::MakePathCanonical(solution);
   if (!regex_match(csolutionFile, regex(".*\\.csolution\\.(yml|yaml)"))) {
     result.message = solution + " is not a *.csolution.yml file";

tools/projmgr/test/data/TestRunDebug/run-debug+TestHW.cbuild-run.yml

@@ -0,0 +1,2 @@
+cbuild-run:
+  generated-by: csolution version 2.10.0

tools/projmgr/test/src/ProjMgrUnitTests.cpp

@@ -6718,6 +6718,9 @@ TEST_F(ProjMgrUnitTests, TestRunDebug) {
     testinput_folder + "/TestRunDebug/ref/run-debug+TestHW2.cbuild-run.yml");
   ProjMgrTestEnv::CompareFile(testoutput_folder + "/out/run-debug/TestHW2/run-debug+TestHW2.cbuild.yml",
     testinput_folder + "/TestRunDebug/ref/run-debug+TestHW2.cbuild.yml");
+
+  // Check cbuild-run file generated by csolution 2.10.0 was removed
+  EXPECT_FALSE(RteFsUtils::Exists(testinput_folder + "/TestRunDebug/run-debug+TestHW.cbuild-run.yml"));
 }
 
 TEST_F(ProjMgrUnitTests, TestRunDebugCustom) {