From 55668ca24539f8db03c8daac6bba5c4f47a53585 Mon Sep 17 00:00:00 2001 From: Yingke Liu Date: Thu, 6 Aug 2015 08:05:59 +0000 Subject: BaseTools/Trim: Fixed a bug that cannot trim long values The long value substitution must move to the front of HEX substitution, and updated build_rule to add --trim-long Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yingke Liu Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18170 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/Python/Trim/Trim.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/Python/Trim/Trim.py') diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py index 7df83649d0..8fefa1bcd9 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -177,13 +177,13 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, TrimLong): EdkLogger.verbose("Found original file content starting from line %d" % (LineIndexOfOriginalFile + 1)) + if TrimLong: + Line = gLongNumberPattern.sub(r"\1", Line) # convert HEX number format if indicated if ConvertHex: Line = gHexNumberPattern.sub(r"0\2h", Line) else: Line = gHexNumberPattern.sub(r"\1\2", Line) - if TrimLong: - Line = gLongNumberPattern.sub(r"\1", Line) # convert Decimal number format Line = gDecNumberPattern.sub(r"\1", Line) -- cgit v1.2.3