[PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion.

[PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion.

[Mingyue Liang]

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2972

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.

Signed-off-by: Mingyue Liang <mingyuex.liang@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
---
 V3:
  Modify Version Description location.
  
 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.29.2.windows.2

Re: [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion.

[Bob Feng]

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: Mingyue Liang <mingyuex.liang@intel.com> 
Sent: Monday, November 9, 2020 10:51 AM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
Subject: [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion.

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2972

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.

Signed-off-by: Mingyue Liang <mingyuex.liang@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
---
 V3:
  Modify Version Description location.
  
 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.29.2.windows.2

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

[Bob Feng]

Created the PR https://github.com/tianocore/edk2/pull/1102 

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bob Feng
Sent: Monday, November 9, 2020 2:20 PM
To: Liang, MingyueX <mingyuex.liang@intel.com>; devel@edk2.groups.io
Cc: Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
Subject: Re: [edk2-devel] [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion.

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: Mingyue Liang <mingyuex.liang@intel.com> 
Sent: Monday, November 9, 2020 10:51 AM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
Subject: [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion.

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2972

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.

Signed-off-by: Mingyue Liang <mingyuex.liang@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
---
 V3:
  Modify Version Description location.

 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.29.2.windows.2

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

[Lendacky, Thomas]

After doing a git pull today, I started seeing these (error) messages in
my build:

build.py...                                                                                                                                                                                              
 : error 000E: /root/kernels/ovmf-build-X64/Build/OvmfX64/DEBUG_GCC5/X64/OvmfPkg/AcpiTables/AcpiTables/OUTPUT/Dsdt.asl.trim.deps doesn't exist                                                           
        list index out of range                                                                                                                                                                          
                                                                                                    
                                                                                                                                                                                                         
build.py...                                                                                                                                                                                              
 : error 000E: /root/kernels/ovmf-build-X64/Build/OvmfX64/DEBUG_GCC5/X64/OvmfPkg/AcpiTables/AcpiTables/OUTPUT/Ssdt.asl.trim.deps doesn't exist
        list index out of range                                                                     
Building ... /root/kernels/ovmf-build-X64/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf [X64]                                                                                                               
                                                                                                    
                                                                                                    
build.py...                                                                                         
 : error 000E: /root/kernels/ovmf-build-X64/Build/OvmfX64/DEBUG_GCC5/X64/OvmfPkg/AcpiTables/AcpiTables/OUTPUT/Dsdt.asl.trim.deps doesn't exist
        list index out of range                                                                     
                                                                                                    
                                                                                                    
build.py...                                                                                                                                                                                              
 : error 000E: /root/kernels/ovmf-build-X64/Build/OvmfX64/DEBUG_GCC5/X64/OvmfPkg/AcpiTables/AcpiTables/OUTPUT/Ssdt.asl.trim.deps doesn't exist                                                           
        list index out of range                                                                     


I bisected it to this commit.

The build completes successfully, however. So is this just an "error" that
is really just informational?

Thanks,
Tom

On 11/9/20 6:21 PM, Bob Feng via groups.io wrote:
> Created the PR https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Ftianocore%2Fedk2%2Fpull%2F1102&data=04%7C01%7Cthomas.lendacky%40amd.com%7C489d34e5582a4ca1766608d8850e9b7c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637405645077123886%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=GcAFjR3rpnnRUzbDWhO5FaWki0kMCTBMpZLlzixkQ00%3D&reserved=0 
> 
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bob Feng
> Sent: Monday, November 9, 2020 2:20 PM
> To: Liang, MingyueX <mingyuex.liang@intel.com>; devel@edk2.groups.io
> Cc: Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
> Subject: Re: [edk2-devel] [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion.
> 
> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
> 
> -----Original Message-----
> From: Mingyue Liang <mingyuex.liang@intel.com> 
> Sent: Monday, November 9, 2020 10:51 AM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
> Subject: [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion.
> 
> REF:https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.tianocore.org%2Fshow_bug.cgi%3Fid%3D2972&amp;data=04%7C01%7Cthomas.lendacky%40amd.com%7C489d34e5582a4ca1766608d8850e9b7c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637405645077123886%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=dXdFf1EciwOH0PvZ%2BgmOeuAxOFULi3TXUFbYO1dR2O4%3D&amp;reserved=0
> 
> 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.
> 
> Signed-off-by: Mingyue Liang <mingyuex.liang@intel.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> ---
>  V3:
>   Modify Version Description location.
> 
>  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.29.2.windows.2
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 

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

[Mingyue Liang]

[-- Attachment #1: Type: text/plain, Size: 102 bytes --]

Hi Tom

This is an information. I will make a patch to deal with this problem.

Thanks,
Mingyue

[-- Attachment #2: Type: text/html, Size: 141 bytes --]