[Patch] BaseTools: Fix a bug for tooldef class not include the newly Env

[Patch] BaseTools: Fix a bug for tooldef class not include the newly Env

[Yonghong Zhu]

Prebuild script may update os.environ, but the tooldef class not include
the new ENV variables. so after the Launch prebuild script, we should
re-init the tooldef class to include the new ENV variables.

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/build/build.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index f17b55c..35e7037 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -823,10 +823,12 @@ class Build():
             EdkLogger.quiet("%-16s = %s" % ("PREBUILD", self.PrebuildScript))
         if self.PostbuildScript:
             EdkLogger.quiet("%-16s = %s" % ("POSTBUILD", self.PostbuildScript))
         if self.PrebuildScript:
             self.LaunchPrebuild()
+            self.TargetTxt = TargetTxtClassObject()
+            self.ToolDef   = ToolDefClassObject()
         if not (self.LaunchPrebuildFlag and os.path.exists(self.PlatformBuildPath)):
             self.InitBuild()
 
         EdkLogger.info("")
         os.chdir(self.WorkspaceDir)
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Fix a bug for tooldef class not include the newly Env

[Gao, Liming]

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

> -----Original Message-----
> From: Zhu, Yonghong
> Sent: Friday, October 28, 2016 12:43 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [Patch] BaseTools: Fix a bug for tooldef class not include the newly
> Env
> 
> Prebuild script may update os.environ, but the tooldef class not include
> the new ENV variables. so after the Launch prebuild script, we should
> re-init the tooldef class to include the new ENV variables.
> 
> 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/build/build.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/BaseTools/Source/Python/build/build.py
> b/BaseTools/Source/Python/build/build.py
> index f17b55c..35e7037 100644
> --- a/BaseTools/Source/Python/build/build.py
> +++ b/BaseTools/Source/Python/build/build.py
> @@ -823,10 +823,12 @@ class Build():
>              EdkLogger.quiet("%-16s = %s" % ("PREBUILD", self.PrebuildScript))
>          if self.PostbuildScript:
>              EdkLogger.quiet("%-16s = %s" % ("POSTBUILD", self.PostbuildScript))
>          if self.PrebuildScript:
>              self.LaunchPrebuild()
> +            self.TargetTxt = TargetTxtClassObject()
> +            self.ToolDef   = ToolDefClassObject()
>          if not (self.LaunchPrebuildFlag and
> os.path.exists(self.PlatformBuildPath)):
>              self.InitBuild()
> 
>          EdkLogger.info("")
>          os.chdir(self.WorkspaceDir)
> --
> 2.6.1.windows.1