Validate cbuild-set context node

Open-CMSIS-Pack · Nov 14, 2023 · ab7ac46 · ab7ac46
1 parent 963c114
commit ab7ac46
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/tools/projmgr/schemas/cbuildset.schema.json → tools/projmgr/schemas/cbuild-set.schema.json b/tools/projmgr/schemas/cbuildset.schema.json → tools/projmgr/schemas/cbuild-set.schema.json
diff --git a/tools/projmgr/schemas/common.schema.json b/tools/projmgr/schemas/common.schema.json
@@ -25,6 +25,12 @@
       "minItems": 1,
       "items": { "$ref": "#/definitions/BuildContext" }
     },
+    "ArrayOfBuildContextWithProjectName": {
+      "type": "array",
+      "uniqueItems": true,
+      "minItems": 1,
+      "items": { "$ref": "#/definitions/BuildContextWithProjectName" }
+    },
     "ConditionIDType": {
       "type": "string"
     },
@@ -1120,7 +1126,7 @@
       "type": "object",
       "properties": {
         "generated-by": { "type": "string", "description": "Tool name along with version information used to generate this application" },
-        "contexts": { "$ref": "#/definitions/ArrayOfStrings", "description": "List of fully specified contexts" },
+        "contexts": { "$ref": "#/definitions/ArrayOfBuildContextWithProjectName", "description": "List of fully specified contexts" },
         "compiler": { "type": "string", "description": "Selection of compiler used" }
       },
       "additionalProperties": false,

diff --git a/tools/projmgr/src/ProjMgrYamlSchemaChecker.cpp b/tools/projmgr/src/ProjMgrYamlSchemaChecker.cpp
@@ -74,7 +74,7 @@ bool ProjMgrYamlSchemaChecker::GetSchemaFile(string& schemaFile, const ProjMgrYa
     schemaFileName = "cbuild-idx.schema.json";
     break;
   case ProjMgrYamlSchemaChecker::FileType::BUILDSET:
-    schemaFileName = "cbuildset.schema.json";
+    schemaFileName = "cbuild-set.schema.json";
     break;
   case ProjMgrYamlSchemaChecker::FileType::GENERATOR:
     schemaFileName = "generator.schema.json";