Updated task GenEfi to support SEC component type.

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

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 748f527f5826a2c0553f9f84590f41f85c6d2401..4446d598470606a4e50db8ed87561f08d1c59c96 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -295,9 +295,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
             </command>\r
           </cc>\r
           <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
-                         match="^(#line\ +1\ +.*@{FILEPATH}/@{FILENAME}\.@{FILEEXT}&quot;).+\1"\r
+                         match="^(#line +1 +.*@{FILEPATH}/@{FILENAME}\.@{FILEEXT}&quot;).+\1"\r
                          replace="; Source: ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
                          flags="gs"/>\r
+          <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
+                         match="^(#line .*)$"\r
+                         replace="; \1"\r
+                         byline="true"/>\r
           <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
                          match="([^_a-zA-Z])0x([0-9a-fA-F]+)"\r
                          replace="\10\2h"\r
@@ -799,6 +803,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
 \r
         <sequential>\r
+          <if>\r
+            <equals arg1="${COMPONENT_TYPE}" arg2="SEC"/>\r
+            <then>\r
+              <var name="COMPONENT_TYPE" value="SECURITY_CORE"/>\r
+            </then>\r
+          </if>\r
           <fwimage componenttype="${COMPONENT_TYPE}" outImage="${DEST_DIR_OUTPUT}/@{FILENAME}.efi"\r
                    peImage="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" time="0"/>\r
           <copy file="${DEST_DIR_OUTPUT}/@{FILENAME}.efi" tofile="${DEST_DIR_DEBUG}/@{FILENAME}.efi" />\r