From 5849ba88a1a20e4d3584843e0be46e456c5f7980 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@sentrium.io>
Date: Fri, 10 Jan 2020 11:52:26 -0600
Subject: xml: T1962: Add syntaxVersion to schema

---
 schema/interface_definition.rnc | 17 +++++++++++++++++
 schema/interface_definition.rng | 18 ++++++++++++++++++
 scripts/build-command-templates |  2 ++
 3 files changed, 37 insertions(+)

diff --git a/schema/interface_definition.rnc b/schema/interface_definition.rnc
index 02175fec8..0ce8226cd 100644
--- a/schema/interface_definition.rnc
+++ b/schema/interface_definition.rnc
@@ -24,9 +24,16 @@
 # Interface definition starts with interfaceDefinition tag that may contain node tags
 start = element interfaceDefinition
 {
+    syntaxVersion*,
     node*
 }
 
+# interfaceDefinition may contain syntax version attribute lists.
+syntaxVersion = element syntaxVersion
+{
+    (componentAttr & versionAttr)
+}
+
 # node tag may contain node, leafNode, or tagNode tags
 # Those are intermediate configuration nodes that may only contain
 # other nodes and must not have values
@@ -97,6 +104,16 @@ properties = element properties
     (element keepChildOrder { empty })?
 }
 
+componentAttr = attribute component
+{
+    text
+}
+
+versionAttr = attribute version
+{
+    text
+}
+
 # All nodes must have "name" attribute
 nodeNameAttr = attribute name
 {
diff --git a/schema/interface_definition.rng b/schema/interface_definition.rng
index 195ef27f4..bfd8d376f 100644
--- a/schema/interface_definition.rng
+++ b/schema/interface_definition.rng
@@ -28,11 +28,23 @@
   <!-- Interface definition starts with interfaceDefinition tag that may contain node tags -->
   <start>
     <element name="interfaceDefinition">
+      <zeroOrMore>
+        <ref name="syntaxVersion"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="node"/>
       </zeroOrMore>
     </element>
   </start>
+  <!-- interfaceDefinition may contain syntax version attribute lists. -->
+  <define name="syntaxVersion">
+    <element name="syntaxVersion">
+      <interleave>
+        <ref name="componentAttr"/>
+        <ref name="versionAttr"/>
+      </interleave>
+    </element>
+  </define>
   <!--
     node tag may contain node, leafNode, or tagNode tags
     Those are intermediate configuration nodes that may only contain
@@ -184,6 +196,12 @@
       </interleave>
     </element>
   </define>
+  <define name="componentAttr">
+    <attribute name="component"/>
+  </define>
+  <define name="versionAttr">
+    <attribute name="version"/>
+  </define>
   <!-- All nodes must have "name" attribute -->
   <define name="nodeNameAttr">
     <attribute name="name"/>
diff --git a/scripts/build-command-templates b/scripts/build-command-templates
index 4fcdb8ade..dbf4ad9c5 100755
--- a/scripts/build-command-templates
+++ b/scripts/build-command-templates
@@ -295,4 +295,6 @@ root = xml.getroot()
 
 nodes = root.iterfind("*")
 for n in nodes:
+    if n.tag == "syntaxVersion":
+        continue
     process_node(n, [output_dir])
-- 
cgit v1.2.3