Intermediate Check-in This is not the final version of the XML Transition Schema - what is here works. More will come later.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@445 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch 2006-06-08 23:46:59 +00:00
parent 2da8968bb5
commit c12c6c7dc6
5 changed files with 295 additions and 840 deletions

View File

@ -23,7 +23,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="BootModeAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute name="BootModeName" type="BootModeNames" use="required"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -38,7 +38,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="DataHubAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -51,7 +51,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="EventAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute name="EventGroup" type="EventTypes" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
@ -62,7 +62,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="ExternAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -72,7 +72,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="FilenameAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<!-- LAH Does a Filename need to have FeatureFlag Attribute? -->
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
@ -86,7 +86,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="FormsetAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -96,7 +96,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="GuidAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Usage" type="GuidUsage" use="optional"/>
@ -105,7 +105,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="HobAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -115,9 +115,10 @@
<!-- DO NOT USE remove OverrideID from use -->
<xs:attribute name="OverrideID" type="xs:int" use="optional"/>
</xs:attributeGroup>
<!-- DO NOT USE remove IncludeAttributes from use -->
<xs:attributeGroup name="IncludeAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute name="Class" type="BaseNameConvention" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<!-- LAH Does a Include need to have FeatureFlag Attribute? -->
@ -129,10 +130,20 @@
<!-- DO NOT USE remove OverrideID from use -->
<xs:attribute name="OverrideID" type="xs:int" use="optional"/>
</xs:attributeGroup>
<xs:attributeGroup name="IncludeHeaderAttributes">
<xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>
</xs:attributeGroup>
<xs:attributeGroup name="IndustryStdHeaderAttributes">
<xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="ModuleTypeList" type="ModuleTypeList" use="optional"/>
</xs:attributeGroup>
<xs:attributeGroup name="LibraryAttributes">
<!-- LibraryAttributes is used for Libraries -> Library elements in FPD files -->
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<!-- LAH Does a LibraryInstance need to have FeatureFlag Attribute? -->
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
@ -159,7 +170,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="LibraryClassAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>
<xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
@ -184,7 +195,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="MsaAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute name="BuildSequence" type="xs:int" use="optional"/>
<xs:attribute name="FvBinding" type="xs:string" use="optional"/>
<xs:attribute name="ModuleName" type="xs:NCName" use="optional"/>
@ -194,7 +205,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="OptionAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute name="BuildTarget" type="BuildTargets" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<!-- LAH Does an Option need to have FeatureFlag Attribute? -->
@ -207,7 +218,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="PackageAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute name="PackageGuid" type="GuidType" use="optional"/>
<xs:attribute name="PackageType" type="PackageType" use="optional"/>
<xs:attribute name="PackageVersion" type="xs:string" use="optional"/>
@ -217,7 +228,7 @@
<!-- PackageNameAttributres are only used in the Package Dependencies section of an SPD file. -->
<xs:attributeGroup name="PackageNameAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<!-- DO NOT USE remove Guid and start using PackageGuid instead -->
<xs:attribute name="Guid" type="GuidType" use="optional"/>
<xs:attribute name="PackageGuid" type="GuidType" use="optional"/>
@ -234,7 +245,7 @@
<xs:documentation xml:lang="en">Only NON FEATURE_FLAG PCDS should have the FeatureFlag attribute set.</xs:documentation>
</xs:annotation>
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>
@ -242,11 +253,16 @@
<!-- DO NOT USE remove OverrideID from use -->
<xs:attribute name="OverrideID" type="xs:int" use="optional"/>
</xs:attributeGroup>
<xs:attributeGroup name="PcdDeclarationAttributes">
<xs:attribute name="SupArchList" type="ArchListType" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="SupModuleTypes" type="ModuleTypeList" use="optional"/>
</xs:attributeGroup>
<xs:attributeGroup name="PlatformAttributes">
<!-- DO NOT USE remove AlternateName from use -->
<xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<!-- DO NOT USE remove Guid from use -->
<xs:attribute name="Guid" type="GuidType" use="optional"/>
<xs:attribute name="PlatformName" type="PlatformNamingConvention" use="optional"/>
@ -257,7 +273,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="PpiAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -267,7 +283,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="PpiNotifyAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -277,7 +293,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="ProtocolAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -287,7 +303,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="ProtocolNotifyAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
<xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>
@ -321,7 +337,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="SystemTableAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>
@ -334,7 +350,7 @@
</xs:attributeGroup>
<xs:attributeGroup name="VariableAttributes">
<xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
<xs:attribute name="ArchType" type="ArchList" use="optional"/>
<xs:attribute name="ArchType" type="ArchListType" use="optional"/>
<xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
<xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>
<xs:attribute name="Guid" type="GuidType" use="optional"/>

View File

@ -472,9 +472,6 @@
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element name="Formset">
<xs:annotation>
<xs:documentation xml:lang="en">Describe the valid content of a Formset</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
<xs:extension base="C_Name">
@ -586,11 +583,26 @@
</xs:complexType>
</xs:element>
<xs:element name="GuidValue" type="GuidType"/>
<xs:element name="HelpText" type="Paragraph">
<xs:element name="HelpText" type="Paragraph"/>
<xs:element name="HiiPackages">
<xs:annotation>
<xs:documentation xml:lang="en">This section is used to describe how a GUID, PPI or PROTOCOL is to be used within the context of PCDs.</xs:documentation>
<xs:documentation xml:lang="en">Describe the list of a HiiPackage elements</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element name="HiiPackage">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="C_Name">
<xs:attributeGroup ref="FormsetAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Hobs">
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="unbounded">
@ -632,7 +644,8 @@
<xs:element name="IncludeHeader">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="FileNameConvention">
<xs:extension base="PathAndFilename">
<!-- Need to use IncludeHeaderAttributes in final -->
<xs:attributeGroup ref="IncludeAttributes"/>
</xs:extension>
</xs:simpleContent>
@ -657,13 +670,23 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="IndustryStdHeaders">
<xs:element name="IndustryStdIncludes">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="unbounded" ref="IncludeHeader"/>
<xs:element minOccurs="1" maxOccurs="unbounded" ref="IndustryStdHeader"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="IndustryStdHeader">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="Header" type="UiNameType"/>
<xs:element minOccurs="1" maxOccurs="1" name="IncludeHeader" type="PathAndFilename"/>
<xs:element minOccurs="1" maxOccurs="1" ref="HelpText"/>
</xs:sequence>
<xs:attributeGroup ref="IndustryStdHeaderAttributes"/>
</xs:complexType>
</xs:element>
<xs:element name="InstalledDate" type="DateType"/>
<xs:element name="Libraries">
<xs:annotation>
@ -713,21 +736,19 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
<!-- LAH This is LibraryClassDeclaration FINAL version -->
<xs:element name="LibraryClassDeclaration">
<xs:annotation>
<xs:documentation xml:lang="en">This element defines a class of library, along with the path to the Include Header for this library</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence minOccurs="0">
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="LibraryClass">
<xs:annotation>
<xs:documentation xml:lang="en">Used in MSA and SPD 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="BaseNameConvention">
<xs:attribute name="RecommendedInstance" type="xs:NCName" use="optional"/>
<xs:extension base="xs:NCName">
<xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>
<xs:attribute name="RecommendedInstanceVersion" type="xs:decimal" use="optional"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@ -736,13 +757,11 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<!-- LAH This is LibraryClassDeclarations FINAL version -->
<xs:element name="LibraryClassDeclarations">
<xs:annotation>
<xs:documentation xml:lang="en">This section defines what Classes of Libraries that this library belongs to. A Library may belong to multiple different library classes.</xs:documentation>
</xs:annotation>
<xs:complexType mixed="true">
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element ref="LibraryClassDeclaration"/>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="unbounded" ref="LibraryClassDeclaration"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@ -853,30 +872,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="MsaPcdDeclarations">
<xs:annotation>
<xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence minOccurs="1">
<xs:element maxOccurs="unbounded" name="PcdEntry">
<xs:annotation>
<xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>
<xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
<xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
<xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
</xs:sequence>
<!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->
<xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="MsaFileList">
<xs:annotation>
<xs:documentation xml:lang="en">Surface Area Package Description (SPD) list of Module Surface Area files</xs:documentation>
@ -1363,7 +1358,7 @@
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
<xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
<xs:element minOccurs="0" maxOccurs="1" name="HelpText" type="Paragraph"/>
<xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
</xs:sequence>
<!-- MSA file declares a single usage, and must match one of the entries in what the SPD file declares as the set of possible Item Types. -->
<xs:attribute name="PcdItemType" type="PcdItemTypes" use="required"/>
@ -1372,19 +1367,15 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<!-- LAH This is PcdDeclarations FINAL version -->
<xs:element name="PcdDeclarations">
<xs:annotation>
<xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
<xs:documentation xml:lang="en">This permits entering information about a package's PCD information</xs:documentation>
<xs:documentation xml:lang="en">This section is for entering information about a package's PCDs</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence minOccurs="1">
<xs:element maxOccurs="unbounded" name="PcdEntry">
<xs:annotation>
<xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>
<xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>
<xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
@ -1393,9 +1384,9 @@
<xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
<xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>
<xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
<xs:element minOccurs="1" maxOccurs="1" name="HelpText" type="Paragraph"/>
<xs:element minOccurs="1" maxOccurs="1" ref="HelpText"/>
</xs:sequence>
<xs:attributeGroup ref="PcdAttributes"/>
<xs:attributeGroup ref="PcdDeclarationAttributes"/>
</xs:complexType>
</xs:element>
</xs:sequence>
@ -1685,6 +1676,21 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="SkuInfo">
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element name="UiSkuName">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="UiNameType">
<xs:attribute name="SkuID" type="xs:nonNegativeInteger" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Specification">
<xs:annotation>
<xs:documentation xml:lang="en">This string is used to provide the name and version of the Specification that the component conforms to.</xs:documentation>

