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

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

1 files changed, 93 insertions, 62 deletions

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index d07712a663..d43cd96bbd 100644
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -76,6 +76,9 @@
             <xs:sequence minOccurs="1" maxOccurs="unbounded">

                 <xs:element name="BootMode">

                     <xs:complexType>

+                        <xs:sequence minOccurs="0">

+                            <xs:element name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

                         <xs:attributeGroup ref="BootModeAttributes"/>

                     </xs:complexType>

                 </xs:element>

@@ -213,12 +216,12 @@
         <xs:complexType>

             <xs:sequence minOccurs="1" maxOccurs="unbounded">

                 <xs:element name="DataHubRecord">

-                    <xs:complexType>

-                        <xs:simpleContent>

-                            <xs:extension base="C_NameType">

-                                <xs:attributeGroup ref="DataHubAttributes"/>

-                            </xs:extension>

-                        </xs:simpleContent>

+                    <xs:complexType mixed="true">

+                        <xs:sequence>

+                            <xs:element minOccurs="0" maxOccurs="1" name="DataHubCName" type="C_NameType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="DataHubAttributes"/>

                     </xs:complexType>

                 </xs:element>

                 <!-- Remove Arch and use Arch Attribute for DataHubRecord instead. -->

@@ -282,7 +285,16 @@
                 <xs:element minOccurs="0" maxOccurs="1" name="CreateEvents">

                     <xs:complexType>

                         <xs:sequence minOccurs="1" maxOccurs="unbounded">

-                            <xs:element name="Event">

+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="EventTypes">

+                                <xs:complexType>

+                                    <xs:sequence>

+                                        <xs:element minOccurs="1" maxOccurs="1" name="EventType" type="EventTypes"/>

+                                        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                                    </xs:sequence>

+                                    <xs:attributeGroup ref="EventAttributes"/>

+                                </xs:complexType>

+                            </xs:element>                            

+                            <xs:element minOccurs="0" name="Event">

                                 <xs:complexType>

                                     <xs:sequence>

                                         <xs:choice>

@@ -328,7 +340,16 @@
                     </xs:annotation>

                     <xs:complexType>

                         <xs:sequence minOccurs="1" maxOccurs="unbounded">

-                            <xs:element name="Event">

+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="EventTypes">

+                                <xs:complexType>

+                                    <xs:sequence>

+                                        <xs:element minOccurs="1" maxOccurs="1" name="EventType" type="EventTypes"/>

+                                        <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                                    </xs:sequence>

+                                    <xs:attributeGroup ref="EventAttributes"/>

+                                </xs:complexType>

+                            </xs:element>                            

+                            <xs:element minOccurs="0" name="Event">

                                 <xs:complexType>

                                     <xs:sequence>

                                         <xs:choice>

@@ -589,19 +610,19 @@
     <xs:element name="Guids">

         <xs:complexType>

             <xs:sequence minOccurs="1" maxOccurs="unbounded">

-                <xs:element minOccurs="0" maxOccurs="unbounded" name="GuidCName">

+                <xs:element minOccurs="0" maxOccurs="unbounded" name="GuidCNames">

                     <xs:annotation>

                         <xs:documentation xml:lang="en">Describe the valid content of a GUID element in and MSA file.</xs:documentation>

                     </xs:annotation>

                     <xs:complexType>

-                        <xs:simpleContent>

-                            <xs:extension base="C_NameType">

-                                <xs:attributeGroup ref="GuidAttributes"/>

-                            </xs:extension>

-                        </xs:simpleContent>

+                        <xs:sequence>

+                            <xs:element minOccurs="1" maxOccurs="1" name="GuidCName" type="C_NameType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="GuidAttributes"/>

                     </xs:complexType>

-                </xs:element>                

-                <xs:element name="GuidEntry">

+                </xs:element>

+                <xs:element minOccurs="0" name="GuidEntry">

                     <xs:annotation>

                         <xs:documentation xml:lang="en">Describe the valid content of a GUID element in and MSA file.</xs:documentation>

                     </xs:annotation>

@@ -659,12 +680,12 @@
         <xs:complexType>

             <xs:sequence minOccurs="1" maxOccurs="unbounded">

                 <xs:element name="HiiPackage">

-                    <xs:complexType>

-                        <xs:simpleContent>

-                            <xs:extension base="C_NameType">

-                                <xs:attributeGroup ref="HiiPackageAttributes"/>

-                            </xs:extension>

-                        </xs:simpleContent>

+                    <xs:complexType mixed="true">

+                        <xs:sequence>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HiiCName" type="C_NameType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="HiiPackageAttributes"/>

                     </xs:complexType>

                 </xs:element>

             </xs:sequence>

@@ -673,7 +694,16 @@
     <xs:element name="Hobs">

         <xs:complexType>

             <xs:sequence minOccurs="1" maxOccurs="unbounded">

-                <xs:element name="Hob">

+                <xs:element minOccurs="0" maxOccurs="unbounded" name="HobTypes">

+                    <xs:complexType>

+                        <xs:sequence>

+                            <xs:element minOccurs="1" maxOccurs="1" name="HobType" type="HobTypes"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="HobAttributes"/>

+                    </xs:complexType>

+                </xs:element>                

+                <xs:element minOccurs="0" name="Hob">

                     <xs:complexType>

                         <xs:sequence>

                             <xs:choice>

@@ -806,12 +836,12 @@
         <xs:annotation>

             <xs:documentation xml:lang="en">Used in MSA files. This defines what class of library is being supported = produced (library module) or consumed by a module.</xs:documentation>

         </xs:annotation>

-        <xs:complexType>

-            <xs:simpleContent>

-                <xs:extension base="KeywordType">

-                    <xs:attributeGroup ref="LibraryClassAttributes"/>

-                </xs:extension>

-            </xs:simpleContent>

+        <xs:complexType mixed="true">

+            <xs:sequence>

+                <xs:element minOccurs="0" maxOccurs="1" name="Keyword" type="KeywordType"/>

+                <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+            </xs:sequence>            

+            <xs:attributeGroup ref="LibraryClassAttributes"/>

         </xs:complexType>

     </xs:element>

     <!-- LAH This is LibraryClassDeclaration FINAL version -->

@@ -860,8 +890,8 @@
             <xs:documentation xml:lang="en">This section defines what Classes of Library that this library supports. A Library may belong to multiple different library classes.</xs:documentation>

         </xs:annotation>

         <xs:complexType>

-            <xs:sequence minOccurs="1" maxOccurs="unbounded">

-                <xs:element ref="LibraryClass"/>

+            <xs:sequence>

+                <xs:element ref="LibraryClass" minOccurs="1" maxOccurs="unbounded"/>

             </xs:sequence>

         </xs:complexType>

     </xs:element>

@@ -1417,21 +1447,21 @@
         <xs:complexType>

             <xs:sequence minOccurs="1">

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Ppi">

-                    <xs:complexType>

-                        <xs:simpleContent>

-                            <xs:extension base="C_NameType">

-                                <xs:attributeGroup ref="PpiAttributes"/>

-                            </xs:extension>

-                        </xs:simpleContent>

+                    <xs:complexType mixed="true">

+                        <xs:sequence>

+                            <xs:element minOccurs="0" maxOccurs="1" name="PpiCName" type="C_NameType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="PpiAttributes"/>

                     </xs:complexType>

                 </xs:element>

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="PpiNotify">

-                    <xs:complexType>

-                        <xs:simpleContent>

-                            <xs:extension base="C_NameType">

-                                <xs:attributeGroup ref="PpiNotifyAttributes"/>

-                            </xs:extension>

-                        </xs:simpleContent>

+                    <xs:complexType mixed="true">

+                        <xs:sequence>

+                            <xs:element minOccurs="0" maxOccurs="1" name="PpiNotifyCName" type="C_NameType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="PpiNotifyAttributes"/>

                     </xs:complexType>

                 </xs:element>

                 <!-- DO NOT USE Arch element, use Arch Attribute in above instead. -->

@@ -1492,21 +1522,21 @@
         <xs:complexType>

             <xs:sequence minOccurs="1" maxOccurs="unbounded">

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Protocol">

-                    <xs:complexType>

-                        <xs:simpleContent>

-                            <xs:extension base="C_NameType">

-                                <xs:attributeGroup ref="ProtocolAttributes"/>

-                            </xs:extension>

-                        </xs:simpleContent>

+                    <xs:complexType mixed="true">

+                        <xs:sequence>

+                            <xs:element minOccurs="0" maxOccurs="1" name="ProtocolCName" type="C_NameType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="ProtocolAttributes"/>

                     </xs:complexType>

                 </xs:element>

                 <xs:element minOccurs="0" maxOccurs="unbounded" name="ProtocolNotify">

-                    <xs:complexType>

-                        <xs:simpleContent>

-                            <xs:extension base="C_NameType">

-                                <xs:attributeGroup ref="ProtocolNotifyAttributes"/>

-                            </xs:extension>

-                        </xs:simpleContent>

+                    <xs:complexType mixed="true">

+                        <xs:sequence>

+                            <xs:element minOccurs="0" maxOccurs="1" name="ProtocolNotifyCName" type="C_NameType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="ProtocolNotifyAttributes"/>

                     </xs:complexType>

                 </xs:element>

                 <!-- DO NOT USE! removing Arch element, use Arch attribute of Protocol or ProtocolNotify instead. -->

@@ -1643,15 +1673,15 @@
                         <xs:attributeGroup ref="SystemTableAttributes"/>

                     </xs:complexType>

                 </xs:element>

-                <xs:element minOccurs="0" maxOccurs="unbounded" name="SystemTableCName">

+                <xs:element minOccurs="0" maxOccurs="unbounded" name="SystemTableCNames">

                     <xs:complexType>

-                        <xs:simpleContent>

-                            <xs:extension base="C_NameType">

-                                <xs:attributeGroup ref="SystemTableAttributes"/>

-                            </xs:extension>

-                        </xs:simpleContent>

+                        <xs:sequence>

+                            <xs:element minOccurs="1" maxOccurs="1" name="SystemTableCName" type="C_NameType"/>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>

+                        </xs:sequence>

+                        <xs:attributeGroup ref="SystemTableAttributes"/>

                     </xs:complexType>

-                </xs:element>                

+                </xs:element>

             </xs:sequence>

         </xs:complexType>

     </xs:element>

@@ -1705,6 +1735,7 @@
                                 <!-- Make GuidC_Name required -->

                                 <xs:element minOccurs="0" maxOccurs="1" name="GuidC_Name" type="C_NameType"/>

                             </xs:choice>

+                            <xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>                            

                             <!-- DO NOT USE, removiing  ByteOffset, Bit Offset and OffsetBitSize-->

                             <xs:element minOccurs="0" maxOccurs="1" name="ByteOffset" type="HexWordDataType">

                                 <xs:annotation>