merged the new changes in new schema, and corrected many inconsistencies in attribute...

[mirror_edk2.git] / Tools / XMLSchema / NamingConvention.xsd

diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
index c301bfbf5a9e535dc909eb0d30af0dafa810c383..987c97155cb606dbf9ea7dc02945639c2296805c 100644 (file)
--- a/Tools/XMLSchema/NamingConvention.xsd
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -31,6 +31,14 @@
             <xs:pattern value="((_)*([a-zA-Z])+((_)*[a-zA-Z0-9]*))*"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
+    <xs:simpleType name="C_NameType">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en"> C_Names must start with either an underscore (_) character followed by one or more alpha characters, followed by any combination of underscore or alphanumeric characters.</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:restriction base="xs:string">\r
+            <xs:pattern value="((_)*([a-zA-Z])+((_)*[a-zA-Z0-9]*))*"/>\r
+        </xs:restriction>\r
+    </xs:simpleType>    \r
     <xs:simpleType name="DirectoryNamingConvention">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en"> Directory naming convention is a UNION of DOS an UNIX directory path names </xs:documentation>\r
@@ -172,7 +180,7 @@
         <xs:annotation>\r
             <xs:documentation xml:lang="en">This describes the normal text of a paragraph that can be used in a license or description tag.</xs:documentation>\r
         </xs:annotation>\r
-        <xs:restriction base="xs:normalizedString"/>\r
+        <xs:restriction base="xs:string"/>\r
     </xs:simpleType>\r
     <xs:simpleType name="PathAndFilename">\r
         <xs:annotation>\r
@@ -212,6 +220,14 @@
             <xs:pattern value="[a-zA-Z][a-zA-Z0-9]*(_*-*.*[a-zA-Z0-9])*"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
+    <xs:simpleType name="ToolsNameConvention">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">This data type is used for ToolCommand, ToolChainFamily and TagName.</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:restriction base="xs:NCName">\r
+            <xs:pattern value="[a-zA-Z][a-zA-Z0-9]*"/>\r
+        </xs:restriction>\r
+    </xs:simpleType>    \r
     <xs:simpleType name="UCLetterType">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en"> Definition of a UpperCase Letter type, which can be any combination of upper case characters followed by zero or more underscore and/or uppercase alphanumeric characters </xs:documentation>\r
@@ -304,10 +320,10 @@
     </xs:simpleType>\r
     <xs:simpleType name="VersionDataType">\r
         <xs:annotation>\r
-            <xs:documentation xml:lang="en"> Definition of a Version Number, which can be any combination of a number followed by zero or more alphanumeric-dot-alphanumeric characters </xs:documentation>\r
+            <xs:documentation xml:lang="en"> Definition of a Version Number, which must be a decimal number (or Zero) </xs:documentation>\r
         </xs:annotation>\r
         <xs:restriction base="xs:string">\r
-            <xs:pattern value="xs:normalizedString"/>\r
+            <xs:pattern value="(\d)+(.)?(\d)+"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r
     <xs:simpleType name="Zero">\r
@@ -330,5 +346,5 @@
         <xs:restriction base="xs:normalizedString">\r
             <xs:pattern value="[a-zA-Z]+(_*[a-zA-Z0-9]*)*"/>\r
         </xs:restriction>\r
-    </xs:simpleType>    \r
+    </xs:simpleType>   \r
 </xs:schema>\r