Added Options and UserExtensions sections to ModuleBuildOptions, replacing the lax...

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

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 0695932c7d9217cb702aeb18decba9bc1841e742..db1a585f8a6d06a74ac8d57b87b1fc422911d2e7 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -241,32 +241,32 @@
         <xs:element minOccurs="0" maxOccurs="unbounded" name="Specification" type="Sentence"/>\r
         <xs:element minOccurs="0" maxOccurs="unbounded" name="Extern">\r
           <xs:complexType>\r
-            <xs:choice minOccurs="1">\r
-              <xs:sequence>\r
+            <xs:choice minOccurs="1" maxOccurs="1">\r
+              <xs:sequence minOccurs="0" maxOccurs="1">\r
                 <xs:annotation>\r
                   <xs:documentation xml:lang="en">Driver Module</xs:documentation>\r
                 </xs:annotation>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="ModuleEntryPoint" type="C_NameType"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="ModuleUnloadImage" type="C_NameType"/>\r
               </xs:sequence>\r
-              <xs:sequence>\r
+              <xs:sequence minOccurs="0" maxOccurs="1">\r
                 <xs:annotation>\r
                   <xs:documentation xml:lang="en">Library Module</xs:documentation>\r
                 </xs:annotation>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="Constructor" type="C_NameType"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="Destructor" type="C_NameType"/>\r
               </xs:sequence>\r
-              <xs:sequence>\r
+              <xs:sequence minOccurs="0" maxOccurs="1">\r
                 <xs:annotation>\r
                   <xs:documentation xml:lang="en">Allow multiple entries for DriverBinding, ComponentName, DriverConfig and DriverDiag elements. For ComponentName, DriverConfig and/or DriverDiag - you must have a 1:1 mapping to DriverBinding if the element is defined.</xs:documentation>\r
                   <xs:documentation xml:lang="en">Permit User Defined Extern Tags</xs:documentation>\r
                 </xs:annotation>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="DriverBinding" type="C_NameType"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" name="DriverBinding" type="C_NameType"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="ComponentName" type="C_NameType"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="DriverConfig" type="C_NameType"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" name="DriverDiag" type="C_NameType"/>\r
               </xs:sequence>\r
-              <xs:sequence>\r
+              <xs:sequence minOccurs="0" maxOccurs="1">\r
                 <xs:annotation>\r
                   <xs:documentation xml:lang="en"> Module Call Backs</xs:documentation>\r
                 </xs:annotation>\r
@@ -461,7 +461,8 @@
   <xs:element name="ModuleBuildOptions">\r
     <xs:complexType>\r
       <xs:sequence>\r
-        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>\r
+        <xs:element minOccurs="0" maxOccurs="1" ref="Options"/>\r
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
@@ -529,6 +530,13 @@
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
+  <xs:element name="NonProcessedFiles">\r
+    <xs:complexType>\r
+      <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
+        <xs:element name="Filename" type="PathAndFilename"/>\r
+      </xs:sequence>\r
+    </xs:complexType>\r
+  </xs:element>\r
   <xs:element name="Option">\r
     <!-- This element is used to store flags from the Tools -->\r
     <xs:complexType>\r