Re: [PATCH v1 1/1] BaseTools/Trim: Canonicalize filepaths to fix comparison

[Leif Lindholm <leif.lindholm@linaro.org>]

Sami, Evan? I think we need your input/review here.

On Wed, Jun 27, 2018 at 03:58:06AM +0000, Chris Co wrote:
> When using Linaro GCC5+ arm-eabi toolchain on Windows, the generated
> DSDT.iii contains a canonicalized ("\.\" removed and lower case)
> filepath for the preprocessed DSDT.i file in the first line.
> Due to this, when Trim.exe is called to generate DSDT.iiii, future
> filepath comparisons against this canonicalized filepath, which
> should match, actually fail the comparison which results in an
> empty DSDT.iiii.
> 
> Issue was first reported to Linaro here:
> https://bugs.linaro.org/show_bug.cgi?id=2909
> where the recommendation was to address the issue in Trim.exe.
> 
> This patch canonicalizes and lower cases all file paths encountered
> during trim execution on preprocessed files.  Since file paths are
> standarized, the comparison succeeds for files that should match
> regardless of the presence of upper case or "\.\" characters in
> the file path.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Christopher Co <christopher.co@microsoft.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Source/Python/Trim/Trim.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
> index a74075859148..cca4e5c9694a 100644
> --- a/BaseTools/Source/Python/Trim/Trim.py
> +++ b/BaseTools/Source/Python/Trim/Trim.py
> @@ -166,6 +166,8 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, TrimLong):
>              if len(MatchList) == 2:
>                  LineNumber = int(MatchList[0], 0)
>                  InjectedFile = MatchList[1]
> +                InjectedFile = InjectedFile.replace("\\.\\","")
> +                InjectedFile = InjectedFile.lower()
>                  # The first injetcted file must be the preprocessed file itself
>                  if PreprocessedFile == "":
>                      PreprocessedFile = InjectedFile
> -- 
> 2.16.2.gvfs.1.33.gf5370f1
>