From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.883.1619398192755225845 for ; Sun, 25 Apr 2021 17:49:52 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: michael.d.kinney@intel.com) IronPort-SDR: savKL8mInutqvWzU/ZTI6TLdO40ljjmZdTEpL0blB2WlicLlf2jTFZYxoNjTXobbDFZI/DmVUd v229sH2Q0Uww== X-IronPort-AV: E=McAfee;i="6200,9189,9965"; a="216959065" X-IronPort-AV: E=Sophos;i="5.82,251,1613462400"; d="scan'208";a="216959065" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2021 17:49:46 -0700 IronPort-SDR: A1weVaiDDxkspj4evGEUWOAlzJGcSxePhSK644bOJizh6vbrKIHChtOMHkBEx0MY9v2/O9qHz2 GzwWOTp6IUSA== X-IronPort-AV: E=Sophos;i="5.82,251,1613462400"; d="scan'208";a="525529403" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.212.153.185]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2021 17:49:45 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen Subject: [Patch 1/1] BaseTools/GenMake: Sort generated makefile tool definitions Date: Sun, 25 Apr 2021 17:49:38 -0700 Message-Id: <20210426004939.606-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3353 Sort the tool definition content of generated makefiles to help verify that makefile contents have not changed after BaseTools code changes. Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Signed-off-by: Michael D Kinney --- BaseTools/Source/Python/AutoGen/GenMake.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py index 1cfac1cd82ca..961b2ab1c399 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -1,7 +1,7 @@ ## @file # Create makefile for MS nmake and GNU make # -# Copyright (c) 2007 - 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.
# Copyright (c) 2020, ARM Limited. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -519,13 +519,15 @@ cleanlib: # tools definitions ToolsDef = [] IncPrefix = self._INC_FLAG_[MyAgo.ToolChainFamily] - for Tool in MyAgo.BuildOption: - for Attr in MyAgo.BuildOption[Tool]: + for Tool in sorted(list(MyAgo.BuildOption)): + Appended = False + for Attr in sorted(list(MyAgo.BuildOption[Tool])): Value = MyAgo.BuildOption[Tool][Attr] if Attr == "FAMILY": continue elif Attr == "PATH": ToolsDef.append("%s = %s" % (Tool, Value)) + Appended = True else: # Don't generate MAKE_FLAGS in makefile. It's put in environment variable. if Tool == "MAKE": @@ -542,7 +544,9 @@ cleanlib: Value = ' '.join(ValueList) ToolsDef.append("%s_%s = %s" % (Tool, Attr, Value)) - ToolsDef.append("") + Appended = True + if Appended: + ToolsDef.append("") # generate the Response file and Response flag RespDict = self.CommandExceedLimit() -- 2.31.1.windows.1