[Patch] BaseTools: remove including Base.h if the module type is not BASE

[Patch] BaseTools: remove including Base.h if the module type is not BASE

[Yonghong Zhu]

According the module type to include the header file.

Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=867
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/AutoGen/GenC.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 1be27d2..19ed196 100644
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -2011,13 +2011,11 @@ def CreateHeaderCode(Info, AutoGenC, AutoGenH):
     # header file Prologue
     AutoGenH.Append(gAutoGenHPrologueString.Replace({'File':'AUTOGENH','Guid':Info.Guid.replace('-','_')}))
     AutoGenH.Append(gAutoGenHCppPrologueString)
     if Info.AutoGenVersion >= 0x00010005:
         # header files includes
-        AutoGenH.Append("#include <%s>\n" % gBasicHeaderFile)
-        if Info.ModuleType in gModuleTypeHeaderFile \
-           and gModuleTypeHeaderFile[Info.ModuleType][0] != gBasicHeaderFile:
+        if Info.ModuleType in gModuleTypeHeaderFile:
             AutoGenH.Append("#include <%s>\n" % gModuleTypeHeaderFile[Info.ModuleType][0])
         #
         # if either PcdLib in [LibraryClasses] sections or there exist Pcd section, add PcdLib.h 
         # As if modules only uses FixedPcd, then PcdLib is not needed in [LibraryClasses] section.
         #
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: remove including Base.h if the module type is not BASE

[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: Tuesday, June 12, 2018 2:40 PM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [Patch] BaseTools: remove including Base.h if the module type is not BASE
> 
> According the module type to include the header file.
> 
> Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=867
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/GenC.py | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
> index 1be27d2..19ed196 100644
> --- a/BaseTools/Source/Python/AutoGen/GenC.py
> +++ b/BaseTools/Source/Python/AutoGen/GenC.py
> @@ -2011,13 +2011,11 @@ def CreateHeaderCode(Info, AutoGenC, AutoGenH):
>      # header file Prologue
>      AutoGenH.Append(gAutoGenHPrologueString.Replace({'File':'AUTOGENH','Guid':Info.Guid.replace('-','_')}))
>      AutoGenH.Append(gAutoGenHCppPrologueString)
>      if Info.AutoGenVersion >= 0x00010005:
>          # header files includes
> -        AutoGenH.Append("#include <%s>\n" % gBasicHeaderFile)
> -        if Info.ModuleType in gModuleTypeHeaderFile \
> -           and gModuleTypeHeaderFile[Info.ModuleType][0] != gBasicHeaderFile:
> +        if Info.ModuleType in gModuleTypeHeaderFile:
>              AutoGenH.Append("#include <%s>\n" % gModuleTypeHeaderFile[Info.ModuleType][0])
>          #
>          # if either PcdLib in [LibraryClasses] sections or there exist Pcd section, add PcdLib.h
>          # As if modules only uses FixedPcd, then PcdLib is not needed in [LibraryClasses] section.
>          #
> --
> 2.6.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel