From 8be15c61e88709c55970c5d5272d19bd9bba67fb Mon Sep 17 00:00:00 2001 From: Yunhua Feng Date: Fri, 24 Aug 2018 16:39:14 +0800 Subject: BaseTools: Fix some build and report file issue 1. increment build not skip make file when not change any file 2. report file generate abundant blank line 3. Build encounter Database is locked on some platform, using database auto commit 4. Fv BaseAddress must have if set Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yunhua Feng Reviewed-by: Liming Gao --- BaseTools/Source/Python/Common/Misc.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'BaseTools/Source/Python/Common/Misc.py') diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 71ab6da529..370b4bbb49 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -1597,15 +1597,19 @@ def CheckPcdDatum(Type, Value): return False, "Invalid value [%s] of type [%s]; must be one of TRUE, True, true, 0x1, 0x01, 1"\ ", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type) elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]: - if Value and int(Value, 0) < 0: - return False, "PCD can't be set to negative value[%s] for datum type [%s]" % (Value, Type) try: - Value = int(Value, 0) - if Value > MAX_VAL_TYPE[Type]: - return False, "Too large PCD value[%s] for datum type [%s]" % (Value, Type) + Val = int(Value, 0) except: - return False, "Invalid value [%s] of type [%s];"\ - " must be a hexadecimal, decimal or octal in C language format." % (Value, Type) + try: + Val = int(Value.lstrip('0')) + except: + return False, "Invalid value [%s] of type [%s];" \ + " must be a hexadecimal, decimal or octal in C language format." % (Value, Type) + if Val > MAX_VAL_TYPE[Type]: + return False, "Too large PCD value[%s] for datum type [%s]" % (Value, Type) + if Val < 0: + return False, "PCD can't be set to negative value[%s] for datum type [%s]" % (Value, Type) + else: return True, "StructurePcd" -- cgit v1.2.3