changed Specification to string and changed back Abstract to new schema format

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

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 4684c7198c6678ffe061923ff6a3f74efb4c1e46..8e00b70ea680fbba7cc95a0898ef68d46bad5824 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -19,18 +19,11 @@
     <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
     <xs:include schemaLocation="FrameworkPlatformDataTypes.xsd"/>\r
     <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>\r
     <xs:include schemaLocation="FrameworkDataTypes.xsd"/>\r
     <xs:include schemaLocation="FrameworkPlatformDataTypes.xsd"/>\r
     <xs:include schemaLocation="FrameworkDataAttributes.xsd"/>\r

-    <xs:element name="Abstract">\r
+    <xs:element name="Abstract" type="Sentence">\r

         <xs:annotation>\r
             <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>\r
             <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>\r
         </xs:annotation>\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>\r
             <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>\r
         </xs:annotation>\r

-        <xs:complexType>\r
-            <xs:simpleContent>\r
-                <xs:extension base="Sentence">\r
-                    <xs:attribute name="URL" type="xs:anyURI" use="optional"/>\r
-                </xs:extension>\r
-            </xs:simpleContent>\r
-        </xs:complexType>\r

     </xs:element>\r
     <xs:element name="AntCmd">\r
         <xs:annotation>\r
     </xs:element>\r
     <xs:element name="AntCmd">\r
         <xs:annotation>\r

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index 8622cdf5c97f66c849869fa8e34d5ba722cf9d3f..a0104f5c6ef9572f84499cfe0981af4a70347f70 100644 (file)
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -46,7 +46,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="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="0" maxOccurs="1" name="Specification" type="xs:string"/>\r

                 <!-- Specificatoin needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
             </xs:sequence>\r
         </xs:complexType>\r
                 <!-- Specificatoin needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
             </xs:sequence>\r
         </xs:complexType>\r


@@ -64,7 +64,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="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="0" maxOccurs="1" name="Specification" type="xs:string"/>\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 minOccurs="1" maxOccurs="1">\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r


@@ -89,7 +89,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="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="0" maxOccurs="1" name="Specification" type="xs:string"/>\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 minOccurs="1" maxOccurs="1">\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r


@@ -141,7 +141,7 @@
                 </xs:choice>\r
                 <xs:element default="false" minOccurs="0" name="BinaryModule" type="xs:boolean"/>\r
                 <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->\r
                 </xs:choice>\r
                 <xs:element default="false" minOccurs="0" name="BinaryModule" type="xs:boolean"/>\r
                 <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->\r

-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="Specification" type="xs:string"/>\r

             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r


@@ -166,7 +166,7 @@
                     <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="CreatedDate"/>\r
                 </xs:choice>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r

-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="Specification" type="xs:string"/>\r

             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r


@@ -208,7 +208,7 @@
                 <!-- DO NOT USE BuildTarget needs to be removed -->\r
                 <xs:element minOccurs="0" maxOccurs="1" name="BuildTarget" type="BuildTargets"/>\r
                 <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->\r
                 <!-- DO NOT USE BuildTarget needs to be removed -->\r
                 <xs:element minOccurs="0" maxOccurs="1" name="BuildTarget" type="BuildTargets"/>\r
                 <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->\r

-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="Specification" type="xs:string"/>\r

             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r


@@ -227,7 +227,7 @@
                     <!-- GuidValue needs to be required -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                 </xs:choice>\r
                     <!-- GuidValue needs to be required -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                 </xs:choice>\r

-                <xs:element minOccurs="1" maxOccurs="1" name="Version" type="xs:decimal"/>\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="Abstract"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>\r
                 <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>\r


@@ -254,7 +254,7 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>\r
                 <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>\r
                 <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052 -->\r

-                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>\r
+                <xs:element minOccurs="0" maxOccurs="1" name="Specification" type="xs:string"/>\r

                 <!-- OutputDirectory needs to be removed -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>\r
             </xs:sequence>\r
                 <!-- OutputDirectory needs to be removed -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>\r
             </xs:sequence>\r