From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web12.1895.1619404857408812002 for ; Sun, 25 Apr 2021 19:40:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=FGM4qEaZ; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: yuwei.chen@intel.com) IronPort-SDR: SnhcPcWeZ6IiTjkWaYWp8e/CuZEqEaaoWB4ueSUEcgKmLDw/j+ECxoy8vHkg+M47SD73wa8QVn za3yW4emTYSg== X-IronPort-AV: E=McAfee;i="6200,9189,9965"; a="194154074" X-IronPort-AV: E=Sophos;i="5.82,251,1613462400"; d="scan'208";a="194154074" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2021 19:40:55 -0700 IronPort-SDR: hWKhQSaWHZVzJCTl33nAwTJ+ZaSuclGdtCmq+sMwgfNzIcct5R12L898GxdMwjlaDj5al/fJjr dCUuCNL8Vn1w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,251,1613462400"; d="scan'208";a="604032979" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga005.jf.intel.com with ESMTP; 25 Apr 2021 19:40:55 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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; Sun, 25 Apr 2021 19:40:55 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Sun, 25 Apr 2021 19:40:54 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) 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; Sun, 25 Apr 2021 19:40:54 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.108) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Sun, 25 Apr 2021 19:40:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KC9jOxHGS5shrWQLyvmbPtUKR8BLhS4WJN31mb0OhAiNllCVLQRHbwh6+gs3WLz0mjtNOcdqaj8n4wsbnpoaYR4xP0T5OywYJLXgc2vC9lmIzrdfgrIB8EdcWBpmkPEQGNQFCQD8GPfgqJIBkieiGd19Rf4hRAy575AUlEeyXClq/UGyQYWu2K0aXbVULSCBZwwPuGBWkxEC7Fi1/obvksZLuFpukUbR2jJKX58+nkgrxrXq57OMWZsxiD4Q39Vik8PwqFHsNgCIOsSKOOLECq+iNtrWBKUksurGi2EZ7KcuZRoIbn4uJ90JG3W6roA8Ii3vsnN15n33QTRWBE+0Aw== 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=eJVhsV5FhJw4BJNhG33rVGW5MmvNy5qt581P//Tt37c=; b=ljiI4Ud0Uf6zvivLQ0Rq47+1K6V/iT2jUErJDiSb+BNznO1g/870plsH39dOaYCX0HzUpQNOtnmCGDUtDeHJZevDQ8hTqm8ZVLXwTNxnsNJBuYa8ZmiVKULvb4+FPdBPWAen6CgUm/QdSw2Sod5aLu3ePmX5QZsInXfvBZ97ctYOmWJWz569DZwmOnAsJcl0BRWAzcJiNhlSNkbXZgk5d7r6FnGojlZG+rGbeVtrg7Cv6r0QWDqBPYsQ4+xZ1zGnCE/niH8BlgL7iWTLRHKqvkhiYy/TWgaPsLldd+jBslyAXCIavWKvUmFX2lEEuJVrVGY0MZHqJ9LvMB1UCpsyWg== 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=eJVhsV5FhJw4BJNhG33rVGW5MmvNy5qt581P//Tt37c=; b=FGM4qEaZB3fo0TTZUYFPt1xhIFliIe+3/O6Qlx2zch6mb03M0SCnYZbZs0dEnnAqbCCXVc95dxmz7kub5RKm+ORVe4jvxDwhqd5t/nYwAy/FnuigrP/ql+AcPipSYIbsr100y4Oz/RRGn0j2slI+u09RzoHR2Yr8106pCXlanpc= Received: from DM5PR11MB1594.namprd11.prod.outlook.com (2603:10b6:4:5::16) by DM5PR11MB1836.namprd11.prod.outlook.com (2603:10b6:3:109::17) 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 02:40:53 +0000 Received: from DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::dd5c:623a:264a:4a53]) by DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::dd5c:623a:264a:4a53%7]) with mapi id 15.20.4065.026; Mon, 26 Apr 2021 02:40:53 +0000 From: "Yuwei Chen" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: "Feng, Bob C" , Liming Gao Subject: Re: [Patch 1/1] BaseTools/GenMake: Sort generated makefile tool definitions Thread-Topic: [Patch 1/1] BaseTools/GenMake: Sort generated makefile tool definitions Thread-Index: AQHXOjYaaHBrLDp4aEyxRT3Aivq4x6rGFqbQ Date: Mon, 26 Apr 2021 02:40:53 +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: dlp-version: 11.5.1.3 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.194] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8010adef-c5c9-4384-eae6-08d9085cb5f0 x-ms-traffictypediagnostic: DM5PR11MB1836: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:204; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: E/DzC+HavWLt6sVL3ST8Ze8/zOi6PxkdkgVx7pHH5O4KMBZ9ClzCKZjo0AWyRTAvRyCPK4+/mtPp0viypCk3DIec2KN0UTexCl/Kkvj1/sbJgzE9yNfWP+Klfmw0aFak8QOu3OKP5x5E25otodqjcSHrs+M6WE/bQFOerEB4oD3IpUY0MSxxvdqZKlvj3yCum3J9GYiJukhZmBIXt15RexRyqKAkRHo+1r+jlwJYcoU+qg3KIjV4+sWFPGsWxGmV/pZRuklNrW+YF1Cvve2BasxWJ4giQES5y8GbiZay65O1UL0CtONp8ee/pyXQ3pliLBwaFNRvU2Kk/7d41cGsnhOTLxHxxiAzlwwyEv4hGY77kRA57NMwxiIjHsl394zgBVNkJ8vvUI7uHVED034uRMf8mp0xdqZxPfHadpbg9b9gaMAr02AiBNdaHRgOjZIcK9creUbqSOTbltHHcS1loSElWNU/ljCZNpxL5oLm4hG5wSvbU/gaPntXJ2dkjtQiZUj3RKUeeCGMqZXPvr3WHp3oiTiUbSJ8N4Z3NsE/QdMVsPC+w2mnKfVH3mvrgMW7y28yRZgFpn9qWQVUduWCnBF9KFLml+HaCwWsUOJiuxOAzWaDgoYGDIFIe6OH6b6Ol8yAKkwi3gBtxQOXWHThPqujHixGnxtfu0M1dvNM0UvrfjQoIJFFStnEIYy0LBkG x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR11MB1594.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(346002)(39860400002)(376002)(136003)(366004)(186003)(83380400001)(66446008)(38100700002)(316002)(26005)(71200400001)(66946007)(122000001)(66556008)(53546011)(64756008)(6506007)(86362001)(66476007)(966005)(478600001)(7696005)(55016002)(9686003)(54906003)(76116006)(8676002)(4326008)(2906002)(33656002)(8936002)(52536014)(5660300002)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?M56RkSLU3e1fWYcboCKD/8DF+JIrfo04Q7pj/IzMwr87+k10XZfIQ8lE2HrS?= =?us-ascii?Q?PPvtCi52vPAXnu6XcbUIK4Dzaxueo7F/v0rIigaenUW20DLHpY6o/PYFjSUg?= =?us-ascii?Q?lI/5Un+w6fK6BknVpQZRQiU3pCPHjZdFm5eovSRxjeH16QtxnxMrV2VwoIxw?= =?us-ascii?Q?yfZfnHe+Wb0hQt7zG/eN0G05xTZcbZNcWq3P4issTSOAMdO82X8ei8MaTgHS?= =?us-ascii?Q?j3ketQadd1yuLCF1FOjUT8eUGDRZwPcPc5CwwaZD4aqD66NNnc3K1bS8btpb?= =?us-ascii?Q?fe+tWZ43dESxQO7hyyCjQkDG95PzVE6hPyUw0MJdJBG4jjl8qgDycTLkYCPh?= =?us-ascii?Q?988JDN8ghmPixC1XXJq572ihG3Dx0LXje3AZQwflwIVHdLHIORVecFUMCnNQ?= =?us-ascii?Q?DNdhf8YEBvc6CpElt4+4HG8aZaVv9LXBbVXN4ojdqQ4QNy6n5diHUelD8KgG?= =?us-ascii?Q?Ow6UhQiEEJx1P6ATny01hcOirc9I/t6tZZikWIZW+AlV7wBVnXtPv+zlGejw?= =?us-ascii?Q?vYakrzYNJNswUPnpTrLx0RlZvHANgmjjEb+qDAVeViMhPS6my/lP9Alzduxk?= =?us-ascii?Q?/v43M/f83qq2sABuMDvaU1jfOmLQeowMXPJwDj5nIlOUrpi7RTFxMefNKVzk?= =?us-ascii?Q?Hi0aH22Kp6GGO6eEe7V96dqgk6uORwXngSukk77pn3DZsfTP+9rAPSFCkuC7?= =?us-ascii?Q?n0HDWlVU/BhRPQhpXVnr/yyuAqEWuyjuRwYvbyN2MplMYlP1v5d9ebrdmyBK?= =?us-ascii?Q?Qr5z9XIygFKex/rtrogGCZSjk0B9poBgW9GuzwFjPs57IC6wKCxme1KLS2z5?= =?us-ascii?Q?n5y2styyh9D1WOD3QYpyKURYa3YiKqvOpcXGloklJ3JIXpwCE+3wLenMADFq?= =?us-ascii?Q?f5zaYcFK2hy/3tmPJ/azvl4vDfX8pPDFVol96t97eP4slI1qPVa6a9ZloAlG?= =?us-ascii?Q?MZAIWdS3C+S0XDJnMdZktXrMyFH155NMYHHOv1LIgkurpitV97xE2k0q5r7C?= =?us-ascii?Q?ZTC+X0ShemGvBj2T+PG4QY4+rC9e8KoHYO3MvUhxkffTsRY+XKR/wrFEsGDd?= =?us-ascii?Q?pSgrj8MXOA8vm+MA5DdbRZMMj8gsqbRVnTx7izRl9pJw+lyuMvES3Me/zWHB?= =?us-ascii?Q?6d7ldh4cRdcsLYpvqE3OSG1sPOcrIWT4jKdXkqo0sLZ0tWMk+3MA+Pd1WutQ?= =?us-ascii?Q?Qf1JAcxkASyWEgbSmJO6u/XYToTJoSBHiE5wT6sv8oCy9F1dglI4uPBBif8g?= =?us-ascii?Q?vx/lFzV2S18hUeccMzBnz4zELH59kNg8BSvsps5svgpyLLt/1TYpLhqVxBsY?= =?us-ascii?Q?V0VLAISx4TgkAW12HYMiuWkx?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1594.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8010adef-c5c9-4384-eae6-08d9085cb5f0 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2021 02:40:53.1344 (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: EA7eTCPwJvEupVG7SwfmPiAN9XdBsIql0b+IOGkH6Ov5CyGVyWISbExUenq+AOlGDTIZl8Dv+VAnoq8YSpy+3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1836 Return-Path: yuwei.chen@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yuwei Chen > -----Original Message----- > From: Kinney, Michael D > Sent: Monday, April 26, 2021 8:50 AM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Liming Gao > ; Chen, Christine > Subject: [Patch 1/1] BaseTools/GenMake: Sort generated makefile tool > definitions >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3353 >=20 > Sort the tool definition content of generated makefiles to help verify th= at > makefile contents have not changed after BaseTools code changes. >=20 > 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(-) >=20 > 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-Lice= nse- > 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