Moved some content out of top level of the schema into local sections.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1227 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Conf/XMLSchema/WorkspaceContent.xsd b/Conf/XMLSchema/WorkspaceContent.xsd
index 7dbd9ee..34d0cac 100644 (file)
--- a/Conf/XMLSchema/WorkspaceContent.xsd
+++ b/Conf/XMLSchema/WorkspaceContent.xsd
@@ -89,94 +89,7 @@
                </xs:complexType>\r
        </xs:element>\r
 \r
                </xs:complexType>\r
        </xs:element>\r
 \r

-       <xs:element name="PackageList">\r
-               <xs:annotation>\r
-                       <xs:documentation xml:lang="en-us"> This section tracks individual\r
-                               packages (collections of related items.) Each package listed in this\r
-                               section must have a DEC file associated with it. </xs:documentation>\r
-               </xs:annotation>\r
-               <xs:complexType>\r
-                       <xs:sequence>\r
-                               <xs:element name="Package" minOccurs="1" maxOccurs="unbounded">\r
-                                       <xs:complexType>\r
-                                               <xs:sequence>\r
-                                                       <xs:element name="Name" minOccurs="1" maxOccurs="1">\r
-                                                               <xs:annotation>\r
-                                                                       <xs:documentation xml:lang="en-us"> The User Interface Name of\r
-                                                                               the package. </xs:documentation>\r
-                                                               </xs:annotation>\r
-                                                               <xs:complexType>\r
-                                                                       <xs:simpleContent>\r
-                                                                               <xs:extension base="xs:normalizedString">\r
-                                                                                       <xs:attribute name="BaseName" type="xs:NCName"\r
-                                                                                               use="required">\r
-                                                                                               <xs:annotation>\r
-                                                                                                       <xs:documentation xml:lang="en-us"> The BaseName is\r
-                                                                                                               used to create files and folders during a build, and\r
-                                                                                                               is used by packaging tools as a keyword to create\r
-                                                                                                               the DEC file. </xs:documentation>\r
-                                                                                               </xs:annotation>\r
-                                                                                       </xs:attribute>\r
-                                                                               </xs:extension>\r
-                                                                       </xs:simpleContent>\r
-                                                               </xs:complexType>\r
-                                                       </xs:element>\r
-                                                       <xs:element ref="GUID" minOccurs="1" maxOccurs="1">\r
-                                                               <xs:annotation>\r
-                                                                       <xs:documentation xml:lang="en-us"> This is the GUID of the\r
-                                                                               package, backward compatible versions of a package can use\r
-                                                                               the same GUID, however the version attribute must be changed\r
-                                                                               (incrementally.) Non-backward compatible versions of a\r
-                                                                               package must also provide a new GUID, while resetting the\r
-                                                                               version attribute is optional. </xs:documentation>\r
-                                                               </xs:annotation>\r
-                                                       </xs:element>\r
-                                                       <xs:element name="InstalledFolder" type="xs:anyURI" minOccurs="1"\r
-                                                               maxOccurs="1">\r
-                                                               <xs:annotation>\r
-                                                                       <xs:documentation xml:lang="en-us"> This is used to track the\r
-                                                                               actual installation location, relative to the WORKSPACE.\r
-                                                                               During an installation, the user may be presented with an\r
-                                                                               option to relocate package content from the ZIP portion of\r
-                                                                               the archive into a different location. </xs:documentation>\r
-                                                                       <xs:documentation> Any installation tools must modify this\r
-                                                                               value if the location is different from the default\r
-                                                                               location. </xs:documentation>\r
-                                                                       <xs:documentation> Any removal tools must check this value to\r
-                                                                               locate correctly, the items that will be removed.\r
-                                                                       </xs:documentation>\r
-                                                               </xs:annotation>\r
-                                                       </xs:element>\r
-                                                       <xs:element name="DecFilename" minOccurs="1" maxOccurs="1"\r
-                                                               type="xs:anyURI">\r
-                                                               <xs:annotation>\r
-                                                                       <xs:documentation xml:lang="en-us"> The WORKSPACE relative\r
-                                                                               path and filename of the DEC file. </xs:documentation>\r
-                                                               </xs:annotation>\r
-                                                       </xs:element>\r
-                                                       <xs:element ref="ModuleList" minOccurs="0" maxOccurs="1">\r
-                                                               <xs:annotation>\r
-                                                                       <xs:documentation xml:lang="en-us"> This section is used to\r
-                                                                               track the actual installation location, relative to the\r
-                                                                               WORKSPACE. Every module that is part of this package must be\r
-                                                                               listed here. During an installation, the user may be\r
-                                                                               presented with an option to relocate module content from the\r
-                                                                               ZIP portion of the archive into a different location, the\r
-                                                                               installation tools must modify this value if the location is\r
-                                                                               different from the default location. Any removal tools must\r
-                                                                               check this value to locate correctly, the items that will be\r
-                                                                               removed. </xs:documentation>\r
-                                                                       <xs:documentation xml:lang="en-us"> The name of any INF files\r
-                                                                               that were created during the installation of a distribution\r
-                                                                               must also be listed in this section. </xs:documentation>\r
-                                                               </xs:annotation>\r
-                                                       </xs:element>\r
-                                               </xs:sequence>\r
-                                       </xs:complexType>\r
-                               </xs:element>\r
-                       </xs:sequence>\r
-               </xs:complexType>\r
-       </xs:element>\r
+\r

 \r
        <xs:element name="ModuleList">\r
                <xs:complexType>\r
 \r
        <xs:element name="ModuleList">\r
                <xs:complexType>\r


@@ -226,9 +139,9 @@
                                                        <xs:element name="InfFilename" minOccurs="1" maxOccurs="1"\r
                                                                type="xs:anyURI">\r
                                                                <xs:annotation>\r
                                                        <xs:element name="InfFilename" minOccurs="1" maxOccurs="1"\r
                                                                type="xs:anyURI">\r
                                                                <xs:annotation>\r

-                                                                       <xs:documentation xml:lang="en-us"> This is the WORKSPACE\r
-                                                                               relative path and filename of the INF file created during\r
-                                                                               installation. </xs:documentation>\r
+                                                                       <xs:documentation xml:lang="en-us"> This is filename of the\r
+                                                                               INF file created in the InstalledFolder (listed above)\r
+                                                                               during installation. </xs:documentation>\r

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


@@ -287,22 +200,66 @@
                                                <xs:documentation xml:lang="en-us"> This is the filename of the\r
                                                        distribution package manifest (.manifest) file that was created\r
                                                        and stored in the Conf/Pkgs folder of the WORKSPACE for this\r
                                                <xs:documentation xml:lang="en-us"> This is the filename of the\r
                                                        distribution package manifest (.manifest) file that was created\r
                                                        and stored in the Conf/Pkgs folder of the WORKSPACE for this\r

-                                                       distribution package. </xs:documentation>\r
-                                               <xs:documentation xml:lang="en-us"> The InstallPkg tool must create\r
-                                                       this file using the extracted locations of the content zip file\r
-                                                       (or, alternatively, the user can create the file by redirecting\r
-                                                       the output of the zip -Tv Contents.zip.) </xs:documentation>\r
+                                                       distribution package. The InstallPkg tool must create this file\r
+                                                       using the extracted locations of the content zip file (or,\r
+                                                       alternatively, the user can create the file by redirecting the\r
+                                                       output of the zip -Tv Contents.zip.) </xs:documentation>\r

                                        </xs:annotation>\r
                                </xs:element>\r
                                <xs:element minOccurs="1" maxOccurs="1" name="InstalledDate"\r
                                        type="xs:dateTime" />\r
                                <xs:element name="DistributionProperties" minOccurs="0" maxOccurs="1"\r
                                        nillable="true">\r
                                        </xs:annotation>\r
                                </xs:element>\r
                                <xs:element minOccurs="1" maxOccurs="1" name="InstalledDate"\r
                                        type="xs:dateTime" />\r
                                <xs:element name="DistributionProperties" minOccurs="0" maxOccurs="1"\r
                                        nillable="true">\r

+                                       <xs:annotation>\r
+                                               <xs:documentation xml:lang="en-us"> This section tracks information\r
+                                                       and content that is not associated with either packages or\r
+                                                       modules, or is not required for building packages or modules.\r
+                                               </xs:documentation>\r
+                                       </xs:annotation>\r

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

-                                                       <xs:element ref="ToolsList" minOccurs="0" maxOccurs="1" />\r
-                                                       <xs:element ref="MiscellaneousFilesList" minOccurs="0"\r
-                                                               maxOccurs="1" />\r
+                                                       <xs:element name="ToolsList" minOccurs="0" maxOccurs="1">\r
+                                                               <xs:complexType>\r
+                                                                       <xs:sequence>\r
+                                                                               <xs:element minOccurs="1" maxOccurs="unbounded"\r
+                                                                                       name="Filename" type="xs:anyURI">\r
+                                                                                       <xs:annotation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> This is used to\r
+                                                                                                       track the actual installation location of the Tools\r
+                                                                                                       Section files. During an installation, the user may\r
+                                                                                                       change in the installation location, so that it is\r
+                                                                                                       different from the location in the ZIP file. The\r
+                                                                                                       location is not WORKSPACE relative, but the full path\r
+                                                                                                       and filename. </xs:documentation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> Any removal tools\r
+                                                                                                       must check this value to locate correctly, the items\r
+                                                                                                       that will be removed. </xs:documentation>\r
+                                                                                       </xs:annotation>\r
+                                                                               </xs:element>\r
+                                                                       </xs:sequence>\r
+                                                               </xs:complexType>\r
+                                                       </xs:element>\r
+                                                       <xs:element name="MiscellaneousFilesList" minOccurs="0"\r
+                                                               maxOccurs="1">\r
+                                                               <xs:complexType>\r
+                                                                       <xs:sequence>\r
+                                                                               <xs:element name="Filename" minOccurs="1"\r
+                                                                                       maxOccurs="unbounded">\r
+                                                                                       <xs:annotation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> This is used to\r
+                                                                                                       track the actual installation location of files from\r
+                                                                                                       MiscellaneousFiles sections. During an installation,\r
+                                                                                                       the user may change in the installation location, so\r
+                                                                                                       that it is different from the location in the ZIP\r
+                                                                                                       file. </xs:documentation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> Any removal tools\r
+                                                                                                       must check this value to locate correctly, the items\r
+                                                                                                       that will be removed. </xs:documentation>\r
+                                                                                       </xs:annotation>\r
+                                                                               </xs:element>\r
+                                                                       </xs:sequence>\r
+                                                               </xs:complexType>\r
+                                                       </xs:element>\r

                                                </xs:sequence>\r
                                                <xs:attribute name="ReadOnly" type="xs:boolean" default="false"\r
                                                        use="optional">\r
                                                </xs:sequence>\r
                                                <xs:attribute name="ReadOnly" type="xs:boolean" default="false"\r
                                                        use="optional">\r


@@ -331,12 +288,101 @@
                                                </xs:attribute>\r
                                        </xs:complexType>\r
                                </xs:element>\r
                                                </xs:attribute>\r
                                        </xs:complexType>\r
                                </xs:element>\r

-                               <xs:element ref="PackageList" minOccurs="0" maxOccurs="1">\r
+                               <xs:element name="PackageList" minOccurs="0" maxOccurs="1">\r

                                        <xs:annotation>\r
                                        <xs:annotation>\r

-                                               <xs:documentation xml:lang="en-us"> This is the listing of packages\r
-                                                       that have been installed as part of a distribution in this\r
-                                                       WORKSPACE. </xs:documentation>\r
+                                               <xs:documentation xml:lang="en-us"> This section tracks individual\r
+                                                       packages (collections of related items.) Each package listed in\r
+                                                       this section must have a DEC file associated with it.\r
+                                               </xs:documentation>\r

                                        </xs:annotation>\r
                                        </xs:annotation>\r

+                                       <xs:complexType>\r
+                                               <xs:sequence>\r
+                                                       <xs:element name="Package" minOccurs="1" maxOccurs="unbounded">\r
+                                                               <xs:complexType>\r
+                                                                       <xs:sequence>\r
+                                                                               <xs:element name="Name" minOccurs="1" maxOccurs="1">\r
+                                                                                       <xs:annotation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> The User Interface\r
+                                                                                                       Name of the package. </xs:documentation>\r
+                                                                                       </xs:annotation>\r
+                                                                                       <xs:complexType>\r
+                                                                                               <xs:simpleContent>\r
+                                                                                                       <xs:extension base="xs:normalizedString">\r
+                                                                                                               <xs:attribute name="BaseName" type="xs:NCName"\r
+                                                                                                                       use="required">\r
+                                                                                                                       <xs:annotation>\r
+                                                                                                                               <xs:documentation xml:lang="en-us"> The BaseName\r
+                                                                                                                                       is used to create files and folders during a\r
+                                                                                                                                       build, and is used by packaging tools as a\r
+                                                                                                                                       keyword to create the DEC file.\r
+                                                                                                                               </xs:documentation>\r
+                                                                                                                       </xs:annotation>\r
+                                                                                                               </xs:attribute>\r
+                                                                                                       </xs:extension>\r
+                                                                                               </xs:simpleContent>\r
+                                                                                       </xs:complexType>\r
+                                                                               </xs:element>\r
+                                                                               <xs:element ref="GUID" minOccurs="1" maxOccurs="1">\r
+                                                                                       <xs:annotation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> This is the GUID of\r
+                                                                                                       the package, backward compatible versions of a package\r
+                                                                                                       can use the same GUID, however the version attribute\r
+                                                                                                       must be changed (incrementally.) Non-backward\r
+                                                                                                       compatible versions of a package must also provide a\r
+                                                                                                       new GUID, while resetting the version attribute is\r
+                                                                                                       optional. </xs:documentation>\r
+                                                                                       </xs:annotation>\r
+                                                                               </xs:element>\r
+                                                                               <xs:element name="InstalledFolder" type="xs:anyURI"\r
+                                                                                       minOccurs="1" maxOccurs="1">\r
+                                                                                       <xs:annotation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> This is used to\r
+                                                                                                       track the actual installation location, relative to\r
+                                                                                                       the WORKSPACE. During an installation, the user may be\r
+                                                                                                       presented with an option to relocate package content\r
+                                                                                                       from the ZIP portion of the archive into a different\r
+                                                                                                       location. </xs:documentation>\r
+                                                                                               <xs:documentation> Any installation tools must modify\r
+                                                                                                       this value if the location is different from the\r
+                                                                                                       default location. </xs:documentation>\r
+                                                                                               <xs:documentation> Any removal tools must check this\r
+                                                                                                       value to locate correctly, the items that will be\r
+                                                                                                       removed. </xs:documentation>\r
+                                                                                       </xs:annotation>\r
+                                                                               </xs:element>\r
+                                                                               <xs:element name="DecFilename" minOccurs="1" maxOccurs="1"\r
+                                                                                       type="xs:anyURI">\r
+                                                                                       <xs:annotation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> This is the filename\r
+                                                                                                       of the package declaration (DEC) filename created\r
+                                                                                                       during installation in the InstalledFolder listed\r
+                                                                                                       above. </xs:documentation>\r
+                                                                                       </xs:annotation>\r
+                                                                               </xs:element>\r
+                                                                               <xs:element ref="ModuleList" minOccurs="0" maxOccurs="1">\r
+                                                                                       <xs:annotation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> This section is used\r
+                                                                                                       to track the actual installation location, relative to\r
+                                                                                                       the WORKSPACE. Every module that is part of this\r
+                                                                                                       package must be listed here. During an installation,\r
+                                                                                                       the user may be presented with an option to relocate\r
+                                                                                                       module content from the ZIP portion of the archive\r
+                                                                                                       into a different location, the installation tools must\r
+                                                                                                       modify this value if the location is different from\r
+                                                                                                       the default location. Any removal tools must check\r
+                                                                                                       this value to locate correctly, the items that will be\r
+                                                                                                       removed. </xs:documentation>\r
+                                                                                               <xs:documentation xml:lang="en-us"> The name of any INF\r
+                                                                                                       files that were created during the installation of a\r
+                                                                                                       distribution must also be listed in this section.\r
+                                                                                               </xs:documentation>\r
+                                                                                       </xs:annotation>\r
+                                                                               </xs:element>\r
+                                                                       </xs:sequence>\r
+                                                               </xs:complexType>\r
+                                                       </xs:element>\r
+                                               </xs:sequence>\r
+                                       </xs:complexType>\r

                                </xs:element>\r
                                <xs:element ref="ModuleList" minOccurs="0" maxOccurs="1">\r
                                        <xs:annotation>\r
                                </xs:element>\r
                                <xs:element ref="ModuleList" minOccurs="0" maxOccurs="1">\r
                                        <xs:annotation>\r


@@ -353,46 +399,6 @@
                </xs:complexType>\r
        </xs:element>\r
 \r
                </xs:complexType>\r
        </xs:element>\r
 \r

-       <xs:element name="ToolsList">\r
-               <xs:complexType>\r
-                       <xs:sequence>\r
-                               <xs:element minOccurs="1" maxOccurs="unbounded" name="Filename"\r
-                                       type="xs:anyURI">\r
-                                       <xs:annotation>\r
-                                               <xs:documentation xml:lang="en-us"> This is used to track the actual\r
-                                                       installation location of the Tools Section files. During an\r
-                                                       installation, the user may change in the installation location, so\r
-                                                       that it is different from the location in the ZIP file. The\r
-                                                       location is not WORKSPACE relative, but the full path and\r
-                                                       filename. </xs:documentation>\r
-                                               <xs:documentation xml:lang="en-us"> Any removal tools must check\r
-                                                       this value to locate correctly, the items that will be removed.\r
-                                               </xs:documentation>\r
-                                       </xs:annotation>\r
-                               </xs:element>\r
-                       </xs:sequence>\r
-               </xs:complexType>\r
-       </xs:element>\r
-\r
-       <xs:element name="MiscellaneousFilesList">\r
-               <xs:complexType>\r
-                       <xs:sequence>\r
-                               <xs:element name="Filename" minOccurs="1" maxOccurs="unbounded">\r
-                                       <xs:annotation>\r
-                                               <xs:documentation xml:lang="en-us"> This is used to track the actual\r
-                                                       installation location of files from MiscellaneousFiles sections.\r
-                                                       During an installation, the user may change in the installation\r
-                                                       location, so that it is different from the location in the ZIP\r
-                                                       file. </xs:documentation>\r
-                                               <xs:documentation xml:lang="en-us"> Any removal tools must check\r
-                                                       this value to locate correctly, the items that will be removed.\r
-                                               </xs:documentation>\r
-                                       </xs:annotation>\r
-                               </xs:element>\r
-                       </xs:sequence>\r
-               </xs:complexType>\r
-       </xs:element>\r
-\r

        <xs:element name="GUID">\r
                <xs:complexType>\r
                        <xs:simpleContent>\r
        <xs:element name="GUID">\r
                <xs:complexType>\r
                        <xs:simpleContent>\r


@@ -411,7 +417,7 @@
                                five different Hexadecimal character sets that are separated by a dash\r
                                (-) character. </xs:documentation>\r
                </xs:annotation>\r
                                five different Hexadecimal character sets that are separated by a dash\r
                                (-) character. </xs:documentation>\r
                </xs:annotation>\r

-               <xs:restriction base="xs:string">\r
+               <xs:restriction base="xs:normalizedString">\r

                        <xs:pattern\r
                                value="\s*[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\s*"\r
                         />\r
                        <xs:pattern\r
                                value="\s*[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\s*"\r
                         />\r