* [Patch] BaseTools: Fix a bug for ExpandMacros to support mixed case ENV var
@ 2016-10-28 4:42 Yonghong Zhu
2016-11-01 9:38 ` Gao, Liming
0 siblings, 1 reply; 2+ messages in thread
From: Yonghong Zhu @ 2016-10-28 4:42 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao
os.environ contains all environment variables uppercase on Windows which
cause the key in the self.MacroDictionary is uppercase, but the real
variable name maybe mixed case, eg:WINSDK81x86, then we can't find the
variable in the self.MacroDictionary.
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/Common/ToolDefClassObject.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 5dd505c..a71c616 100644
--- a/BaseTools/Source/Python/Common/ToolDefClassObject.py
+++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py
@@ -234,17 +234,20 @@ class ToolDefClassObject(object):
# @param Value: The string with unreplaced macros
#
# @retval Value: The string which has been replaced with real value
#
def ExpandMacros(self, Value):
+ # os.environ contains all environment variables uppercase on Windows which cause the key in the self.MacroDictionary is uppercase, but Ref may not
EnvReference = gEnvRefPattern.findall(Value)
for Ref in EnvReference:
- if Ref not in self.MacroDictionary:
+ if Ref not in self.MacroDictionary and Ref.upper() not in self.MacroDictionary:
Value = Value.replace(Ref, "")
else:
- Value = Value.replace(Ref, self.MacroDictionary[Ref])
-
+ if Ref in self.MacroDictionary:
+ Value = Value.replace(Ref, self.MacroDictionary[Ref])
+ else:
+ Value = Value.replace(Ref, self.MacroDictionary[Ref.upper()])
MacroReference = gMacroRefPattern.findall(Value)
for Ref in MacroReference:
if Ref not in self.MacroDictionary:
return False, Ref
--
2.6.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch] BaseTools: Fix a bug for ExpandMacros to support mixed case ENV var
2016-10-28 4:42 [Patch] BaseTools: Fix a bug for ExpandMacros to support mixed case ENV var Yonghong Zhu
@ 2016-11-01 9:38 ` Gao, Liming
0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2016-11-01 9:38 UTC (permalink / raw)
To: Zhu, Yonghong, edk2-devel@lists.01.org
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 28, 2016 12:43 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [Patch] BaseTools: Fix a bug for ExpandMacros to support
> mixed case ENV var
>
> os.environ contains all environment variables uppercase on Windows which
> cause the key in the self.MacroDictionary is uppercase, but the real
> variable name maybe mixed case, eg:WINSDK81x86, then we can't find the
> variable in the self.MacroDictionary.
>
> 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/Common/ToolDefClassObject.py | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py
> b/BaseTools/Source/Python/Common/ToolDefClassObject.py
> index 5dd505c..a71c616 100644
> --- a/BaseTools/Source/Python/Common/ToolDefClassObject.py
> +++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py
> @@ -234,17 +234,20 @@ class ToolDefClassObject(object):
> # @param Value: The string with unreplaced macros
> #
> # @retval Value: The string which has been replaced with real value
> #
> def ExpandMacros(self, Value):
> + # os.environ contains all environment variables uppercase on Windows
> which cause the key in the self.MacroDictionary is uppercase, but Ref may
> not
> EnvReference = gEnvRefPattern.findall(Value)
> for Ref in EnvReference:
> - if Ref not in self.MacroDictionary:
> + if Ref not in self.MacroDictionary and Ref.upper() not in
> self.MacroDictionary:
> Value = Value.replace(Ref, "")
> else:
> - Value = Value.replace(Ref, self.MacroDictionary[Ref])
> -
> + if Ref in self.MacroDictionary:
> + Value = Value.replace(Ref, self.MacroDictionary[Ref])
> + else:
> + Value = Value.replace(Ref, self.MacroDictionary[Ref.upper()])
>
> MacroReference = gMacroRefPattern.findall(Value)
> for Ref in MacroReference:
> if Ref not in self.MacroDictionary:
> return False, Ref
> --
> 2.6.1.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-01 9:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-28 4:42 [Patch] BaseTools: Fix a bug for ExpandMacros to support mixed case ENV var Yonghong Zhu
2016-11-01 9:38 ` Gao, Liming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox