[cbuild-gen-idx.yml] Always output fully qualified device and board identifier

Author: brondani

tools/projmgr/src/ProjMgrCbuildGenIdx.cpp

@@ -28,8 +28,16 @@ ProjMgrCbuildGenIdx::ProjMgrCbuildGenIdx(YAML::Node node, const vector<ContextIt
   YAML::Node generatorNode;
   SetNodeValue(generatorNode[YAML_ID], generator.id);
   SetNodeValue(generatorNode[YAML_OUTPUT], FormatPath(gendir, output));
-  SetNodeValue(generatorNode[YAML_DEVICE], context->deviceItem.name);
-  SetNodeValue(generatorNode[YAML_BOARD], context->board);
+  if (!context->deviceItem.name.empty()) {
+    const auto& device = context->deviceItem.vendor + "::" + context->deviceItem.name +
+      (context->deviceItem.pname.empty() ? "" : ":" + context->deviceItem.pname);
+    SetNodeValue(generatorNode[YAML_DEVICE], device);
+  }
+  if (!context->boardItem.name.empty()) {
+    const auto& board = context->boardItem.vendor + "::" + context->boardItem.name +
+      (context->boardItem.revision.empty() ? "" : ":" + context->boardItem.revision);
+    SetNodeValue(generatorNode[YAML_BOARD], board);
+  }
   SetNodeValue(generatorNode[YAML_PROJECT_TYPE], type);
   for (const auto& sibling : siblings) {
     YAML::Node cbuildGenNode;

tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/extgen.cbuild-gen-idx.yml

@@ -3,7 +3,7 @@ build-gen-idx:
   generators:
     - id: RteTestExternalGenerator
       output: ${DEVTOOLS(data)}/ExternalGenerator/generated/MultiCore
-      device: RteTest_ARMCM0_Dual
+      device: ARM::RteTest_ARMCM0_Dual:cm0_core0
       project-type: multi-core
       cbuild-gens:
         - cbuild-gen: ${DEVTOOLS(data)}/ExternalGenerator/tmp/boot.Debug+MultiCore.cbuild-gen.yml

tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/extgen.cbuild-gen-idx.yml

@@ -3,7 +3,7 @@ build-gen-idx:
   generators:
     - id: RteTestExternalGenerator
       output: ${DEVTOOLS(data)}/ExternalGenerator/single/generated
-      device: RteTestGen_ARMCM0
+      device: ARM::RteTestGen_ARMCM0
       project-type: single-core
       cbuild-gens:
         - cbuild-gen: ${DEVTOOLS(data)}/ExternalGenerator/tmp/single-core.Debug+CM0.cbuild-gen.yml

tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/extgen.cbuild-gen-idx.yml

@@ -3,7 +3,7 @@ build-gen-idx:
   generators:
     - id: RteTestExternalGenerator
       output: ${DEVTOOLS(data)}/ExternalGenerator/generated/CM0
-      device: RteTestGen_ARMCM0
+      device: ARM::RteTestGen_ARMCM0
       project-type: trustzone
       cbuild-gens:
         - cbuild-gen: ${DEVTOOLS(data)}/ExternalGenerator/tmp/ns.Debug+CM0.cbuild-gen.yml