tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools/GenMake: Sort generated makefile tool definitions

Browse Source 
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 <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
This commit is contained in:
Michael D Kinney 2021-04-23 12:31:09 -07:00 committed by mergify[bot]
parent 5396354b86
commit 8d2012035d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BaseTools/Source/Python/AutoGen/GenMake.py
View File

@ -1,7 +1,7 @@
## @file ## @file
# Create makefile for MS nmake and GNU make # Create makefile for MS nmake and GNU make
# #
# Copyright (c) 2007 - 2020, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2020, ARM Limited. All rights reserved.<BR> # Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
@ -519,13 +519,15 @@ cleanlib:
# tools definitions # tools definitions
ToolsDef = [] ToolsDef = []
IncPrefix = self._INC_FLAG_[MyAgo.ToolChainFamily] IncPrefix = self._INC_FLAG_[MyAgo.ToolChainFamily]
for Tool in MyAgo.BuildOption: for Tool in sorted(list(MyAgo.BuildOption)):
for Attr in MyAgo.BuildOption[Tool]: Appended = False
for Attr in sorted(list(MyAgo.BuildOption[Tool])):
Value = MyAgo.BuildOption[Tool][Attr] Value = MyAgo.BuildOption[Tool][Attr]
if Attr == "FAMILY": if Attr == "FAMILY":
continue continue
elif Attr == "PATH": elif Attr == "PATH":
ToolsDef.append("%s = %s" % (Tool, Value)) ToolsDef.append("%s = %s" % (Tool, Value))
Appended = True
else: else:
# Don't generate MAKE_FLAGS in makefile. It's put in environment variable. # Don't generate MAKE_FLAGS in makefile. It's put in environment variable.
if Tool == "MAKE": if Tool == "MAKE":
@ -542,7 +544,9 @@ cleanlib:
Value = ' '.join(ValueList) Value = ' '.join(ValueList)
ToolsDef.append("%s_%s = %s" % (Tool, Attr, Value)) ToolsDef.append("%s_%s = %s" % (Tool, Attr, Value))
ToolsDef.append("") Appended = True
if Appended:
ToolsDef.append("")
# generate the Response file and Response flag # generate the Response file and Response flag
RespDict = self.CommandExceedLimit() RespDict = self.CommandExceedLimit()