Added the MacroDefFile to ProcessSteps for future use, also removed extra Sections...

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

diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
index d9dedbe86a5662b827dd23ad33b63a40ef0e3412..be028ce8dbeb15986ae1986224e22dfd98ed0c7e 100644 (file)
--- a/Tools/XMLSchema/FrameworkDataElements.xsd
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -66,22 +66,6 @@
         <xs:element minOccurs="0" maxOccurs="1" ref="Options"/>\r
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="UserExtensions"/>\r
         <!-- The following sections are legacy and will be removed -->\r
-        <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory">\r
-          <xs:complexType>\r
-            <xs:simpleContent>\r
-              <xs:extension base="xs:anyURI">\r
-                <xs:attribute default="UNIFIED" name="IntermediateDirectories" use="optional">\r
-                  <xs:simpleType>\r
-                    <xs:restriction base="UCNameType">\r
-                      <xs:enumeration value="MODULE"/>\r
-                      <xs:enumeration value="UNIFIED"/>\r
-                    </xs:restriction>\r
-                  </xs:simpleType>\r
-                </xs:attribute>\r
-              </xs:extension>\r
-            </xs:simpleContent>\r
-          </xs:complexType>\r
-        </xs:element>\r
         <xs:element minOccurs="0" maxOccurs="unbounded" name="Ffs">\r
           <xs:complexType>\r
             <xs:sequence>\r
@@ -133,45 +117,6 @@
             <xs:attribute name="FfsKey" type="KeywordType" use="optional"/>\r
           </xs:complexType>\r
         </xs:element>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="Sections">\r
-          <xs:complexType>\r
-            <xs:sequence minOccurs="1">\r
-              <xs:element name="Section" minOccurs="0" maxOccurs="unbounded">\r
-                <xs:complexType>\r
-                  <xs:sequence>\r
-                    <xs:element ref=" Filenames " minOccurs="0"/>\r
-                    <xs:element name="Args" type=" ArgsType " minOccurs="0"/>\r
-                    <xs:element name="OutFile" type=" FileNameConvention " minOccurs="0"/>\r
-                    <xs:element name="OutputFileExtension" type=" xs:string " minOccurs="0"/>\r
-                    <xs:element name="ToolName" type=" ToolType " minOccurs="0"/>\r
-                  </xs:sequence>\r
-                  <xs:attributeGroup ref=" SectionsAttributes "/>\r
-                </xs:complexType>\r
-              </xs:element>\r
-              <xs:element name="Sections" minOccurs="0" maxOccurs="unbounded">\r
-                <xs:complexType>\r
-                  <xs:sequence minOccurs="1" maxOccurs="unbounded">\r
-                    <xs:element name="Section">\r
-                      <xs:complexType>\r
-                        <xs:sequence>\r
-                          <xs:element ref=" Filenames " minOccurs="0"/>\r
-                          <xs:element name="Args" type=" ArgsType " minOccurs="0"/>\r
-                          <xs:element name="OutFile" type=" FileNameConvention " minOccurs="0"/>\r
-                          <xs:element name="OutputFileExtension" type=" xs:string " minOccurs="0"/>\r
-                          <xs:element name="ToolName" type=" ToolType " minOccurs="0"/>\r
-                        </xs:sequence>\r
-                        <xs:attributeGroup ref=" SectionsAttributes "/>\r
-                      </xs:complexType>\r
-                    </xs:element>\r
-                  </xs:sequence>\r
-                  <xs:attributeGroup ref=" SectionsAttributes "/>\r
-                </xs:complexType>\r
-              </xs:element>\r
-            </xs:sequence>\r
-            <xs:attributeGroup ref=" SectionsAttributes "/>\r
-          </xs:complexType>\r
-        </xs:element>\r
-        <!-- Remove to Here -->\r
       </xs:sequence>\r
     </xs:complexType>\r
   </xs:element>\r
@@ -877,12 +822,21 @@
   <xs:element name="ProcessStep">\r
     <xs:complexType>\r
       <xs:sequence>\r
-        <xs:element minOccurs="1" maxOccurs="1" name="ToolName" type="xs:string"/>\r
-        <xs:element minOccurs="0" maxOccurs="1" name="ToolArgs" type="xs:string"/>\r
-        <!-- Input patterns  to be processed by the tool above -->\r
-        <xs:element minOccurs="0" maxOccurs="1" name="InputPattern" type="xs:string"/>\r
-        <!-- A pattern to match for the output -->\r
-        <xs:element minOccurs="1" maxOccurs="1" name="OutputPattern" type="xs:string"/>\r
+        <!-- The following is a macro for Apache ANT -->\r
+        <xs:element minOccurs="0" maxOccurs="1" name="MacroDefFile">\r
+          <xs:complexType>\r
+            <xs:simpleContent>\r
+              <xs:extension base="PathAndFilename">\r
+                <xs:attribute name="MacroName" type="KeywordType" use="required"/>    \r
+              </xs:extension>\r
+            </xs:simpleContent>\r
+          </xs:complexType>\r
+        </xs:element>\r
+        <!-- The following is for System Executables -->\r
+        <xs:element minOccurs="0" maxOccurs="1" name="ToolName" type="xs:NCName"/>\r
+        <xs:element minOccurs="0" maxOccurs="unbounded" name="ToolArgs" type="xs:normalizedString"/>\r
+        <xs:element minOccurs="0" maxOccurs="unbounded" name="InputPattern" type="xs:normalizedString"/>\r
+        <xs:element minOccurs="0" maxOccurs="1" name="OutputPattern" type="xs:normalizedString"/>\r
       </xs:sequence>\r
       <xs:attributeGroup ref="ProcessStepAttributes"/>\r
     </xs:complexType>\r