Updated the FPD and SPD files to newer schema formats. Also updated a couple of...

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

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index 3937dc5c844883ec9040e64c276dfbb082303dcb..a34d7a088f4a0f7a8aed3bdbd36d5f44c221063a 100644 (file)
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -20,21 +20,41 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="DatabaseName"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>\r
+                <!-- Value fixed during initialization: FrameworkDatabase -->\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>\r
+                    <!-- Guid needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
+                    <!-- GuidValue needs to be required -->\r
+                </xs:choice>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\r
+                <!-- Version is the version of this file -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                <!-- Path needs to be removed -->\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <!-- Created needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                    <!-- CreatedDate needs to be required -->\r
+                </xs:choice>\r
+                <xs:choice minOccurs="0">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                    <!-- Updated needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="UpdatedDate"/>\r
+                </xs:choice>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
+                <!-- Specificatoin needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="MbdHeader">\r
+        <!-- MbdHeader needs to be removed -->\r
         <xs:annotation>\r
-            <xs:documentation xml:lang="en">This is the header for the Component Module Build Description (MBD) file. NOTE: The GUID may be different from the GUID in the MSA file, as the Guid is updated every time the file is changed, as the Guid may change if the contents of the file are changed.</xs:documentation>\r
+            <xs:documentation xml:lang="en">DO NOT USE! This is the header for the Component Module Build Description (MBD) file. NOTE: The GUID may be different from the GUID in the MSA file, as the Guid is updated every time the file is changed, as the Guid may change if the contents of the file are changed.</xs:documentation>\r
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -44,14 +64,22 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
+                </xs:choice>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="MbdLibHeader">\r
+        <!-- MbdLibHeader needs to be removed -->\r
         <xs:annotation>\r
-            <xs:documentation xml:lang="en">This is the header for the Library Module Build Description (MBD) file. NOTE: The Guid may be different from the Guid in the MSA file, as the Guid may change when the contents of the file are changed..</xs:documentation>\r
+            <xs:documentation xml:lang="en">DO NOT USE! This is the header for the Library Module Build Description (MBD) file. NOTE: The Guid may be different from the Guid in the MSA file, as the Guid may change when the contents of the file are changed..</xs:documentation>\r
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -61,8 +89,15 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
+                </xs:choice>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -72,24 +107,49 @@
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="BaseName"/>\r
+                <xs:choice>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="BaseName"/>\r
+                    <!-- BaseName needs to be removed  -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" name="ModuleName" type="xs:NCName"/>\r
+                </xs:choice>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="ModuleType"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="ComponentType"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>\r
+                <xs:choice>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>\r
+                    <!-- Guid needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
+                    <!-- GuidValue needs to be required -->\r
+                </xs:choice>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <!-- Created needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                    <!-- CreatedDate needs to be required -->\r
+                </xs:choice>\r
+                <xs:choice>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                    <!-- Updated needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
+                </xs:choice>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="SupportedArchitectures">\r
+                    <xs:simpleType>\r
+                        <xs:list itemType="SupportedArchitectures"/>\r
+                    </xs:simpleType>\r
+                </xs:element>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
     <xs:element name="MsaLibHeader">\r
+        <!-- MsaLibHeader needs to be removed -->\r
         <xs:annotation>\r
-            <xs:documentation xml:lang="en">This is the Library Module Surface Area Description Header - a replacement for INF files. The Guid may change when the contents of the file are changed.</xs:documentation>\r
+            <xs:documentation xml:lang="en">DO NOT USE! This is the Library Module Surface Area Description Header - a replacement for INF files. The Guid may change when the contents of the file are changed.</xs:documentation>\r
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r
@@ -102,9 +162,12 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -114,21 +177,36 @@
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element minOccurs="1" maxOccurs="1" name="PlatformName" type="PlatformNamingConvention">\r
-                    <xs:annotation>\r
-                        <xs:documentation xml:lang="en">Define the Name of a Platform</xs:documentation>\r
-                    </xs:annotation>\r
-                </xs:element>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" name="PlatformName" type="PlatformNamingConvention"/>\r
+                <xs:choice>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>\r
+                    <!-- DO NOT USE Guid needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
+                    <!-- GuidValue needs to be required -->\r
+                </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
-                <xs:element maxOccurs="1" minOccurs="1" ref="CreatedBy"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <!-- DO NOT USE Created needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                    <!-- CreatedDate needs to be required -->\r
+                </xs:choice>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy"/>\r
+                <!-- DO NOT USE CreatedBy needs to be removed -->\r
+                <xs:choice>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                    <!-- DO NOT USE Updated needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
+                </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageType"/>\r
+                <!-- DO NOT USE PackageType needs to be removed -->\r
+                <xs:element minOccurs="0" maxOccurs="1" name="BuildTarget" type="BuildTargets"/>\r
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>\r
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -139,21 +217,38 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageName"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>\r
+                    <!-- Guid needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
+                    <!-- GuidValue needs to be required -->\r
+                </xs:choice>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="License"/>\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>\r
+                <xs:choice minOccurs="1" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <!-- Created needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
+                    <!-- CreatedDate needs to be required -->\r
+                </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                <xs:choice minOccurs="0" maxOccurs="1">\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                    <!-- Created needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
+                    <!-- CreatedDate needs to be required -->\r
+                </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="URL"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageType"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>\r
+                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>\r
+                <!-- OutputDirectory needs to be removed -->\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r