Changed FvBinding to be a list of Keywords (not using list, just specifying the patte...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@754 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index aedfc868859255c50cc7d20946dbbd2036f03742..bae4d784ff1a546c4bf912b3ccb5f887d44a6f90 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -37,7 +37,7 @@
   </xs:attributeGroup>\r
   <xs:attributeGroup name="EventAttributes">\r
     <xs:attribute name="Usage" type="EventUsage" use="required"/>\r
   </xs:attributeGroup>\r
   <xs:attributeGroup name="EventAttributes">\r
     <xs:attribute name="Usage" type="EventUsage" use="required"/>\r

-    <xs:attribute name="EventGuidCName" type="C_NameType" use="required"/>\r
+    <xs:attribute name="EventGuidCName" type="C_NameType" use="optional"/>\r

     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
   </xs:attributeGroup>\r
     <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
     <xs:attribute name="FeatureFlag" type="FeatureFlagExpressionType" use="optional"/>\r
   </xs:attributeGroup>\r

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 21dfda0c6a5347962d52db5b013647e2a8dfa7ff..d9dedbe86a5662b827dd23ad33b63a40ef0e3412 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -515,14 +515,14 @@
   <xs:element name="ModuleBuildOptions">\r
     <xs:complexType>\r
       <xs:sequence>\r
   <xs:element name="ModuleBuildOptions">\r
     <xs:complexType>\r
       <xs:sequence>\r

-        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" namespace="##local"/>\r
+        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>\r

       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
   <xs:element name="ModuleSaBuildOptions">\r
     <xs:complexType>\r
       <xs:sequence>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
   <xs:element name="ModuleSaBuildOptions">\r
     <xs:complexType>\r
       <xs:sequence>\r

-        <xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="KeywordType"/>\r
+        <xs:element minOccurs="0" maxOccurs="1" name="FvBinding" type="KeywordList"/>\r

         <!-- The FfsFileNameGuid allows the Platform Integrator to specify a GUID for the FFS File Name GUID -->\r
         <xs:element minOccurs="0" maxOccurs="1" name="FfsFileNameGuid" type="GuidType"/>\r
         <!-- If binding is specified, you MUST specify the FfsFormatKey -->\r
         <!-- The FfsFileNameGuid allows the Platform Integrator to specify a GUID for the FFS File Name GUID -->\r
         <xs:element minOccurs="0" maxOccurs="1" name="FfsFileNameGuid" type="GuidType"/>\r
         <!-- If binding is specified, you MUST specify the FfsFormatKey -->\r


@@ -549,7 +549,7 @@
                     <xs:element minOccurs="1" maxOccurs="1" name="ModuleVersion" type="VersionDataType"/>\r
                   </xs:sequence>\r
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->\r
                     <xs:element minOccurs="1" maxOccurs="1" name="ModuleVersion" type="VersionDataType"/>\r
                   </xs:sequence>\r
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->\r

-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="optional"/>\r
+                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>\r

                   <!-- If the original module was installed from a FAR, track the FAR it came from. -->\r
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>\r
                 </xs:complexType>\r
                   <!-- If the original module was installed from a FAR, track the FAR it came from. -->\r
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>\r
                 </xs:complexType>\r


@@ -608,7 +608,7 @@
                     <xs:element minOccurs="1" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>\r
                   </xs:sequence>\r
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->\r
                     <xs:element minOccurs="1" maxOccurs="1" name="PackageVersion" type="VersionDataType"/>\r
                   </xs:sequence>\r
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->\r

-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="optional"/>\r
+                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>\r

                   <!-- If the original Package was installed from a FAR, track the FAR it came from. -->\r
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>\r
                 </xs:complexType>\r
                   <!-- If the original Package was installed from a FAR, track the FAR it came from. -->\r
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>\r
                 </xs:complexType>\r

diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
index ce477cc59df6ccef50effa2b881763eca13bac8d..936b6f2741a9e03e7f3058b69667bec9287ae46d 100644 (file)
--- a/Tools/XMLSchema/NamingConvention.xsd
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -109,6 +109,12 @@
       <xs:pattern value="0x[a-fA-F0-9]{1,4}"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r
       <xs:pattern value="0x[a-fA-F0-9]{1,4}"/>\r
     </xs:restriction>\r
   </xs:simpleType>\r

+  <xs:simpleType name="KeywordList">\r
+    <xs:restriction base="xs:string">\r
+      <xs:minLength value="1"/>\r
+      <xs:pattern value="[a-zA-Z]+(\ *_*[a-zA-Z0-9]*)*"/>\r
+    </xs:restriction>\r
+  </xs:simpleType>\r

   <xs:simpleType name="KeywordType">\r
     <xs:restriction base="xs:normalizedString">\r
       <xs:pattern value="[a-zA-Z]+(_*[a-zA-Z0-9]*)*"/>\r
   <xs:simpleType name="KeywordType">\r
     <xs:restriction base="xs:normalizedString">\r
       <xs:pattern value="[a-zA-Z]+(_*[a-zA-Z0-9]*)*"/>\r

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index 97104e6bf5b5216db5444a6558f6a2ab9d528427..74769d4c8f99deb95fde6d5bad434804430f4228 100644 (file)
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -119,7 +119,7 @@
                     <xs:element minOccurs="1" maxOccurs="1" name="PlatformVersion" type="VersionDataType"/>\r
                   </xs:sequence>\r
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->\r
                     <xs:element minOccurs="1" maxOccurs="1" name="PlatformVersion" type="VersionDataType"/>\r
                   </xs:sequence>\r
                   <!-- The Id is a number used to track heritage  the first entry will be 0 and increment from then on. -->\r

-                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="optional"/>\r
+                  <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required"/>\r

                   <!-- If the original module was installed from a FAR, track the FAR it came from. -->\r
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>\r
                 </xs:complexType>\r
                   <!-- If the original module was installed from a FAR, track the FAR it came from. -->\r
                   <xs:attribute name="FarGuid" type="GuidType" use="optional"/>\r
                 </xs:complexType>\r