BaseTools: Update the Conf directory to use the absolute path

[edk2] [Patch] BaseTools: Update the Conf directory to use the absolute path

Posted by Yonghong Zhu 7 years, 6 months ago

Update the Conf directory to use the absolute path for build_rule.txt
and tools_def.txt.

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/AutoGen.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 3d3dfef..e1bdef0 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -60,14 +60,14 @@ gEfiVarStoreGuidPattern = re.compile("\s*guid\s*=\s*({.*?{.*?}\s*})")
 ## Mapping Makefile type
 gMakeTypeMap = {"MSFT":"nmake", "GCC":"gmake"}
 
 
 ## Build rule configuration file
-gDefaultBuildRuleFile = 'Conf/build_rule.txt'
+gDefaultBuildRuleFile = 'build_rule.txt'
 
 ## Tools definition configuration file
-gDefaultToolsDefFile = 'Conf/tools_def.txt'
+gDefaultToolsDefFile = 'tools_def.txt'
 
 ## Build rule default version
 AutoGenReqBuildRuleVerNum = "0.1"
 
 ## default file name for AutoGen
@@ -724,12 +724,12 @@ class WorkspaceAutoGen(AutoGen):
         AllWorkSpaceMetaFiles.add(self.MetaFile.Path)
 
         #
         # add build_rule.txt & tools_def.txt
         #
-        AllWorkSpaceMetaFiles.add(gDefaultBuildRuleFile)
-        AllWorkSpaceMetaFiles.add(gDefaultToolsDefFile)
+        AllWorkSpaceMetaFiles.add(os.path.join(GlobalData.gConfDirectory, gDefaultBuildRuleFile))
+        AllWorkSpaceMetaFiles.add(os.path.join(GlobalData.gConfDirectory, gDefaultToolsDefFile))
 
         # add BuildOption metafile
         #
         AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'BuildOptions'))
 
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] BaseTools: Update the Conf directory to use the absolute path

Posted by Gao, Liming 7 years, 6 months ago

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

>-----Original Message-----
>From: Zhu, Yonghong
>Sent: Monday, April 17, 2017 5:23 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [Patch] BaseTools: Update the Conf directory to use the absolute
>path
>
>Update the Conf directory to use the absolute path for build_rule.txt
>and tools_def.txt.
>
>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/AutoGen.py | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
>b/BaseTools/Source/Python/AutoGen/AutoGen.py
>index 3d3dfef..e1bdef0 100644
>--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
>+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
>@@ -60,14 +60,14 @@ gEfiVarStoreGuidPattern =
>re.compile("\s*guid\s*=\s*({.*?{.*?}\s*})")
> ## Mapping Makefile type
> gMakeTypeMap = {"MSFT":"nmake", "GCC":"gmake"}
>
>
> ## Build rule configuration file
>-gDefaultBuildRuleFile = 'Conf/build_rule.txt'
>+gDefaultBuildRuleFile = 'build_rule.txt'
>
> ## Tools definition configuration file
>-gDefaultToolsDefFile = 'Conf/tools_def.txt'
>+gDefaultToolsDefFile = 'tools_def.txt'
>
> ## Build rule default version
> AutoGenReqBuildRuleVerNum = "0.1"
>
> ## default file name for AutoGen
>@@ -724,12 +724,12 @@ class WorkspaceAutoGen(AutoGen):
>         AllWorkSpaceMetaFiles.add(self.MetaFile.Path)
>
>         #
>         # add build_rule.txt & tools_def.txt
>         #
>-        AllWorkSpaceMetaFiles.add(gDefaultBuildRuleFile)
>-        AllWorkSpaceMetaFiles.add(gDefaultToolsDefFile)
>+        AllWorkSpaceMetaFiles.add(os.path.join(GlobalData.gConfDirectory,
>gDefaultBuildRuleFile))
>+        AllWorkSpaceMetaFiles.add(os.path.join(GlobalData.gConfDirectory,
>gDefaultToolsDefFile))
>
>         # add BuildOption metafile
>         #
>         AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'BuildOptions'))
>
>--
>2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel