]> git.proxmox.com Git - mirror_edk2.git/commitdiff
projects / mirror_edk2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c2d2d94)
Updated Schema per e-mails.
authorlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 2 Jun 2006 00:24:08 +0000 (00:24 +0000)
committerlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 2 Jun 2006 00:24:08 +0000 (00:24 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@379 6f19259b-4bc3-4df7-8a09-765794883524

Tools/XMLSchema/FrameworkDataAttributes.xsd patch | blob | blame | history
Tools/XMLSchema/FrameworkDataElements.xsd patch | blob | blame | history
Tools/XMLSchema/FrameworkDataTypes.xsd patch | blob | blame | history
Tools/XMLSchema/FrameworkHeaders.xsd patch | blob | blame | history
Tools/XMLSchema/NamingConvention.xsd patch | blob | blame | history

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index 63d88231f745f9af2b1ecc645d8b59ec1c8c6826..77f3adad66db60f775bd76e326792cf8aaac90f9 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -52,6 +52,7 @@
     <xs:attributeGroup name="FilenameAttributes">\r
         <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="GuidValue" type="GuidType" use="optional"/>\r
         <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>\r
         <xs:attribute name="FileType" type="xs:string" use="optional"/>\r
         <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r
@@ -91,7 +92,12 @@
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="ModuleNameAttributes">\r
-        <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="required"/>\r
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+    </xs:attributeGroup>\r
+    <xs:attributeGroup name="ModuleNameSaAttributes">\r
+        <xs:attribute name="ModuleName" type="xs:NCName" use="required"/>\r
+        <xs:attribute name="Guid" type="GuidType" use="required"/>\r
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="MsaAttributes">\r
@@ -107,6 +113,7 @@
         <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
         <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>\r
+        <xs:attribute name="BuildTarget" type="BuildTargets" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PackageAttributes">\r
         <xs:attribute name="Usage" type="PackageUsage" use="optional"/>\r
@@ -116,6 +123,7 @@
     <xs:attributeGroup name="PackageNameAttributes">\r
         <xs:attribute name="Guid" type="GuidType" use="optional"/>\r
         <xs:attribute name="Version" type="VersionDataType" use="optional"/>\r
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>\r
     </xs:attributeGroup>\r
     <xs:attributeGroup name="PcdAttributes">\r
         <xs:annotation>\r
diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 52e5c1cc07303cc8e0e29fcf3af614e8c62e0d0b..8579d790b6a5990bb7fe23aeb045d4f130824744 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -677,12 +677,14 @@
     </xs:element>\r
     <xs:element name="LibraryClass">\r
         <xs:annotation>\r
-            <xs:documentation xml:lang="en">Define in the MSA and/or SPD, what class of library is being produced by a library module - for components, it can also specify what class of library is consumed.</xs:documentation>\r
+            <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>\r
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:simpleContent>\r
                 <xs:extension base="BaseNameConvention">\r
-                    <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>\r
+                    <xs:attribute name="Usage" type="LibraryUsage" use="required"/>\r
+                    <xs:attribute name="RecommendedInstance" type="BaseNameConvention" use="optional"/>\r
+                    <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>\r
                 </xs:extension>\r
             </xs:simpleContent>\r
         </xs:complexType>\r
@@ -693,7 +695,19 @@
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence minOccurs="0">\r
-                <xs:element minOccurs="1" maxOccurs="1" ref="LibraryClass"/>\r
+                <xs:element minOccurs="1" maxOccurs="1" name="LibraryClass">\r
+                    <xs:annotation>\r
+                        <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>\r
+                    </xs:annotation>\r
+                    <xs:complexType>\r
+                        <xs:simpleContent>\r
+                            <xs:extension base="BaseNameConvention">\r
+                                <xs:attribute name="RecommendedInstance" type="BaseNameConvention" use="optional"/>\r
+                                <xs:attribute name="RecommendedInstanceGuid" type="GuidType" use="optional"/>\r
+                            </xs:extension>\r
+                        </xs:simpleContent>\r
+                    </xs:complexType>\r
+                </xs:element>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="IncludeHeader"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
@@ -779,7 +793,7 @@
             <xs:sequence minOccurs="1">\r
                 <xs:element minOccurs="0" maxOccurs="unbounded" name="MsaFile">\r
                     <xs:annotation>\r
-                        <xs:documentation xml:lang="en">Describe the valid content of a Surface Area Package Description (SPD) file</xs:documentation>\r
+                        <xs:documentation xml:lang="en">Surface Area Package Description (SPD) list of Module Surface Area files</xs:documentation>\r
                     </xs:annotation>\r
                     <xs:complexType>\r
                         <xs:sequence minOccurs="0" maxOccurs="1">\r
@@ -811,6 +825,24 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    <xs:element name="MsaFileList">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en">Surface Area Package Description (SPD) list of Module Surface Area files</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                 <xs:element minOccurs="0" maxOccurs="unbounded" name="Filename">\r
+                     <xs:complexType>\r
+                         <xs:simpleContent>\r
+                             <xs:extension base="xs:anyURI">\r
+                                 <xs:attributeGroup ref="ModuleNameSaAttributes"/>\r
+                             </xs:extension>\r
+                         </xs:simpleContent>\r
+                    </xs:complexType>\r
+                </xs:element>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
     <xs:element name="OutputDirectory">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Define where we want our output to go. The Attribute, IntermediateDirectories, default MODULE, says that intermediate files will be local to the module, versus a unified directory structure.</xs:documentation>\r
diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 87889e911d59ad86d5bca04926d38189383e6b80..ecdc6d66d9602e1f2cecabd97d964b23ce79cfae 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -113,6 +113,13 @@
             </xs:enumeration>\r
         </xs:restriction>\r
     </xs:simpleType>\r
+    <xs:simpleType name="BuildTargets">\r
+        <xs:restriction base="xs:NCName">\r
+            <xs:enumeration value="DEBUG"/>\r
+            <xs:enumeration value="RELEASE"/>\r
+            <xs:enumeration value="BOTH"/>\r
+        </xs:restriction>\r
+    </xs:simpleType>\r
     <xs:simpleType name="ComponentExecutionPhase">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">These are the supported EFI/Framework Execution Phases</xs:documentation>\r
diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index aeae77b144ceb1a527031d4466d1eb9d95d4f744..718ce84d60ce22f372fd9fd4fab90bccbb1bb530 100644 (file)
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -63,6 +63,7 @@
                 <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:choice minOccurs="1" maxOccurs="1">\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
@@ -87,6 +88,7 @@
                 <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:choice minOccurs="1" maxOccurs="1">\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
@@ -104,7 +106,10 @@
         </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
+                    <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:choice>\r
@@ -150,12 +155,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: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
@@ -216,16 +221,7 @@
                         <xs:documentation xml:lang="en">DO NOT USE! removing from XMLSchema</xs:documentation>\r
                     </xs:annotation>\r
                 </xs:element>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="BuildTarget">\r
-                    <!-- BuildTarget needs to be required -->\r
-                    <xs:simpleType>\r
-                        <xs:restriction base="xs:NCName">\r
-                            <xs:enumeration value="DEBUG"/>\r
-                            <xs:enumeration value="RELEASE"/>\r
-                            <xs:enumeration value="BOTH"/>\r
-                        </xs:restriction>\r
-                    </xs:simpleType>\r
-                </xs:element>\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
diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
index b44a37e539c63c0115d3f566972b1fbd09327666..ca19200321dd9d9e68d10b5964cafc87b94e9bcc 100644 (file)
--- a/Tools/XMLSchema/NamingConvention.xsd
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -166,6 +166,12 @@
         </xs:annotation>\r
         <xs:restriction base="xs:normalizedString"/>\r
     </xs:simpleType>\r
+    <xs:simpleType name="PathAndFilename">\r
+        <xs:annotation>\r
+            <xs:documentation xml:lang="en"> Naming convention for a path and file name</xs:documentation>\r
+        </xs:annotation>\r
+        <xs:union memberTypes="Directory_DOS Directory_UNIX"/>\r
+    </xs:simpleType>\r
     <xs:simpleType name="PlatformNamingConvention">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en"> This defines what a Platform Name is: Alphanumeric characters and optional underscore (_) or dash (-) characters, followed by a dot and more alphanumeric characters. </xs:documentation>\r
EFI Development Kit II mirror for PVE