From nobody Sun May 5 04:45:24 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1492421019428289.7551903366052; Mon, 17 Apr 2017 02:23:39 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 657F420D7A3D3; Mon, 17 Apr 2017 02:23:37 -0700 (PDT) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 10A0120D7A3CD for ; Mon, 17 Apr 2017 02:23:36 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP; 17 Apr 2017 02:23:35 -0700 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga004.jf.intel.com with ESMTP; 17 Apr 2017 02:23:34 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,214,1488873600"; d="scan'208";a="78053084" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Mon, 17 Apr 2017 17:23:29 +0800 Message-Id: <1492421009-25636-1-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 Subject: [edk2] [Patch] BaseTools: Update the Conf directory to use the absolute path X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update the Conf directory to use the absolute path for build_rule.txt and tools_def.txt. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- 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 =3D re.compile("\s*guid\s*=3D\s= *({.*?{.*?}\s*})") ## Mapping Makefile type gMakeTypeMap =3D {"MSFT":"nmake", "GCC":"gmake"} =20 =20 ## Build rule configuration file -gDefaultBuildRuleFile =3D 'Conf/build_rule.txt' +gDefaultBuildRuleFile =3D 'build_rule.txt' =20 ## Tools definition configuration file -gDefaultToolsDefFile =3D 'Conf/tools_def.txt' +gDefaultToolsDefFile =3D 'tools_def.txt' =20 ## Build rule default version AutoGenReqBuildRuleVerNum =3D "0.1" =20 ## default file name for AutoGen @@ -724,12 +724,12 @@ class WorkspaceAutoGen(AutoGen): AllWorkSpaceMetaFiles.add(self.MetaFile.Path) =20 # # 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)) =20 # add BuildOption metafile # AllWorkSpaceMetaFiles.add(os.path.join(self.BuildDir, 'BuildOption= s')) =20 --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel