Changed FvBinding to be a list of Keywords (not using list, just specifying the patte...
authorlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 5 Jul 2006 04:05:10 +0000 (04:05 +0000)
committerlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Wed, 5 Jul 2006 04:05:10 +0000 (04:05 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@754 6f19259b-4bc3-4df7-8a09-765794883524

Tools/XMLSchema/FrameworkDataAttributes.xsd
Tools/XMLSchema/FrameworkDataElements.xsd
Tools/XMLSchema/NamingConvention.xsd
Tools/XMLSchema/SurfaceArea.xsd

index aedfc86..bae4d78 100644 (file)
@@ -37,7 +37,7 @@
   </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
index 21dfda0..d9dedbe 100644 (file)
   <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: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
                     <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
                     <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
index ce477cc..936b6f2 100644 (file)
       <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
index 97104e6..74769d4 100644 (file)
                     <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