]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Update the Conf directory to use the absolute path
authorYonghong Zhu <yonghong.zhu@intel.com>
Mon, 17 Apr 2017 09:12:06 +0000 (17:12 +0800)
committerYonghong Zhu <yonghong.zhu@intel.com>
Tue, 18 Apr 2017 02:41:51 +0000 (10:41 +0800)
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>
Reviewed-by: Liming Gao <liming.gao@intel.com>
BaseTools/Source/Python/AutoGen/AutoGen.py

index 3d3dfefdbc974014f54491da7f63e2f3f139a807..e1bdef09ca32dec12738da647e4747f5d963b0ea 100644 (file)
@@ -62,10 +62,10 @@ gMakeTypeMap = {"MSFT":"nmake", "GCC":"gmake"}
 \r
 \r
 ## Build rule configuration file\r
-gDefaultBuildRuleFile = 'Conf/build_rule.txt'\r
+gDefaultBuildRuleFile = 'build_rule.txt'\r
 \r
 ## Tools definition configuration file\r
-gDefaultToolsDefFile = 'Conf/tools_def.txt'\r
+gDefaultToolsDefFile = 'tools_def.txt'\r
 \r
 ## Build rule default version\r
 AutoGenReqBuildRuleVerNum = "0.1"\r
@@ -726,8 +726,8 @@ class WorkspaceAutoGen(AutoGen):
         #\r
         # add build_rule.txt & tools_def.txt\r
         #\r
-        AllWorkSpaceMetaFiles.add(gDefaultBuildRuleFile)\r
-        AllWorkSpaceMetaFiles.add(gDefaultToolsDefFile)\r
+        AllWorkSpaceMetaFiles.add(os.path.join(GlobalData.gConfDirectory, gDefaultBuildRuleFile))\r
+        AllWorkSpaceMetaFiles.add(os.path.join(GlobalData.gConfDirectory, gDefaultToolsDefFile))\r
 \r
         # add BuildOption metafile\r
         #\r