Fix a bug for regular expression using wrong module's file name which contains '\'.

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

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 7790c4cffe5f1315504c5ee05edf9e17cb4d1611..641bbcc4f39c90907fdf158d9b25b11a6c4306a9 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -283,6 +283,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>\r
 \r
         <sequential>\r
         </targetfiles>\r
 \r
         <sequential>\r

+          <pathconvert property="ModuleDirUnixName" targetos="unix">\r
+            <path path="${MODULE_DIR}"/>\r
+            <mapper>\r
+              <chainedmapper>\r
+                <filtermapper>\r
+                  <replacestring from="\" to="/"/>\r
+                </filtermapper>\r
+              </chainedmapper>\r
+            </mapper>\r
+          </pathconvert>\r

           <cc userdefine="on">\r
             <command type="CC" workdir="${DEST_DIR_DEBUG}/@{FILEPATH}">\r
               <includepath path="${WORKSPACE_DIR}"/>\r
           <cc userdefine="on">\r
             <command type="CC" workdir="${DEST_DIR_DEBUG}/@{FILEPATH}">\r
               <includepath path="${WORKSPACE_DIR}"/>\r


@@ -296,7 +306,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </cc>\r
           <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
                          match="^(#line +1 +.*@{FILEPATH}/@{FILENAME}\.@{FILEEXT}&quot;).+\1"\r
           </cc>\r
           <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
                          match="^(#line +1 +.*@{FILEPATH}/@{FILENAME}\.@{FILEEXT}&quot;).+\1"\r

-                         replace="; Source: ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r
+                         replace="; Source: ${ModuleDirUnixName}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"\r

                          flags="gs"/>\r
           <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
                          match="^(#line .*)$"\r
                          flags="gs"/>\r
           <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"\r
                          match="^(#line .*)$"\r