From 0d1f75453bb42917841b7e741abe05403f4d4b89 Mon Sep 17 00:00:00 2001 From: aozima Date: Sat, 7 Apr 2018 17:14:12 +0800 Subject: [PATCH] update scons script: strict SrcRemove() match rule. --- tools/building.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/building.py b/tools/building.py index 42cb37dc4f..990e57edcd 100644 --- a/tools/building.py +++ b/tools/building.py @@ -743,11 +743,20 @@ def SrcRemove(src, remove): for item in src: if type(item) == type('str'): - if os.path.basename(item) in remove: + item_str = item + else: + item_str = item.rstr() + + if os.path.isabs(item_str): + item_str = os.path.relpath(item_str, GetCurrentDir()) + + if type(remove) == type('str'): + if item_str == remove: src.remove(item) else: - if os.path.basename(item.rstr()) in remove: - src.remove(item) + for remove_item in remove: + if item_str == str(remove_item): + src.remove(item) def GetVersion(): import SCons.cpp