From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.33547.1585216250071564031 for ; Thu, 26 Mar 2020 02:50:50 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: zhijux.fan@intel.com) IronPort-SDR: z3GM0dJ9NnLepGg3MMEGBemBuC30F44K2Z10OfSPRBEAst2CG4b0aZ/LdWOa294Io+Sbmmx/eL Nt8K85SZ5PBA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2020 02:50:49 -0700 IronPort-SDR: 3krbz4VHgiBcETpY3rNje9Kx4XSGbT7k1PAxazmGyeFCyKFl/XsZHAmDg7bU6sN4PMdaksdf/7 MvZeVAZiMtTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,308,1580803200"; d="scan'208";a="446949757" Received: from zhijufax-mobl.ccr.corp.intel.com ([10.238.4.120]) by fmsmga005.fm.intel.com with ESMTP; 26 Mar 2020 02:50:48 -0700 From: "Fan, ZhijuX" To: devel@edk2.groups.io Cc: "Zhiju . Fan" , Liming Gao , Bob Feng Subject: [PATCH V6] BaseTools:GuidedSectionTools.txt is not generated correctly Date: Thu, 26 Mar 2020 17:48:04 +0800 Message-Id: <20200326094804.21368-1-zhijux.fan@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2538 For LzmaCompress or BrotliCompress, the platform may use the different options and add their batch file, such as LzmaCompressPlatform. Then, specify it in platform.dsc [BuildOptions] to override the default one in tools_def.txt. *_*_*_LZMA_PATH = LzmaCompressPlatform This override tool will be used. But, its name is not specified in the generated GuidedSectionTools.txt. Signed-off-by: Zhiju.Fan Cc: Liming Gao Cc: Bob Feng --- Some unnecessary comments were removed BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 3 ++- BaseTools/Source/Python/build/build.py | 16 +++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py index d32178b00c93..af66c48c7d6a 100644 --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py @@ -866,7 +866,8 @@ class PlatformAutoGen(AutoGen): Value += " " + self._BuildOptionWithToolDef(RetVal)[Tool][Attr] else: Value = self._BuildOptionWithToolDef(RetVal)[Tool][Attr] - + Def = '_'.join([self.BuildTarget, self.ToolChain, self.Arch, Tool, Attr]) + self.Workspace.ToolDef.ToolsDefTxtDictionary[Def] = Value if Attr == "PATH": # Don't put MAKE definition in the file if Tool != "MAKE": diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index d841fefdc502..bec848a7b2e3 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2347,7 +2347,7 @@ class Build(): toolName = split[3] path = '_'.join(split[0:4]) + '_PATH' path = self.ToolDef.ToolsDefTxtDictionary[path] - path = self.GetFullPathOfTool(path) + path = self.GetRealPathOfTool(path) guidAttribs.append((guid, toolName, path)) # Write out GuidedSecTools.txt @@ -2357,21 +2357,11 @@ class Build(): print(' '.join(guidedSectionTool), file=toolsFile) toolsFile.close() - ## Returns the full path of the tool. + ## Returns the real path of the tool. # - def GetFullPathOfTool (self, tool): + def GetRealPathOfTool (self, tool): if os.path.exists(tool): return os.path.realpath(tool) - else: - # We need to search for the tool using the - # PATH environment variable. - for dirInPath in os.environ['PATH'].split(os.pathsep): - foundPath = os.path.join(dirInPath, tool) - if os.path.exists(foundPath): - return os.path.realpath(foundPath) - - # If the tool was not found in the path then we just return - # the input tool. return tool ## Launch the module or platform build -- 2.14.1.windows.1