diff options
| author | klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-26 17:36:46 +0000 |
|---|---|---|
| committer | klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-26 17:36:46 +0000 |
| commit | 567df6937d9b6da2067aaff4c04339f786e4e761 (patch) | |
| tree | 77b205346a88fdb88b2f016b9537bd8bb80caa93 /Tools | |
| parent | 51da9e80d4624783c6f7230407d3bd8f28f94a4a (diff) | |
| download | edk2-platforms-567df6937d9b6da2067aaff4c04339f786e4e761.tar.xz | |
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
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/Conf/BuildMacro.xml | 12 |
1 files changed, 11 insertions, 1 deletions
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}").+\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 .*)$"
|