added specific PP definition for EBC because of previous BuildMacro.xml changes

[mirror_edk2.git] / Tools / Conf / BuildMacro.xml

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 8baeab9375260f4e2b0941a4f6e1460ecaecb918..28d6f0cb040c46b999f6ad09951a63133e191b56 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -136,7 +136,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <sequential>\r
 \r
           <cc userdefine="on">\r
-            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" family="${CC_FAMILY}">\r
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}" family="${PP_FAMILY}">\r
               <EXTRA.INC/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
@@ -211,7 +211,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
-            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}">\r
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}">\r
               <EXTRA.INC.1/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
@@ -283,7 +283,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
         <sequential>\r
           <cc userdefine="on">\r
-            <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${CC_FAMILY}">\r
+            <command type="PP" cmd="${PP}" workdir="${DEST_DIR_OUTPUT}/@{FILEPATH}" family="${PP_FAMILY}">\r
               <EXTRA.INC.1/>\r
               <argument value="${PP_FLAGS}"/>\r
               <fileset casesensitive="off" file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
@@ -522,7 +522,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     \r
           <cc userdefine="on">\r
             <command type="CC" cmd="${CC}" workdir="${DEST_DIR_OUTPUT}" \r
-                     includepathDelimiter="-I"\r
+                     includepathDelimiter="-I" family="${CC_FAMILY}"\r
                      outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" >\r
               <argument value="${CC_FLAGS}"/>\r
               <EXTRA.INC/>\r
@@ -630,6 +630,59 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!--\r
     EFI_SECTION_PE32\r
     -->\r
+\r
+  <macrodef name="EFI_SECTION_TE">\r
+    <attribute name="FILEPATH"/>\r
+    <attribute name="FILENAME"/>\r
+    <attribute name="FILEEXT" default="" />\r
+\r
+    <element name="PRE.PROCESS" optional="yes"/>\r
+    <element name="POST.PROCESS" optional="yes"/>\r
+\r
+    <sequential>\r
+      <PRE.PROCESS/>\r
+      <if>\r
+        <not>\r
+          <equals arg1="${LIBS}" arg2=""/>\r
+        </not>\r
+\r
+        <then>\r
+          <GenDll FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="">\r
+            <LIB.ARG></LIB.ARG>\r
+            <LINK.ARG></LINK.ARG>\r
+          </GenDll>\r
+\r
+          <GenEfi FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="dll"/>\r
+        </then>\r
+      </if>\r
+\r
+      <OnDependency>\r
+        <sourcefiles>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>\r
+        </sourcefiles>\r
+        <targetfiles>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.tes"/>\r
+        </targetfiles>\r
+\r
+        <sequential>\r
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${BIN_DIR}/@{FILENAME}.efi" />\r
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />          \r
+          <genteimage Dump="false" Verbose="false" OutputDir="" OutputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" InputFile="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"/>\r
+          <!-- \r
+          <exec executable="${GENTEIMAGE}">\r
+            <arg line="-o ${DEST_DIR_OUTPUT}/@{FILENAME}.te ${DEST_DIR_OUTPUT}/@{FILENAME}.efi" />\r
+          </exec>\r
+          -->\r
+          <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.te" tofile="${BIN_DIR}/@{FILENAME}.te" />\r
+          <gensection inputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.te" \r
+                      outputfile="${DEST_DIR_OUTPUT}/@{FILENAME}.tes" \r
+                      sectiontype="EFI_SECTION_TE"/>\r
+          <POST.PROCESS/>\r
+        </sequential>\r
+      </OnDependency>\r
+    </sequential>\r
+  </macrodef>\r
+\r
   <macrodef name="EFI_SECTION_PE32">\r
     <attribute name="FILEPATH"/>\r
     <attribute name="FILENAME"/>\r
@@ -868,59 +921,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!-- \r
     EFI_SECTION_TE\r
   -->\r
-  <macrodef name="EFI_SECTION_TE">\r
-    <attribute name="FILEPATH"/>\r
-    <attribute name="FILENAME"/>\r
-    <attribute name="FILEEXT" default="" />\r
-\r
-    <element name="PRE.PROCESS" optional="yes"/>\r
-    <element name="POST.PROCESS" optional="yes"/>\r
-\r
-    <sequential>\r
-      <PRE.PROCESS/>\r
-\r
-      <if>\r
-        <not>\r
-          <!-- TBD ${OBJECTS} -->\r
-          <equals arg1="${LIBS}" arg2=""/>\r
-        </not>\r
-\r
-        <then>\r
-          <GenDll FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="">\r
-            <LIB.ARG></LIB.ARG>\r
-            <LINK.ARG></LINK.ARG>\r
-          </GenDll>\r
-    \r
-          <GenEfi FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="dll"/>\r
-        </then>\r
-      </if>\r
-\r
-      <OnDependency>\r
-        <sourcefiles>\r
-          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.efi"/>\r
-        </sourcefiles>\r
-        <targetfiles>\r
-          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.tes"/>\r
-        </targetfiles>\r
-\r
-        <sequential>\r
-          <copy file="${DEST_DIR_OUTPUT}\@{FILENAME}.efi" tofile="${BIN_DIR}\@{FILENAME}.efi" />\r
-          <copy file="${DEST_DIR_OUTPUT}\@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}\@{FILENAME}.efi" />\r
-          \r
-          <exec executable="${GENTEIMAGE}">\r
-            <arg line="-o ${DEST_DIR_OUTPUT}\@{FILENAME}.te ${DEST_DIR_OUTPUT}\@{FILENAME}.efi" />\r
-          </exec>\r
-          \r
-          <copy file="${DEST_DIR_OUTPUT}\@{FILENAME}.te" tofile="${BIN_DIR}\@{FILENAME}.te" />\r
-          \r
-          <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.te" \r
-                      outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.tes" \r
-                      sectiontype="EFI_SECTION_TE"/>\r
-          <POST.PROCESS/>\r
-        </sequential>\r
-      </OnDependency>\r
-    </sequential>\r
-  </macrodef>\r
 \r
 \r
   <!--\r