File diff suppressed because it is too large Load Diff

View File

@ -212,43 +212,49 @@
</xs:element>
<xs:element name="SpdHeader">
<xs:annotation>
<xs:documentation xml:lang="en">This head is for the Surface Area Package Description file (SPD) The Guid may change when the contents of the file are changed.</xs:documentation>
<xs:documentation xml:lang="en">This head is for the Surface Area Package Description file (SPD)</xs:documentation>
<xs:documentation xml:lang="en">The Guid MUST change when the contents of the file undergo MAJOR FUNCTIONALITY changes.</xs:documentation>
<xs:documentation xml:lang="en">The Version MUST change when the contents of the file undergo MINOR FUNCTIONALITY changes.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" ref="PackageName"/>
<xs:element minOccurs="1" maxOccurs="1" name="PackageName" type="UiNameType"/>
<xs:choice minOccurs="1" maxOccurs="1">
<!-- DO NOT USE! Guid needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
<!-- Guid needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
<!-- GuidValue needs to be required -->
<xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
</xs:choice>
<xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
<xs:element minOccurs="1" maxOccurs="1" name="Version" type="xs:decimal"/>
<xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
<xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
<xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
<xs:element minOccurs="1" maxOccurs="1" ref="License"/>
<xs:choice minOccurs="1" maxOccurs="1">
<xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
<!-- Created needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="Created"/>
<!-- CreatedDate needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>
<!-- CreatedDate needs to be required -->
</xs:choice>
<!-- E_Mail needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>
<xs:choice minOccurs="0" maxOccurs="1">
<!-- Updated needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
<!-- Created needs to be removed -->
<!-- UpdatedDate needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>
<!-- CreatedDate needs to be required -->
</xs:choice>
<!-- URL needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="URL"/>
<!-- PackageType needs to be removed -->
<xs:element minOccurs="1" maxOccurs="1" ref="PackageType"/>
<!-- ReadOnly and RePackage remain in final -->
<xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>
<xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>
<!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 -->
<xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
<!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00090000 -->
<xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>
<!-- OutputDirectory needs to be removed -->
<xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@ -23,11 +23,7 @@
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>
<xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>
<xs:choice>
<xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>
<!-- DO NOT USE! removing PlatformDescriptions, use PlatformList instead. -->
<xs:element minOccurs="0" maxOccurs="1" ref="PlatformDescriptions"/>
</xs:choice>
<xs:element minOccurs="0" maxOccurs="1" ref="PlatformList"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@ -38,6 +34,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>
<xs:element minOccurs="0" maxOccurs="1" ref="SkuInfo"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>
<!-- DO NOT USE! removing TianoImage, use FrameworkModules instead. -->
<xs:element minOccurs="0" maxOccurs="1" ref="TianoImage"/>
@ -45,6 +42,7 @@
<!-- DO NOT USE! removing PcdBuildDeclarations here, use PcdBuildDeclaratiion in ModuleSA instead. -->
<xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>
<xs:choice minOccurs="0">
<!-- DO NOT USE! removing PcdDynamicBuildDeclarations here, use DynamicPcdBuildDefinitions in ModuleSA instead. -->
<xs:element minOccurs="0" maxOccurs="1" ref="PcdDynamicBuildDeclarations"/>
<xs:element minOccurs="0" maxOccurs="1" ref="DynamicPcdBuildDefinitions"/>
</xs:choice>
@ -89,6 +87,7 @@
<xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
<xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
@ -141,8 +140,9 @@
<xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
<xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
<xs:choice minOccurs="0">
<xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
<xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
<!-- DO NOT USE! removing Includes, use PackageDependencies instead -->
<xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
<xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
</xs:choice>
<xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
@ -152,11 +152,13 @@
<xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
<xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
<xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
<!-- DO NOT USE! removing Formsets, use HiiPackages instead -->
<xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
<xs:element minOccurs="0" maxOccurs="1" ref="HiiPackages"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
<xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
<xs:choice minOccurs="0">
<!-- DO NOT USE! removing PCDs, use MsaPcdDeclarations instead -->
<!-- DO NOT USE! removing PCDs, use PcdCoded instead -->
<xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
<xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>
</xs:choice>
@ -173,7 +175,8 @@
<xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>
<xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>
<xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdHeaders"/>
<xs:element minOccurs="0" maxOccurs="1" ref="IndustryStdIncludes"/>
<!-- DO NOT USE removing PackageDependencies, this is moving to FDP installation process -->
<xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
<xs:element minOccurs="0" maxOccurs="1" ref="MsaFiles"/>
<xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>