Final Check-for TRUNK transition schema that handles both old and new elements.

This will handle both.  I will start doing the Branch stripped out version with only new stuff in it now.

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

diff --git a/Tools/XMLSchema/FrameworkDataAttributes.xsd b/Tools/XMLSchema/FrameworkDataAttributes.xsd
index b74475e20721f0faa20dacad9129ec328af59579..5e6bf5bcbf5a4d78e7a62de5d5a3dc7d4f0a6051 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataAttributes.xsd
+++ b/Tools/XMLSchema/FrameworkDataAttributes.xsd
@@ -367,6 +367,10 @@
         <!-- DO NOT USE remove OverrideID from use -->\r
         <xs:attribute name="OverrideID" type="xs:int" use="optional"/>\r
     </xs:attributeGroup>\r
+    <xs:attributeGroup name="PcdBuildDefinitionAttributes">\r
+        <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
+        <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>\r
+    </xs:attributeGroup>\r
     <xs:attributeGroup name="PcdDeclarationAttributes">\r
         <xs:attribute name="SupArchList" type="ArchListType" use="optional"/>\r
         <xs:attribute name="FeatureFlag" type="xs:normalizedString" use="optional"/>\r

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index 8427b738327ae5eebf61e8b833fc45937aa6f48f..8025bfd0b2afa487649b39a38321141ec953d456 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -1293,16 +1293,22 @@
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
-                            <xs:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>\r
-                            <xs:choice minOccurs="0" maxOccurs="1">\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>\r
-                            </xs:choice>\r
-                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>\r
-                            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>\r
+                            <xs:element minOccurs="0" maxOccurs="1" name="MaxDatumSize" type="DatumSizeLimitation"/>\r
+                            <xs:element minOccurs="1" maxOccurs="unbounded" name="SkuInfo">\r
+                                <xs:complexType>\r
+                                    <xs:sequence>\r
+                                        <xs:element minOccurs="1" name="SkuId" type="xs:nonNegativeInteger"/>\r
+                                        <xs:choice>\r
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>\r
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>\r
+                                            <xs:group minOccurs="0" maxOccurs="1" ref="DefaultGroup"/>\r
+                                        </xs:choice>\r
+                                    </xs:sequence>\r
+                                </xs:complexType>\r
+                            </xs:element>\r
                         </xs:sequence>\r
                         <xs:attributeGroup ref="PcdAttributes"/>\r
                     </xs:complexType>\r
@@ -1320,23 +1326,22 @@
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r
                             <xs:element minOccurs="0" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
-                            <xs:group minOccurs="0" maxOccurs="1" ref="SkuGroup"/>\r
-                            <xs:choice minOccurs="0" maxOccurs="1">\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="HiiEnable"/>\r
-                                <xs:group minOccurs="0" maxOccurs="1" ref="VpdEnable"/>\r
-                            </xs:choice>\r
-                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize" type="DatumSizeLimitation"/>\r
-                            <xs:element minOccurs="0" maxOccurs="1" name="Value" type="xs:normalizedString"/>\r
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="Value" type="xs:normalizedString"/>\r
                         </xs:sequence>\r
-                        <xs:attributeGroup ref="PcdAttributes"/>\r
+                        <xs:attributeGroup ref="PcdBuildDefinitionAttributes"/>\r
                     </xs:complexType>\r
                 </xs:element>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
+    <xs:group name="DefaultGroup">\r
+        <xs:sequence>\r
+            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="xs:normalizedString"/>\r
+        </xs:sequence>\r
+    </xs:group>\r
     <xs:group name="HiiEnable">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">If HiiEnable group is specified, then HiiEnable is default true</xs:documentation>\r
@@ -1355,21 +1360,6 @@
             <xs:element minOccurs="0" maxOccurs="1" name="VpdOffset" type="Hex64BitDataType"/>\r
         </xs:sequence>\r
     </xs:group>\r
-    <xs:group name="SkuGroup">\r
-        <xs:sequence>\r
-            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuSet" type="SkuListType"/>\r
-            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuList" type="SkuListType"/>\r
-            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>\r
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">\r
-                <xs:complexType>\r
-                    <xs:sequence minOccurs="1">\r
-                        <xs:element name="Id" type="xs:int"/>\r
-                        <xs:element name="Value" type="xs:normalizedString"/>\r
-                    </xs:sequence>\r
-                </xs:complexType>\r
-            </xs:element>\r
-        </xs:sequence>\r
-    </xs:group>\r
     <xs:element name="PcdCoded">\r
         <xs:annotation>\r
             <xs:documentation xml:lang="en">Child of Module Surface Area Description (MSA)</xs:documentation>\r
@@ -1406,7 +1396,7 @@
                     <xs:complexType>\r
                         <xs:sequence>\r
                             <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>\r
-                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>\r
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="TokenDataType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="TokenSpaceGuid" type="GuidType"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>\r
                             <xs:element minOccurs="1" maxOccurs="1" name="ValidUsage" type="PcdListType"/>\r

diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
index 885ab5b77b862431896a17dff2e66023d39529cc..8ec39f54806a9e5e0f027f97c3e31b477488ebc0 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataTypes.xsd
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -429,6 +429,10 @@
     <xs:simpleType name="Token">\r
         <xs:union memberTypes="GuidArrayType GuidNamingConvention HexDoubleWordDataType"/>\r
     </xs:simpleType>\r
+    <!-- TokenDataType is xs:nonNegativeInteger in final -->\r
+    <xs:simpleType name="TokenDataType">\r
+        <xs:union memberTypes="HexDoubleWordDataType  xs:nonNegativeInteger"/>\r
+    </xs:simpleType>\r
     <xs:simpleType name="ToolChains">\r
         <xs:restriction base="UCNameType">\r
             <xs:enumeration value="MSFT"/>\r

diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
index a68e260df966e7a253c36704b3e5afee8e1dc475..7dd823aa1558cb28e43581710a52d658bfaa78f1 100644 (file)
--- a/Tools/XMLSchema/FrameworkHeaders.xsd
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -188,29 +188,32 @@
                     <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>\r
                     <!-- GuidValue needs to be required -->\r
                 </xs:choice>\r
+                <!-- Version needs to be xs:decimal in final -->\r
                 <xs:element minOccurs="0" 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="0" maxOccurs="1" ref="Copyright"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="License"/>\r
                 <xs:choice minOccurs="1" maxOccurs="1">\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
                     <!-- DO NOT USE Created needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Created"/>\r
+                    <!-- DO NOT USE CreatedDate needs to be removed -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="CreatedDate"/>\r
-                    <!-- CreatedDate needs to be required -->\r
                 </xs:choice>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy"/>\r
                 <!-- DO NOT USE CreatedBy needs to be removed -->\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="CreatedBy"/>\r
                 <xs:choice>\r
-                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
                     <!-- DO NOT USE Updated needs to be removed -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>\r
+                    <!-- DO NOT USE ModifiedDate needs to be removed -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="ModifiedDate"/>\r
                 </xs:choice>\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="PackageType"/>\r
                 <!-- DO NOT USE PackageType needs to be removed -->\r
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageType"/>\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="unbounded" ref="Specification"/>\r
-                <!-- Specification needs to be required - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00090000 -->\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
index 1cab356b2f498aaacff2ad82badba8e5f2dd9569..a32b28c2f361f288bd81c2d3624848ad039e5b32 100644 (file)
--- a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -259,8 +259,20 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>\r
                 <!-- DO NOT USE! REMOVE Guids in FINAL -->\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>\r
-                <!-- EXTERNS stays in FINAL -->\r
-                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>\r
+                <xs:choice minOccurs="0">\r
+                    <!-- DO NOT USE! REMOVE Externs stays in FINAL -->\r
+                    <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>\r
+                    <xs:element minOccurs="0" maxOccurs="1" name="Extern">\r
+                        <xs:annotation>\r
+                            <xs:documentation xml:lang="en">Only specification is allow here. We need to let this be an addtion OR, if the WORD portion exists, this entry takes precedence.</xs:documentation>\r
+                        </xs:annotation>\r
+                        <xs:complexType>\r
+                            <xs:sequence>\r
+                                <xs:element minOccurs="1" maxOccurs="unbounded" ref="Specification"/>\r
+                            </xs:sequence>\r
+                        </xs:complexType>\r
+                    </xs:element>\r
+                </xs:choice>\r
                 <xs:choice>\r
                     <!-- DO NOT USE! REMOVE PcdBuildDeclarations in FINAL -->\r
                     <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>\r
@@ -320,12 +332,17 @@
         </xs:annotation>\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>\r
-                <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>\r
+                <xs:choice>\r
+                    <xs:sequence>\r
+                        <xs:element minOccurs="0" maxOccurs="1" name="SEC" type="Components"/>\r
+                        <xs:element minOccurs="0" maxOccurs="1" name="PEI_CORE" type="Components"/>\r
+                        <xs:element minOccurs="0" maxOccurs="1" name="PEIM" type="Components"/>\r
+                        <xs:element minOccurs="0" maxOccurs="1" name="DXE_CORE" type="Components"/>\r
+                        <xs:element minOccurs="0" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>\r
+                        <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>\r
+                    </xs:sequence>\r
+                    <xs:element minOccurs="1" maxOccurs="unbounded" ref="ModuleSA"/>\r
+                </xs:choice>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
index a44d3b6bad1ab6a60bcd1a5543ad45aba373336c..99e28e307ee050d32aa4da544fc974bb951575b9 100644 (file)
--- a/Tools/XMLSchema/NamingConvention.xsd
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -184,7 +184,7 @@
         <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
         </xs:annotation>\r
-        <xs:restriction base="xs:string">\r
+        <xs:restriction base="xs:NCName">\r
             <xs:pattern value="(([a-zA-Z][a-zA-Z0-9]*)(_)*(.)*)+"/>\r
         </xs:restriction>\r
     </xs:simpleType>\r