From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 26 Jun 2006 17:36:46 +0000 (+0000)
Subject: Fix a bug for regular expression using wrong module's file name which contains '\'.
X-Git-Tag: edk2-stable201903~25175
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=567df6937d9b6da2067aaff4c04339f786e4e761

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 7790c4cffe..641bbcc4f3 100644
--- 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>
 
         <sequential>
+          <pathconvert property="ModuleDirUnixName" targetos="unix">
+            <path path="${MODULE_DIR}"/>
+            <mapper>
+              <chainedmapper>
+                <filtermapper>
+                  <replacestring from="\" to="/"/>
+                </filtermapper>
+              </chainedmapper>
+            </mapper>
+          </pathconvert>
           <cc userdefine="on">
             <command type="CC" workdir="${DEST_DIR_DEBUG}/@{FILEPATH}">
               <includepath path="${WORKSPACE_DIR}"/>
@@ -296,7 +306,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           </cc>
           <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"
                          match="^(#line +1 +.*@{FILEPATH}/@{FILENAME}\.@{FILEEXT}&quot;).+\1"
-                         replace="; Source: ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
+                         replace="; Source: ${ModuleDirUnixName}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"
                          flags="gs"/>
           <replaceregexp file="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.i"
                          match="^(#line .*)$"