From 4194d9bbfad718802cd635223a2ab8e37eda7674 Mon Sep 17 00:00:00 2001 From: Yuwei Chen Date: Mon, 5 Jun 2023 16:01:50 +0800 Subject: [PATCH 1/2] FMMT GuidTool Auto Select Config file Currently, Python FMMT tool does not support automatically select FMMTConf.ini file which saves GuidTool settings. This patch support this features. Signed-off-by: Yuwei Chen --- edk2basetools/FMMT/core/GuidTools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edk2basetools/FMMT/core/GuidTools.py b/edk2basetools/FMMT/core/GuidTools.py index 2509b183..8644b8e9 100644 --- a/edk2basetools/FMMT/core/GuidTools.py +++ b/edk2basetools/FMMT/core/GuidTools.py @@ -110,7 +110,7 @@ def SetConfigFile(self) -> None: if os.environ['FmmtConfPath']: self.tooldef_file = os.path.join(os.environ['FmmtConfPath'], 'FmmtConf.ini') else: - PathList = os.environ['PATH'] + PathList = os.environ['PATH'].split(';') for CurrentPath in PathList: if os.path.exists(os.path.join(CurrentPath, 'FmmtConf.ini')): self.tooldef_file = os.path.join(CurrentPath, 'FmmtConf.ini') From 4a0dd3205fb4846a53d9bf8d6ce4cdf4087a5184 Mon Sep 17 00:00:00 2001 From: YuweiChen1110 Date: Mon, 11 Dec 2023 08:36:49 +0800 Subject: [PATCH 2/2] FMMT GuidTool Auto Select Config file Currently, Python FMMT tool does not support automatically select FMMTConf.ini file which saves GuidTool settings. This patch support this features. Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Signed-off-by: Yuwei Chen --- edk2basetools/FMMT/core/GuidTools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edk2basetools/FMMT/core/GuidTools.py b/edk2basetools/FMMT/core/GuidTools.py index 8644b8e9..65c997be 100644 --- a/edk2basetools/FMMT/core/GuidTools.py +++ b/edk2basetools/FMMT/core/GuidTools.py @@ -110,7 +110,7 @@ def SetConfigFile(self) -> None: if os.environ['FmmtConfPath']: self.tooldef_file = os.path.join(os.environ['FmmtConfPath'], 'FmmtConf.ini') else: - PathList = os.environ['PATH'].split(';') + PathList = os.environ['PATH'].split(os.pathsep) for CurrentPath in PathList: if os.path.exists(os.path.join(CurrentPath, 'FmmtConf.ini')): self.tooldef_file = os.path.join(CurrentPath, 'FmmtConf.ini')