[Patch] BaseTools: Enhance StrDefs.h to include ImageDefs.h

[Patch] BaseTools: Enhance StrDefs.h to include ImageDefs.h

[Yonghong Zhu]

Enhance StrDefs.h to include ImageDefs.h for VfrCompiler to support
IMAGE_TOKEN usage.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/AutoGen/GenC.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 96b1459..0fb6b9f 100644
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1979,10 +1979,13 @@ def CreateCode(Info, AutoGenC, AutoGenH, StringH, UniGenCFlag, UniGenBinBuffer,
                         if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:
                             TokenCName = PcdItem[0]
                             break
                     GuidMacros.append('#define %s %s' % ('_PCD_VALUE_'+TokenCName, Value))
 
+        if Info.IdfFileList:
+            GuidMacros.append('#include "%sImgDefs.h"' % Info.Name)
+
         if GuidMacros:
             StringH.Append('\n#ifdef VFRCOMPILE\n%s\n#endif\n' % '\n'.join(GuidMacros))
 
         StringH.Append("\n#endif\n")
         AutoGenH.Append('#include "%s"\n' % FileName)
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Enhance StrDefs.h to include ImageDefs.h

[Gao, Liming]

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

>-----Original Message-----
>From: Zhu, Yonghong
>Sent: Friday, March 31, 2017 10:22 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [Patch] BaseTools: Enhance StrDefs.h to include ImageDefs.h
>
>Enhance StrDefs.h to include ImageDefs.h for VfrCompiler to support
>IMAGE_TOKEN usage.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/AutoGen/GenC.py | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/BaseTools/Source/Python/AutoGen/GenC.py
>b/BaseTools/Source/Python/AutoGen/GenC.py
>index 96b1459..0fb6b9f 100644
>--- a/BaseTools/Source/Python/AutoGen/GenC.py
>+++ b/BaseTools/Source/Python/AutoGen/GenC.py
>@@ -1979,10 +1979,13 @@ def CreateCode(Info, AutoGenC, AutoGenH,
>StringH, UniGenCFlag, UniGenBinBuffer,
>                         if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in
>GlobalData.MixedPcd[PcdItem]:
>                             TokenCName = PcdItem[0]
>                             break
>                     GuidMacros.append('#define %s %s' %
>('_PCD_VALUE_'+TokenCName, Value))
>
>+        if Info.IdfFileList:
>+            GuidMacros.append('#include "%sImgDefs.h"' % Info.Name)
>+
>         if GuidMacros:
>             StringH.Append('\n#ifdef VFRCOMPILE\n%s\n#endif\n' %
>'\n'.join(GuidMacros))
>
>         StringH.Append("\n#endif\n")
>         AutoGenH.Append('#include "%s"\n' % FileName)
>--
>2.6.1.windows.1