[projmgr] Store context dependencies in cbuild-idx

tools/projmgr/include/ProjMgrWorker.h

@@ -267,6 +267,7 @@ struct ContextTypesItem {
  *        boolean processed precedences
  *        map of user inputed pack ID to resolved pack ID
  *        set of absolute file paths of project local packs
+ *        vector of dependent contexts
 */
 struct ContextItem {
   CdefaultItem* cdefault = nullptr;
@@ -313,7 +314,8 @@ struct ContextItem {
   RtePackage* boardPack;
   bool precedences;
   std::map<std::string, std::set<std::string>> userInputToResolvedPackIdMap;
-  std::set<std::string> localPackPaths;
+  StrSet localPackPaths;
+  StrVec dependsOn;
 };
 
 /**

tools/projmgr/include/ProjMgrYamlParser.h

@@ -61,6 +61,7 @@ static constexpr const char* YAML_DEBUG = "debug";
 static constexpr const char* YAML_DEFAULT = "default";
 static constexpr const char* YAML_DEFINE = "define";
 static constexpr const char* YAML_DELPATH = "del-path";
+static constexpr const char* YAML_DEPENDS_ON = "depends-on";
 static constexpr const char* YAML_DESCRIPTION = "description";
 static constexpr const char* YAML_DEVICE = "device";
 static constexpr const char* YAML_DEVICE_PACK = "device-pack";

tools/projmgr/schemas/common.schema.json

@@ -123,15 +123,15 @@
       ],
       "description": "Include node for a list of compilers"
     },
-    "ArrayOfContextMapType": {
+    "ArrayOfBuildContextWithProjectName": {
       "type": "array",
       "uniqueItems": true,
       "minItems": 1,
       "items": { "$ref": "#/definitions/BuildContextWithProjectName" }
     },
     "ContextMapType": {
       "oneOf": [
-        {"$ref": "#/definitions/ArrayOfContextMapType" },
+        {"$ref": "#/definitions/ArrayOfBuildContextWithProjectName" },
         {"$ref": "#/definitions/BuildContextWithProjectName" }
       ],
       "description": "Remapping of build contexts"
@@ -812,7 +812,8 @@
       "properties": {
         "cbuild": { "type": "string", "description": "Path to <context>.cbuild.yml file" },
         "project": { "type": "string", "description": "Project name" },
-        "configuration": { "$ref": "#/definitions/BuildContext" }
+        "configuration": { "$ref": "#/definitions/BuildContext" },
+        "depends-on": { "$ref": "#/definitions/ArrayOfBuildContextWithProjectName" }
       },
       "additionalProperties": false,
       "required": ["cbuild", "project", "configuration"]

tools/projmgr/src/ProjMgrWorker.cpp

@@ -2805,6 +2805,10 @@ bool ProjMgrWorker::ProcessSequenceRelative(ContextItem& context, string& item,
           }
           // expand access sequence
           ExpandAccessSequence(context, refContext, sequenceName, item, withHeadingDot);
+          // store dependency information
+          if (refContext.name != context.name) {
+            ProjMgrUtils::PushBackUniquely(context.dependsOn, refContext.name);
+          }
         } else {
           // full or partial context name cannot be resolved to a valid context
           ProjMgrLogger::Error("context '" + contextName + "' referenced by access sequence '" + sequenceName + "' does not exist");

tools/projmgr/src/ProjMgrYamlEmitter.cpp

@@ -245,6 +245,7 @@ ProjMgrYamlCbuildIdx::ProjMgrYamlCbuildIdx(YAML::Node node, const vector<Context
           (context->type.build.empty() ? "" : ("." + context->type.build)) +
           "+" + context->type.target);
       }
+      SetNodeValue(cbuildNode[YAML_DEPENDS_ON], context->dependsOn);
       node[YAML_CBUILDS].push_back(cbuildNode);
     }
   }

tools/projmgr/test/data/TestAccessSequences/ref/test-access-sequences2.cbuild-idx.yml

@@ -0,0 +1,18 @@
+build-idx:
+  generated-by: csolution version 0.0.0+gcc58b54e
+  csolution: ../data/TestAccessSequences/test-access-sequences2.csolution.yml
+  cprojects:
+    - cproject: ../data/TestAccessSequences/test-access-sequences3.cproject.yml
+      clayers:
+        - clayer: ../data/TestAccessSequences/test-access-sequences.clayer.yml
+  cbuilds:
+    - cbuild: test-access-sequences3.Debug+TEST_TARGET.cbuild.yml
+      project: test-access-sequences3
+      configuration: .Debug+TEST_TARGET
+      depends-on:
+        - test-access-sequences3.Release+TEST_TARGET
+    - cbuild: test-access-sequences3.Release+TEST_TARGET.cbuild.yml
+      project: test-access-sequences3
+      configuration: .Release+TEST_TARGET
+      depends-on:
+        - test-access-sequences3.Debug+TEST_TARGET

tools/projmgr/test/src/ProjMgrUnitTests.cpp

@@ -1923,6 +1923,10 @@ TEST_F(ProjMgrUnitTests, AccessSequences2) {
     testinput_folder + "/TestAccessSequences/ref/test-access-sequences3.Debug+TEST_TARGET.cprj");
  ProjMgrTestEnv:: CompareFile(testoutput_folder + "/test-access-sequences3.Release+TEST_TARGET.cprj",
     testinput_folder + "/TestAccessSequences/ref/test-access-sequences3.Release+TEST_TARGET.cprj");
+
+  // Check generated cbuild-idx
+ ProjMgrTestEnv::CompareFile(testoutput_folder + "/test-access-sequences2.cbuild-idx.yml",
+   testinput_folder + "/TestAccessSequences/ref/test-access-sequences2.cbuild-idx.yml");
 }
 
 TEST_F(ProjMgrUnitTests, RunProjMgr_MalformedAccessSequences1) {