From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.1104.1619479208416686645 for ; Mon, 26 Apr 2021 16:20:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=a6Cwzu1K; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: bob.c.feng@intel.com) IronPort-SDR: XMPrrlA9T9hOV46ECdCzHXywI7fXjDRtqBHeUSx8AWNDrpC7rUfxqVRKG0Ywptt9jLMFcOXx8g g0AIM0UHxZCg== X-IronPort-AV: E=McAfee;i="6200,9189,9966"; a="260373108" X-IronPort-AV: E=Sophos;i="5.82,252,1613462400"; d="scan'208";a="260373108" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2021 16:20:04 -0700 IronPort-SDR: 7XyK/7DtOHZeI4PSZAOwA8QQx7ysdwSVPnZENt5HzxQgCyKv3B6ehO2I79xi3atLjJR2dMOlNn rwuNU8iJOe1w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,252,1613462400"; d="scan'208";a="454444369" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by FMSMGA003.fm.intel.com with ESMTP; 26 Apr 2021 16:20:04 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 26 Apr 2021 16:20:03 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 26 Apr 2021 16:20:03 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Mon, 26 Apr 2021 16:20:03 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.51) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Mon, 26 Apr 2021 16:20:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lvDpgEW1t1qW3uBHn3SWvDEFnsfH1fzH/oqb9duDUAZzMXvZUaw9htn5NfuPHotIcmLqQMecThLQoAr/5tA9F2zAw39ptDyeqG472CC547sgD6smQcX0Hmdr3JYcNtR5lrdt6So7XQc0KBoovyHIjFd76BKxfBhxIWNIascpIAge4yma+eG7BmOxWbcfUMutIrURDEvK3e7GE/69HvonmYaxDhIUa4z7dOlU2QbWbfy01rcSOWJvhffglNd+ieeBeIw7AWtlfFyjikr59iwg/jLIe6woEJNbmFxM5SUSqqS48zEdhIpgznAmYMIZqpYVoBbvYunXzkN3jV/oSuI06A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=33Bd6lLP/lS7Gfi7sm1mlbr6zAJAWzVRZEWUqZTnt5E=; b=ZLbTp6klqNXwht881dlJC8d7POOcHR2O+WAjYexnJmt2y0N3ZtmsPqqSgdt5UNHWUyMD8HizcqP9NFEb9oTs0MgUbyC6xPBHcwDxuKOWsKcNg/YmHMFM8LpVpzJPSYO62kYNiwe083Z4KMk6tZMnNtgWv9WW1iRx9OIfWHT+8ExcQzXLNEbKgCmslv866b+3gUf+0BggT92iFUNv65Gnq1SLee/XF6LWPR6NBscMVZKl58Ez+eiivAPkPW1Kv15u7Y/sA1e32rcMRpsioWn0LQEnsB8cd6GZJXt0gv9/Pm+eKJpVMze9nnMOdMwnr74tUHhcQRYkPhjhuN37ZNctbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=33Bd6lLP/lS7Gfi7sm1mlbr6zAJAWzVRZEWUqZTnt5E=; b=a6Cwzu1K1QPcn8wNSCbCtvsPc6Z6vK/cstAKtrrYsoLtLHozEQkXJ21RXys453IwKR/mathbyWLrY64LwQTMkPrKeGdY+c5CcrE3omER4y53Ylzu9JE0oQtP/KWWVW1/9EjsWkSPOoAE95IsGSACWdqZaFsw5sMmm25UmHuI56s= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM5PR1101MB2268.namprd11.prod.outlook.com (2603:10b6:4:53::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.23; Mon, 26 Apr 2021 23:20:01 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::cc64:a87c:5cf:5f18]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::cc64:a87c:5cf:5f18%3]) with mapi id 15.20.4065.027; Mon, 26 Apr 2021 23:20:01 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Kinney, Michael D" CC: Liming Gao , "Chen, Christine" Subject: Re: [edk2-devel] [Patch 1/1] BaseTools/GenMake: Sort generated makefile tool definitions Thread-Topic: [edk2-devel] [Patch 1/1] BaseTools/GenMake: Sort generated makefile tool definitions Thread-Index: AQHXOjYXGIY240DHJUCqSRjbN1qipqrHb/DA Date: Mon, 26 Apr 2021 23:20:01 +0000 Message-ID: References: <20210426004939.606-1-michael.d.kinney@intel.com> In-Reply-To: <20210426004939.606-1-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.53] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6d62c248-8595-487e-5fd6-08d90909d11a x-ms-traffictypediagnostic: DM5PR1101MB2268: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:231; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: X2SQ8rPuI8iL9RM/TYlY22eb34d0kp4P8unry9weqJKRkZFNzt59+qvQ1Tu0qJWtpdBlNJ50LqBtc3mIU/Oo25DrOB7qPruiMXoZ7UK/auSfYhAxZGuaApRYsl0XK2bRCnvIuTHMBpkSH5DWrtPyymNOyOwiGPtLXj3hz9yNUcaRhPIL88UK/pGUjE1sTwoeUCtfXmq7ZWxnsRdxxuVc5Vq/4+9UMVz+bdXR5J9+7E0Am+QEMG8Y88dInOUDUmviXN6jevtxDjLxVW0q09ZLm1OUobiFIFZpNGEdLBpInpNhj2RTM/7Nk+SPSHm0FCdQePWSqLx9kmoG9bJqwo9eFHQPUVd9q7FM5IKyAA//+da0Br3V4Vq1CWAj8R0cINygCFUVKVChx14pLj4AhgZLdxcfIukhK6urPeohKSOjRZIQIVjaYrM4pQ4jS89ZAzNk68luPafU7OkdJjbW+9tyVmi+9mcPEno5fj5EYNWE/PX1o5ES8YOFPq+D6HloR29qRORCnc+lzAl/0Ouds6OBEXQcTqiMznQ/AkXtIqEhpLXMq8Ff6bhht4y7Y/+xQNl8gki/cT7drZTz0Lm3YksQ30u+0c7kalImgheXb83oVROfctfrTQ3Kg3WCGigniOgbID7ZPpPV5b943JcNi25PNhdq8UFMoSwFsAmnO9emUCgtR/7SS/dLnu3sR4GRGDni x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(396003)(346002)(376002)(136003)(39860400002)(86362001)(186003)(7696005)(33656002)(76116006)(66476007)(66446008)(26005)(122000001)(5660300002)(2906002)(55016002)(8676002)(8936002)(4326008)(66556008)(53546011)(54906003)(38100700002)(64756008)(107886003)(966005)(83380400001)(52536014)(316002)(110136005)(6636002)(478600001)(66946007)(71200400001)(6506007)(9686003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?tAlxnhDkwQK7baBwdwl1rucIlaY/GGOrv1+JXq5Ij4uhGEjfBdUue/xZaAIq?= =?us-ascii?Q?B/XqW2eHvRVfyliDZJhSXH6njuWiRSxQYl/nvfASXXvT7XleKaTK8S42ZLjG?= =?us-ascii?Q?8bNElnttJA3izoIbmpebYNwMFNJ5C0fkmWQsWcgtS71K2bjGtkOqpxsxicrF?= =?us-ascii?Q?8IO097xH6Eqh+738I01G2LjeUhTYj1dEHn+YWdVnb67dW977W0jwidyyF2G5?= =?us-ascii?Q?ojduzivMF71SHmGmXZLJeSc6IWt8LWF0TFEi8FH6h23bPzIWXJ/gc3J7yaqV?= =?us-ascii?Q?sJY0wCndBNCskRcEM5eTYK3G9OcaNSxRLL9PgdGMi0x5YC6Irxwi/0ET/Wty?= =?us-ascii?Q?yAK1wZWeanWU8f+Uf5Atde7Pm/FHakqsNlhiMwNZ8ZxVmDGbUSSYEsMZYyOc?= =?us-ascii?Q?/jTVqbcLjQXPo4OkwtUrRqSa+MOs7TA4jdkr0xOpg95kFVrihW2EpbAmBYp3?= =?us-ascii?Q?0EuxrU6mjWV5wWqJT5CKpJVSxiBX5+mqPBWpZ34D+zkTk1tTjl0CR4uMnzrL?= =?us-ascii?Q?cszRa6hmPftGsaTgFkTH6qePpkPuxZqr9V2RRDzSZ+BsifEsO4PXNprjpoHG?= =?us-ascii?Q?R8F2UiXD0sCIN+hVA933KR/yahfcH9uNCJ121I0Wh9joobu4ajUqCvRqUgLi?= =?us-ascii?Q?SJf0lxzOrW/2/xzzUTY6QwiDFwGqCwL+sHM7PgTvUVOcadF3WKNHocfKZbPR?= =?us-ascii?Q?44d3je1Oy81cFumVhcbGEWblgoS2YNdTcrWoqEv8p/2xIwAR51UghLvQa98N?= =?us-ascii?Q?RiW0xV2HR7pNFyDRGCZdOtN/9o7bmhltyor7gC4AMkmu9TMaUvkZU5lckqff?= =?us-ascii?Q?bVSfr8rpsZh7S56A/kHpFVG3ety85wV360NPgenfAjyZls4WEA0qX0UZz0jb?= =?us-ascii?Q?pBZk8ky34IKkunltY4jrlqYlQ9pD7jif/yLiTNLWE9eCtgOakIKwuClfKixn?= =?us-ascii?Q?4ShZrBdkre/zklYBIHS8z9MZtUS1aMXDIGOauTBTJJo8xjRIDGYdM38voggz?= =?us-ascii?Q?O1cWhIOeHMaLfgEx3vlOgago696FRSqOyBWVVs9Wenm3vcwKSdkLbVDTwhOW?= =?us-ascii?Q?hHkHYrCqxs0/0Iac7QsfSBh0UrYrImC1VVbwXQhy9J75aLIp3HLn0rJASjiJ?= =?us-ascii?Q?onSmrW86CDEC9Or3WpWZfO1RnbrKy5OHuJpAa9TtEC6MolUZrY1AP1/Jra/L?= =?us-ascii?Q?eK6JUyB0Bkpt6EizUy4/lF9LUeYvs5M3MG6C2lwIgWqEYnBes5gOlpTSOTik?= =?us-ascii?Q?6wnz/VSDieWaHUiBErUW2TaZCHmptdferIAOghTEntpf2hdNRxGxD9iQdNes?= =?us-ascii?Q?RfjZ/69ZW8kr3LsdsgSLBv7X?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d62c248-8595-487e-5fd6-08d90909d11a X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2021 23:20:01.5618 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: cVn8R0LiAMI5IM75mEuZSHh2w5lT+NghL8bepwrO/sd/+THO273ov/oZMDmRYuom6pnQbBq5yEVL9gdx17bErg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1101MB2268 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: devel@edk2.groups.io On Behalf Of Michael D K= inney Sent: Monday, April 26, 2021 8:50 AM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao ; Chen, Christine Subject: [edk2-devel] [Patch 1/1] BaseTools/GenMake: Sort generated makefi= le tool definitions REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3353 Sort the tool definition content of generated makefiles to help verify tha= t 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 - 20= 20, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2021, Intel Corporation. All rights=20 +reserved.
# Copyright (c) 2020, ARM Limited. All rights reserved.
# SPDX-Licen= se-Identifier: BSD-2-Clause-Patent # @@ -519,13 +519,15 @@ cleanlib: # tools definitions ToolsDef =3D [] IncPrefix =3D self._INC_FLAG_[MyAgo.ToolChainFamily] - for Tool in MyAgo.BuildOption: - for Attr in MyAgo.BuildOption[Tool]: + for Tool in sorted(list(MyAgo.BuildOption)): + Appended =3D False + for Attr in sorted(list(MyAgo.BuildOption[Tool])): Value =3D MyAgo.BuildOption[Tool][Attr] if Attr =3D=3D "FAMILY": continue elif Attr =3D=3D "PATH": ToolsDef.append("%s =3D %s" % (Tool, Value)) + Appended =3D True else: # Don't generate MAKE_FLAGS in makefile. It's put in = environment variable. if Tool =3D=3D "MAKE": @@ -542,7 +544,9 @@ cleanlib: Value =3D ' '.join(ValueList) =20 ToolsDef.append("%s_%s =3D %s" % (Tool, Attr, Value)) - ToolsDef.append("") + Appended =3D True + if Appended: + ToolsDef.append("") =20 # generate the Response file and Response flag RespDict =3D self.CommandExceedLimit() -- 2.31.1.windows.1