[edk2-devel] [PATCH 1/1] BaseTools: Incremental build issue for included ASI file's deletion.

[Mingyue Liang]

V2 version updated.
Patch link in https://edk2.groups.io/g/devel/message/67133

Thanks,
MIngyue

-----Original Message-----
From: Feng, Bob C <bob.c.feng at intel.com> 
Sent: Friday, November 6, 2020 7:19 PM
To: Liang, MingyueX <mingyuex.liang at intel.com>; devel at edk2.groups.io
Cc: Liming Gao <gaoliming at byosoft.com.cn>; Chen, Christine <yuwei.chen at intel.com>
Subject: RE: [PATCH 1/1] BaseTools: Incremental build issue for included ASI file's deletion.

Please add this BZ to the patch commit message.
https://bugzilla.tianocore.org/show_bug.cgi?id=2972

Thanks,
Bob

-----Original Message-----
From: Mingyue Liang <mingyuex.liang at intel.com> 
Sent: Friday, November 6, 2020 1:55 PM
To: devel at edk2.groups.io
Cc: Feng, Bob C <bob.c.feng at intel.com>; Liming Gao <gaoliming at byosoft.com.cn>; Chen, Christine <yuwei.chen at intel.com>
Subject: [PATCH 1/1] BaseTools: Incremental build issue for included ASI file's deletion.

When using incremental build to delete an included xxx.asi file from the ASL file, the xxx.asl.trim.deps file generated by previous build process will not be deleted from the OUTPUT directory, which caused the dependency file still include the xxx.asl.trim.deps file.

If the include file is deleted and DEPs is empty, the DEPs file is deleted.

Signed-off-by: Mingyue Liang <mingyuex.liang at intel.com>
Cc: Bob Feng <bob.c.feng at intel.com>
Cc: Liming Gao <gaoliming at byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen at intel.com>
---
 BaseTools/Source/Python/Trim/Trim.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
index 776474b20349..c479f7d2b2e7 100644
--- a/BaseTools/Source/Python/Trim/Trim.py
+++ b/BaseTools/Source/Python/Trim/Trim.py
@@ -372,8 +372,7 @@ def TrimAslFile(Source, Target, IncludePathFile,AslDeps = False):
     AslIncludes = []
     Lines = DoInclude(Source, '', IncludePathList,IncludeFileList=AslIncludes,filetype='ASL')
     AslIncludes = [item for item in AslIncludes if item !=Source]
-    if AslDeps and AslIncludes:
-        SaveFileOnChange(os.path.join(os.path.dirname(Target),os.path.basename(Source))+".trim.deps", " \\\n".join([Source+":"] +AslIncludes),False)
+    
+ SaveFileOnChange(os.path.join(os.path.dirname(Target),os.path.basename
+ (Source))+".trim.deps", " \\\n".join([Source+":"] +AslIncludes),False)
 
     #
     # Undef MIN and MAX to avoid collision in ASL source code
--
2.28.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#67134): https://edk2.groups.io/g/devel/message/67134
Mute This Topic: https://groups.io/mt/78068940/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-