Make changes in dbgconf location

Author: grasci-arm

libs/rtemodel/include/RteDevice.h

@@ -674,6 +674,15 @@ class RteDeviceDebugVars : public RteDeviceProperty
   */
   bool IsConfig() const override { return true; }
 
+   /**
+   * @brief construct full path including filename for a file that should be used when adding file to a project
+   * @param target pointer to RteTarget object for which path needs to be calculated
+   * @param instanceIndex file index for components with multiple instantiation (ignored for this override).
+   * @param rteFolder the "RTE" folder path used for placing files (ignored for this override)
+   * @return full project-relative path including filename and extension
+  */
+  std::string GetInstancePathName(const RteTarget* target, int instanceIndex, const std::string& rteFolder) const override;
+
 
 protected:
   /**

libs/rtemodel/include/RteFile.h

@@ -192,14 +192,14 @@ class RteFile : public RteItem
 
   /**
    * @brief construct full path including filename for a file that should be used when adding file to a project
-   * @param deviceName name of device used in the project
+   * @param target pointer to RteTarget object for which path needs to be calculated
    * @param instanceIndex file index for components with multiple instantiation.
    * Gets appended as a string to the base filename before extension it its value >=0.
    * Value of < 0 indicates that parent component can have only one instance
    * @param rteFolder the "RTE" folder path used for placing files
    * @return full project-relative path including filename and extension
   */
-  std::string GetInstancePathName(const std::string& deviceName, int instanceIndex, const std::string& rteFolder) const override;
+  std::string GetInstancePathName(const RteTarget* target, int instanceIndex, const std::string& rteFolder) const override;
 
   /**
    * @brief construct absolute include path string that can be used in'-I' compiler option.

libs/rtemodel/include/RteInstance.h

@@ -1407,11 +1407,11 @@ class RteFileInstance : public RteItemInstance
   /**
    * @brief initialize the file instance
    * @param f pointer to the original RteItem, represents RteFile or an item associated with a file
-   * @param deviceName device name used in the target
+   * @param target to obtain device name or expand sequences
    * @param instanceIndex instance index, can be > 0  for multi-instance components
    * @param rteFolder the "RTE" folder path used for placing files
   */
-  void Init(RteItem* f, const std::string& deviceName, int instanceIndex, const std::string& rteFolder);
+  void Init(RteItem* f, const RteTarget* target, int instanceIndex, const std::string& rteFolder);
 
   /**
    * @brief update file instance

libs/rtemodel/include/RteItem.h

@@ -532,14 +532,14 @@ class RteItem : public XmlTreeItem<RteItem>
 
   /**
    * @brief construct full path including filename for a file that should be used when adding file to a project
-   * @param deviceName name of device used in the project
+   * @param target pointer to RteTarget object for which path needs to be calculated
    * @param instanceIndex file index for components with multiple instantiation
    * Gets appended as a string to the base filename before extension if its value >= 0
    * Value of < 0 indicates that parent component can have only one instance
    * @param rteFolder the "RTE" folder path used for placing files
    * @return full project-relative path including filename and extension
   */
