merged part of new changes in new schema, and changed genbuild code accordingly

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

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index 7b0c08c78fb73bc6bb93d8681531fabe39ed23c9..c5de6b308270b5b261da90b74f5a7e6aa0091b46 100644 (file)
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -24,6 +24,8 @@
                 <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" ref="FarList"/>                \r
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
@@ -34,18 +36,12 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDefinitions"/>                \r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>\r
                 <!-- DO NOT USE! removing TianoImage, use FrameworkModules instead. -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="TianoImage"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="FrameworkModules"/>\r
-                <!-- DO NOT USE! removing PcdBuildDeclarations here, use PcdBuildDeclaratiion in ModuleSA instead. -->\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>\r
-                <xs:choice minOccurs="0">\r
-                    <!-- DO NOT USE! removing PcdDynamicBuildDeclarations here, use DynamicPcdBuildDefinitions in ModuleSA instead. -->\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="PcdDynamicBuildDeclarations"/>\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>\r
-                </xs:choice>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
             </xs:sequence>\r
@@ -100,6 +96,7 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
@@ -137,12 +134,13 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModuleDefinitions"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>\r
                 <xs:choice minOccurs="0">\r
-                  <!-- DO NOT USE! removing Includes, use PackageDependencies instead -->\r
-                  <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>\r
-                  <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
+                    <!-- DO NOT USE! removing Includes, use PackageDependencies instead -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
                 </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>\r
@@ -163,6 +161,7 @@
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>\r
                 </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModuleBuildOptions"/>\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
@@ -174,10 +173,12 @@
         <xs:complexType>\r
             <xs:sequence>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageDefinitions"/>                \r
                 <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdIncludes"/>\r
-                <!-- DO NOT USE removing PackageDependencies, this is moving to FDP installation process -->\r
+                <!-- DO NOT USE removing THIS INSTANCE of PackageDependencies, this is moving to FDP installation process -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>\r
+                <!-- DO NOT USE removing MsaFiles, use MsaFileList instead , do not wrap in choice, too many entries to convert all at once. -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>\r