[PATCH] BaseTools: increment build generate inf file lost .depex file

[PATCH] BaseTools: increment build generate inf file lost .depex file

[Yonghong Zhu]

From: Yunhua Feng <yunhuax.feng@intel.com>

increment build generate inf file in output directory lost .depex file info.

Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1244
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
---
 BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 5778943512..2201ec8790 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -3634,10 +3634,14 @@ class ModuleAutoGen(AutoGen):
                 AsBuiltInfDict['binary_item'].append('ACPI|' + File)
             elif Item.Target.Ext.lower() == '.efi':
                 AsBuiltInfDict['binary_item'].append('PE32|' + self.Name + '.efi')
             else:
                 AsBuiltInfDict['binary_item'].append('BIN|' + File)
+        if not self.DepexGenerated:
+            DepexFile = os.path.join(self.OutputDir, self.Name + '.depex')
+            if os.path.exists(DepexFile):
+                self.DepexGenerated = True
         if self.DepexGenerated:
             self.OutputFile.add(self.Name + '.depex')
             if self.ModuleType in [SUP_MODULE_PEIM]:
                 AsBuiltInfDict['binary_item'].append('PEI_DEPEX|' + self.Name + '.depex')
             elif self.ModuleType in [SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER, SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI_DRIVER]:
-- 
2.12.2.windows.2

Re: [PATCH] BaseTools: increment build generate inf file lost .depex file

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
> Sent: Friday, October 12, 2018 10:53 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [PATCH] BaseTools: increment build generate inf file lost .depex file
> 
> From: Yunhua Feng <yunhuax.feng@intel.com>
> 
> increment build generate inf file in output directory lost .depex file info.
> 
> Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=1244
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
> index 5778943512..2201ec8790 100644
> --- a/BaseTools/Source/Python/AutoGen/AutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
> @@ -3634,10 +3634,14 @@ class ModuleAutoGen(AutoGen):
>                  AsBuiltInfDict['binary_item'].append('ACPI|' + File)
>              elif Item.Target.Ext.lower() == '.efi':
>                  AsBuiltInfDict['binary_item'].append('PE32|' + self.Name + '.efi')
>              else:
>                  AsBuiltInfDict['binary_item'].append('BIN|' + File)
> +        if not self.DepexGenerated:
> +            DepexFile = os.path.join(self.OutputDir, self.Name + '.depex')
> +            if os.path.exists(DepexFile):
> +                self.DepexGenerated = True
>          if self.DepexGenerated:
>              self.OutputFile.add(self.Name + '.depex')
>              if self.ModuleType in [SUP_MODULE_PEIM]:
>                  AsBuiltInfDict['binary_item'].append('PEI_DEPEX|' + self.Name + '.depex')
>              elif self.ModuleType in [SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER,
> SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI_DRIVER]:
> --
> 2.12.2.windows.2
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel