[projmgr] Add component maxInstances to cbuild.yml

Author: grasci-arm

tools/projmgr/include/ProjMgrYamlParser.h

@@ -150,6 +150,7 @@ static constexpr const char* YAML_LINKER = "linker";
 static constexpr const char* YAML_LINK_TIME_OPTIMIZE = "link-time-optimize";
 static constexpr const char* YAML_MAP = "map";
 static constexpr const char* YAML_MASK = "mask";
+static constexpr const char* YAML_MAX_INSTANCES = "maxInstances";
 static constexpr const char* YAML_MEMORY = "memory";
 static constexpr const char* YAML_MESSAGES = "messages";
 static constexpr const char* YAML_MISC = "misc";

tools/projmgr/schemas/common.schema.json

@@ -550,6 +550,11 @@
       "type": "integer",
       "description": "Allows to use multiple instances of component configuration files instead of default 1."
     },
+    "MaxInstancesType": {
+      "title": "maxInstances:",
+      "type": "integer",
+      "description": "Maximum allowed instances of a component in a project. Default is 1 for one instance."
+    },
     "TargetTypes": {
       "title": "target-types:\nDocumentation: https://open-cmsis-pack.github.io/cmsis-toolbox/YML-Input-Format/#target-types",
       "type": "array",
@@ -1657,7 +1662,8 @@
         "files":        { "$ref": "#/definitions/FilesType" },
         "generator":    { "$ref": "#/definitions/ComponentGeneratorType" },
         "from-pack":    { "$ref": "#/definitions/PackID" },
-        "instances":    { "$ref": "#/definitions/InstancesType" }
+        "instances":    { "$ref": "#/definitions/InstancesType" },
+        "maxInstances": { "$ref": "#/definitions/MaxInstancesType" }
       },
       "additionalProperties": false
     },

tools/projmgr/src/ProjMgrCbuild.cpp

@@ -131,6 +131,9 @@ void ProjMgrCbuild::SetComponentsNode(YAML::Node node, const ContextItem* contex
     if (component.item->instances > 1) {
       SetNodeValue(componentNode[YAML_INSTANCES], to_string(component.item->instances));
     }
+    if (rteComponent->HasMaxInstances()) {
+      SetNodeValue(componentNode[YAML_MAX_INSTANCES], to_string(rteComponent->GetMaxInstances()));
+    }
     SetNodeValue(componentNode[YAML_CONDITION], rteComponent->GetConditionID());
     SetNodeValue(componentNode[YAML_FROM_PACK], rteComponent->GetPackageID());
     SetNodeValue(componentNode[YAML_SELECTED_BY], componentItem->component);

tools/projmgr/test/data/TestSolution/Instances/ref/instances.Debug+RteTest_ARMCM3.cbuild.yml

@@ -46,6 +46,7 @@ build:
   components:
     - component: ARM::RteTest:[email protected]
       instances: 2
+      maxInstances: 2
       from-pack: ARM::[email protected]
       selected-by: RteTest:ComponentLevel
       files:

tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml

@@ -81,6 +81,7 @@ build:
           category: doc
           version: 0.1.1
     - component: ARM::RteTest:[email protected]
+      maxInstances: 2
       from-pack: ARM::[email protected]
       selected-by: RteTest:ComponentLevel
       files: