Added the MacroDefFile to ProcessSteps for future use, also removed extra Sections from the Ffs Definition as it was not used.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@783 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch 2006-07-06 03:57:36 +00:00
parent d6d24759a0
commit 702c120a17
1 changed files with 15 additions and 61 deletions

View File

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