-  virtual std::string GetInstancePathName(const std::string& deviceName, int instanceIndex, const std::string& rteFolder) const;
+  virtual std::string GetInstancePathName(const RteTarget* target, int instanceIndex, const std::string& rteFolder) const;
 
   /**
    * @brief check if item provides data matching OS this code is built for: Linux, Windows or Mac OS

libs/rtemodel/src/RteDevice.cpp

@@ -362,6 +362,23 @@ RteDeviceProperty* RteDeviceTrace::CreateProperty(const string& tag)
   return new RteDeviceProperty(this);
 }
 
+///
+string RteDeviceDebugVars::GetInstancePathName(const RteTarget* target, int instanceIndex, const string& rteFolder) const
+{
+  if(target) {
+    auto solutionfile = target->GetModel()->GetRootFileName();
+    auto solutionfileExt = RteUtils::ExtractFileExtension(solutionfile);
+    if(solutionfileExt == "yml" || solutionfileExt == "yaml") {
+      return target->ExpandAccessSequences("$SolutionDir()$/.cmsis/$Solution$+$TargetType$.dbgconf");
+    } else {
+      return RteItem::GetInstancePathName(target, instanceIndex, rteFolder);
+    }
+  }
+  // return absolute path in pack repo
+   return GetOriginalAbsolutePath();
+}
+
+
 /////////////////
 // Flash info
 

libs/rtemodel/src/RteFile.cpp

@@ -208,7 +208,7 @@ void RteFile::GetAbsoluteSourcePaths(set<string>& paths) const
 }
 
 
-string RteFile::GetInstancePathName(const string& deviceName, int instanceIndex, const string& rteFolder) const
+string RteFile::GetInstancePathName(const RteTarget* target, int instanceIndex, const string& rteFolder) const
 {
   string pathName;
   RteComponent* c = GetComponent();
@@ -218,6 +218,7 @@ string RteFile::GetInstancePathName(const string& deviceName, int instanceIndex,
     bool bForcedCopy = IsForcedCopy();
     if (bConfig || bTemplate || bForcedCopy) {
       if (bConfig || bForcedCopy) {
+        auto deviceName = target ? target->GetFullDeviceName() : EMPTY_STRING;
         // replace all ' ' with '_' in class name, the generated path should not contain spaces
         pathName += rteFolder + "/" + RteUtils::SpacesToUnderscore(c->GetCclassName()) + "/";
         if (!bForcedCopy && !deviceName.empty() && c->IsDeviceDependent()) {

libs/rtemodel/src/RteInstance.cpp

@@ -659,9 +659,9 @@ RteFileInstance::RteFileInstance(RteItem* parent) :
   m_tag = "file";
 }
 
-void RteFileInstance::Init(RteItem* f, const string& deviceName, int instanceIndex, const string& rteFolder)
+void RteFileInstance::Init(RteItem* f, const RteTarget* target, int instanceIndex, const string& rteFolder)
 {
-  m_instanceName = f->GetInstancePathName(deviceName, instanceIndex, rteFolder);
+  m_instanceName = f->GetInstancePathName(target, instanceIndex, rteFolder);
   m_instanceIndex = instanceIndex;
   m_fileName = RteUtils::ExtractFileName(m_instanceName);
   m_bRemoved = false;
@@ -901,15 +901,16 @@ string RteFileInstance::GetHeaderComment() const
 
 string RteFileInstance::GetAbsolutePath() const
 {
-  string s;
-  if (IsConfig()) {
+  if(IsConfig()) {
     RteProject* project = GetProject();
-    if (project && !project->GetProjectPath().empty())
-      s = project->GetProjectPath() + m_instanceName;
-  } else {
-    s = GetOriginalAbsolutePath();
+    string projectPath = project ? project->GetProjectPath() : EMPTY_STRING;
+    if(projectPath.empty() || !RteFsUtils::IsRelative(m_instanceName)) {
+      return m_instanceName;
+    } else {
+      return project->GetProjectPath() + m_instanceName;
+    }
   }
-  return s;
+  return GetOriginalAbsolutePath();
 }
 
 RteItem* RteFileInstance::GetFile(const string& targetName) const

libs/rtemodel/src/RteItem.cpp

@@ -842,11 +842,12 @@ string RteItem::GetOriginalAbsolutePath(const string& name) const
   return RteFsUtils::MakePathCanonical(absPath);
 }
 
-string RteItem::GetInstancePathName(const string& deviceName, int instanceIndex, const string& rteFolder) const
+string RteItem::GetInstancePathName(const RteTarget* target, int instanceIndex, const string& rteFolder) const
 {
-  if(IsConfig()) {
+  if(target && IsConfig()) {
     // construct RTE/Device/Dname/fileName.ext
     string pathName = rteFolder + "/";
+     auto deviceName = target->GetFullDeviceName();
     if(!deviceName.empty() && IsDeviceDependent()) {
       pathName += "Device/";
       string device = WildCards::ToX(deviceName);

libs/rtemodel/src/RteProject.cpp

@@ -558,8 +558,7 @@ RteFileInstance* RteProject::AddFileInstance(RteComponentInstance* ci, RteItem*
   if (!f || !f->IsConfig())
     return NULL;
 
-  string deviceName = target->GetFullDeviceName();
-  string id = f->GetInstancePathName(deviceName, index, GetRteFolder(ci));
+  string id = f->GetInstancePathName(target, index, GetRteFolder(ci));
   if(ci) {
     target->AddComponentInstanceForFile(id, ci);
   }
@@ -592,10 +591,9 @@ bool RteProject::UpdateFileToNewVersion(RteFileInstance* fi, RteItem* f, bool bM
 
 void RteProject::InitFileInstance(RteFileInstance* fi, RteItem* f, int index, RteTarget* target, const string& savedVersion, const string& rteFolder)
 {
-  string deviceName = target->GetFullDeviceName();
   const string& targetName = target->GetName();
 
-  fi->Init(f, deviceName, index, rteFolder);
+  fi->Init(f, target, index, rteFolder);
   fi->Update(f, false);
   fi->AddTargetInfo(targetName); // set/update supported targets
   fi->SetRemoved(false);
@@ -1073,7 +1071,7 @@ void RteProject::UpdateRte() {
   }
   // add forced copy files
   for(auto f : m_forcedFiles) {
-    string dst = GetProjectPath() + f->GetInstancePathName(EMPTY_STRING, 0, GetRteFolder());
+    string dst = GetProjectPath() + f->GetInstancePathName(nullptr, 0, GetRteFolder());
     if(RteFsUtils::Exists(dst))
       continue;
     string src = f->GetOriginalAbsolutePath();

libs/rtemodel/src/RteTarget.cpp

@@ -103,7 +103,9 @@ void RteTarget::Clear()
   ClearFilteredComponents();
   ClearCollections();
   ClearMissingPacks();
-  m_filteredModel->Clear();
+  if(m_filteredModel) {
+    m_filteredModel->Clear();
+  }
   m_filterContext->Clear();
   m_dependencySolver->Clear();
   m_bTargetSupported = false;
@@ -131,7 +133,11 @@ std::string RteTarget::ExpandAccessSequences(const std::string& src) const
   const string& compiler = GetAttribute("Tcompiler");
   attributes.AddAttribute(RteConstants::AS_COMPILER, (compiler == "ARMCC") ? "AC6" : compiler);
   // target name as target type
-  attributes.AddAttribute(RteConstants::AS_TARGET_TYPE, GetName());
+  string targetType = RteUtils::GetSuffix(GetName(), '+');
+  if(targetType.empty()) {
+    targetType = GetName();
+  }
+  attributes.AddAttribute(RteConstants::AS_TARGET_TYPE, targetType);
   attributes.AddAttribute(RteConstants::AS_BUILD_TYPE, RteUtils::EMPTY_STRING);
 
   // project and solution
@@ -140,10 +146,17 @@ std::string RteTarget::ExpandAccessSequences(const std::string& src) const
   attributes.AddAttribute(RteConstants::AS_PROJECT, projectName);
   string projectDir = RteUtils::RemoveTrailingBackslash(project->GetProjectPath());
 
+  string solutionName;
+  string solutionDir;
   RteModel* globalModel = GetModel();
-  string solutionDir = globalModel->GetRootFilePath(false); // solution filename
+  solutionName = RteUtils::ExtractFileBaseName( // removes .csolution
+    RteUtils::ExtractFileBaseName(globalModel->GetRootFileName())  // removes .yml
+  );
+  solutionDir = globalModel->GetRootFilePath(false);
+
   if(solutionDir.empty()) {
     solutionDir = projectDir;
+    solutionName = projectName;
     projectDir = ".";
   } else {
     projectDir = RteFsUtils::RelativePath(projectDir, solutionDir);
@@ -153,6 +166,7 @@ std::string RteTarget::ExpandAccessSequences(const std::string& src) const
   attributes.AddAttribute(RteConstants::AS_PROJECT_DIR_BR, projectDir);
   attributes.AddAttribute(RteConstants::AS_SOLUTION_DIR, solutionDir);
   attributes.AddAttribute(RteConstants::AS_SOLUTION_DIR_BR, solutionDir);
+  attributes.AddAttribute(RteConstants::AS_SOLUTION, solutionName);
 
   return RteUtils::ExpandAccessSequences(src, attributes.GetAttributes());
 }
@@ -752,15 +766,14 @@ void RteTarget::CollectComponentSettings(RteComponentInstance* ci)
   const set<RteFile*>& files = GetFilteredFiles(c);
   if (files.empty())
     return;
-  string deviceName = GetFullDeviceName();
   const string& rteFolder = GetRteFolder(ci);
   for (auto itf = files.begin(); itf != files.end(); ++itf) {
     RteFile* f = *itf;
     if (!f)
       continue;
     if (f->IsConfig()) {
       for (int i = 0; i < count; i++) {
-        string id = f->GetInstancePathName(deviceName, i, rteFolder);
+        string id = f->GetInstancePathName(this, i, rteFolder);
         AddComponentInstanceForFile(id, ci);
       }
       continue;
@@ -1467,18 +1480,17 @@ RteItem* RteTarget::GetFile(const RteFileInstance* fi, RteComponent* c, const st
   if(!fi) {
     return nullptr;
   }
-  const string& deviceName = GetFullDeviceName();
   const string& instanceName = fi->GetInstanceName();
   if(c) { // a component file
     int index = fi->GetInstanceIndex();
     for(auto f : GetFilteredFiles(c)) {
-      if(f && f->GetInstancePathName(deviceName, index, rteFolder) == instanceName) {
+      if(f && f->GetInstancePathName(this, index, rteFolder) == instanceName) {
         return f;
       }
     }
   } else {
     auto debugVars = GetDeviceDebugVars();
-    if(debugVars && debugVars->GetInstancePathName(deviceName, 0, rteFolder) == instanceName) {
+    if(debugVars && debugVars->GetInstancePathName(this, 0, rteFolder) == instanceName) {
       return debugVars;
     }
   }