From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 99E5A20D7A3D2 for ; Mon, 17 Apr 2017 02:57:17 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP; 17 Apr 2017 02:57:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,214,1488873600"; d="scan'208";a="90746879" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga006.fm.intel.com with ESMTP; 17 Apr 2017 02:57:17 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 17 Apr 2017 02:57:16 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 17 Apr 2017 02:57:16 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.246]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0319.002; Mon, 17 Apr 2017 17:57:15 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Update the Conf directory to use the absolute path Thread-Index: AQHSt1xTlz0ayLXf7kG9KUEvGTBC6KHJUzmg Date: Mon, 17 Apr 2017 09:57:14 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D71EF91@shsmsx102.ccr.corp.intel.com> References: <1492421009-25636-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1492421009-25636-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [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: , X-List-Received-Date: Mon, 17 Apr 2017 09:57:17 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Zhu, Yonghong >Sent: Monday, April 17, 2017 5:23 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >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 >Contributed-under: TianoCore Contribution Agreement 1.0 >Signed-off-by: Yonghong Zhu >--- > 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"} > > > ## Build rule configuration file >-gDefaultBuildRuleFile =3D 'Conf/build_rule.txt' >+gDefaultBuildRuleFile =3D 'build_rule.txt' > > ## Tools definition configuration file >-gDefaultToolsDefFile =3D 'Conf/tools_def.txt' >+gDefaultToolsDefFile =3D 'tools_def.txt' > > ## Build rule default version > AutoGenReqBuildRuleVerNum =3D "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, 'BuildOptio= ns')) > >-- >2.6.1.windows.1