[projmgr] Improve layer variables handling (#1098) (#1901)

Co-authored-by: Daniel Brondani <[email protected]>

Author: spcaipers-arm

tools/projmgr/include/ProjMgrUtils.h

@@ -280,6 +280,13 @@ class ProjMgrUtils {
   */
   static const std::string ULLToHex(unsigned long long number);
 
+  /**
+   * @brief get variable name
+   * @param input string
+   * @return variable name or empty string
+  */
+  static const std::string GetVariableName(const std::string item);
+
 protected:
   /**
    * @brief get filtered list of contexts

tools/projmgr/include/ProjMgrWorker.h

@@ -281,6 +281,7 @@ struct ContextTypesItem {
  *        map of absolute file paths,
  *        map of generators,
  *        map of compatible layers,
+ *        map of layer variables,
  *        valid connections,
  *        linker options,
  *        map of variables,
@@ -342,6 +343,7 @@ struct ContextItem {
   std::map<std::string, RteGenerator*> generators;
   std::map<std::string, GpdscItem> gpdscs;
   StrVecMap compatibleLayers;
+  StrMap layerVariables;
   std::vector<ConnectionsCollectionVec> validConnections;
   LinkerContextItem linker;
   std::map<std::string, std::string> variables;

tools/projmgr/src/ProjMgrCbuildIdx.cpp

@@ -192,8 +192,10 @@ void ProjMgrCbuildIdx::SetVariablesNode(YAML::Node node, ProjMgrParser* parser,
     }
     YAML::Node layerNode;
     string layerFile;
+    const string layerId = context->layerVariables.find(type) != context->layerVariables.end() ?
+      context->layerVariables.at(type) : type + "-Layer";
     if (filenames.empty()) {
-      layerNode[type + "-Layer"] = "";
+      layerNode[layerId] = "";
     }
     for (const auto& [filename, options] : filenames) {
       string packRoot = ProjMgrKernel::Get()->GetCmsisPackRoot();
@@ -211,7 +213,7 @@ void ProjMgrCbuildIdx::SetVariablesNode(YAML::Node node, ProjMgrParser* parser,
           layerFile = "$" + string(RteConstants::AS_SOLUTION_DIR_BR) + "$/" + RteFsUtils::LexicallyNormal(relPath);
         }
       }
-      SetNodeValue(layerNode[type + "-Layer"], layerFile);
+      SetNodeValue(layerNode[layerId], layerFile);
       if (parser->GetGenericClayers().find(filename) != parser->GetGenericClayers().end()) {
         const auto& clayer = parser->GetGenericClayers().at(filename);
         SetNodeValue(layerNode[YAML_DESCRIPTION], clayer.description);

tools/projmgr/src/ProjMgrUtils.cpp

@@ -439,3 +439,12 @@ const string ProjMgrUtils::ULLToHex(const unsigned long long number) {
   ss << "0x" << hex << setfill('0') << uppercase << setw(8) << number;
   return ss.str();
 }
+
+const string ProjMgrUtils::GetVariableName(const string item) {
+  smatch sm;
+  regex_match(item, sm, regex(".*\\$(.*)\\$.*"));
+  if (sm.size() >= 2) {
+    return sm[1];
+  }
+  return RteUtils::EMPTY_STRING;
+}

tools/projmgr/src/ProjMgrWorker.cpp

@@ -199,7 +199,10 @@ bool ProjMgrWorker::ParseContextLayers(ContextItem& context) {
       continue;
     }
     if (CheckContextFilters(clayer.typeFilter, context)) {
-      error_code ec;
+      const auto variable = ProjMgrUtils::GetVariableName(clayer.layer);
+      if (!variable.empty()) {
+        context.layerVariables[clayer.type] = variable;
+      }
       string clayerFile = RteUtils::ExpandAccessSequences(clayer.layer, context.variables);
       if (clayerFile.empty()) {
         continue;
@@ -208,16 +211,9 @@ bool ProjMgrWorker::ParseContextLayers(ContextItem& context) {
         RteFsUtils::NormalizePath(clayerFile, context.cproject->directory);
       }
       if (!RteFsUtils::Exists(clayerFile)) {
-        smatch sm;
-        try {
-          regex_match(clayer.layer, sm, regex(".*\\$(.*)\\$.*"));
-        }
-        catch (exception&) {};
-        if (sm.size() >= 2) {
-          if (context.variables.find(sm[1]) == context.variables.end()) {
-            m_undefLayerVars.insert(string(sm[1]));
-            continue;
-          }
+        if (!variable.empty() && context.variables.find(variable) == context.variables.end()) {
+          m_undefLayerVars.insert(string(variable));
+          continue;
         }
       }
       if (m_parser->ParseClayer(clayerFile, m_checkSchema)) {
@@ -860,7 +856,10 @@ bool ProjMgrWorker::ProcessLayerCombinations(ContextItem& context, LayersDiscove
 
       // init list of compatible layers with all required layer types
       for (const auto& type : discover.requiredLayerTypes) {
-        context.compatibleLayers.insert({ type, StrVec() });
+        context.compatibleLayers.emplace(type, StrVec());
+      }
+      for (const auto& [type, _] : context.layerVariables) {
+        context.compatibleLayers.emplace(type, StrVec());
       }
       // update list of compatible layers
       context.validConnections.push_back(combination);