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.web10.4997.1612837916402096326 for ; Mon, 08 Feb 2021 18:31:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=VOgdzG7m; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: yuwei.chen@intel.com) IronPort-SDR: bzIgeXB/m6dNfJ1e9D7EIaET4UzEyeu0cV3J5TQzobu4xvx8cnmkuhJGnqHUj4iDAhDnyBe3Ra L4l+a21ixwGg== X-IronPort-AV: E=McAfee;i="6000,8403,9889"; a="179258168" X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="179258168" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2021 18:31:55 -0800 IronPort-SDR: xarV7ssZoc1KOjY/x7SxCN1qiZ7G6FcgCH7P+DZA1aTHqGT5ZqrD8BH8+IdHIU+TZfk6uRkAdL n1lEIPFwWGJw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,163,1610438400"; d="scan'208";a="487687093" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by fmsmga001.fm.intel.com with ESMTP; 08 Feb 2021 18:31:54 -0800 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 8 Feb 2021 18:31:53 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx603.amr.corp.intel.com (10.18.126.83) 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, 8 Feb 2021 18:31:53 -0800 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.48) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Mon, 8 Feb 2021 18:31:53 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LA4Ph3pLvu7WvfY6mtUOoMYjeqGwQQbNTyPGwPG5+Mih+3BAJOV411ut3CJc2HRs2bSeWpOsqoV8It3LWkXgXZBnZ6MABLlfz7KeEcPkiosD6YADRbYkbHXbvgD4chv0urzAUZxfaS7IYF5ftZr10PrHTV4L+7bxpzAgixB0Ek2+Zvar2AL6VcSDsWti6GJkz1u4rNfX2ko0uJ+goXW3wJX+IyTUNyxnsONId3CjOMZaNY+1+g7zAB5y19d6+aFi8uY9CYMIizIom5bWgPZPl119lWagDGs0TMU2ICg/CmMcdq2wXh03LTaer2szqL68WXUXywNx8+WG0H8ILOjgmQ== 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=yCRFaL+HM4FUKI8QRAZg0++rTSWwOUvgfjAyWZ+sQJU=; b=fELsTJ6tmlIQFTNn9ntzgcJrGdCMRgP1niPK3HmkWJZxy1F0XrRYePDisYhtrKD9T0FqDzv0sPOvSyA4UbUlCKgLYFosVkXW8WHmdFM6YcbOO8Wp6+1+4Phv2oQSZoUYinIuKfjGs+skfUWqLzllftMVyE2Nol55OvQaxi4owxifmCoV8jnLo6budCvH7YIKiSmQQT+z9W9JbdUNX1urXMc77Xp8cSpiypJj/Ej/6AoPBWq67S5SuarCKdWosYJ/s3AD8xl/FiKgKGdK12Szw0j8AY4Yw0yTbVe1FoJ/5tVAMXL+MqWHowRJv3yxaU4IfoaExzxZ2yGd7un04ak4lA== 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=yCRFaL+HM4FUKI8QRAZg0++rTSWwOUvgfjAyWZ+sQJU=; b=VOgdzG7mh72u3Nf+DQPmlQsn2WL27nrn98Gme18RWqwhkNxvVeKmunwTzfWggI42HcIEufZh8tjwi7xIpeQ7PD9ov1EEGchx/WPtESeE0/RwHIG14unLqTfZfSCJVAPPCtL/WznnFYobRMOJ2NoBdvSXD6KczFSnIbvwktC9Xzk= Received: from DM5PR11MB1594.namprd11.prod.outlook.com (2603:10b6:4:5::16) by DM6PR11MB4738.namprd11.prod.outlook.com (2603:10b6:5:2a3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.28; Tue, 9 Feb 2021 02:31:51 +0000 Received: from DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::3d4e:e51a:c6ff:dcc6]) by DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::3d4e:e51a:c6ff:dcc6%2]) with mapi id 15.20.3825.030; Tue, 9 Feb 2021 02:31:51 +0000 From: "Yuwei Chen" To: "matthewfcarlson@gmail.com" , "devel@edk2.groups.io" CC: "Feng, Bob C" , Liming Gao Subject: Re: [PATCH v5 1/1] BaseTools: Use pip module if available, CI uses it by default Thread-Topic: [PATCH v5 1/1] BaseTools: Use pip module if available, CI uses it by default Thread-Index: AQHW/n2tBxpgAla6qE6z05LgxlzNs6pPGmZQ Date: Tue, 9 Feb 2021 02:31:51 +0000 Message-ID: References: <20210209005033.596-1-matthewfcarlson@gmail.com> <20210209005033.596-2-matthewfcarlson@gmail.com> In-Reply-To: <20210209005033.596-2-matthewfcarlson@gmail.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: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.214] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 33f40de8-ac2b-460f-2ae4-08d8cca2dbb8 x-ms-traffictypediagnostic: DM6PR11MB4738: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:785; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 4t+0kmH4SxzhlRpLbgwpO7bYpXbpnuYjM34Yqga5WBlezj1pY6W/rsyZcQXIdAg6uUnUNz1xp5IIOAGLetLfYY6Ze49PGjj1kWo7+btM04ZiRy3+0aO9ixW06EztCsbvBB8dAfzR1NAMC8eH1c8T6HPC/JqptOgD6jxO7hQSTcOHZbH0TfqtCSSu73GN1jFgXQpvCRwSUfKmcpVcbCjP3C6ZuBzzliAnF1BvmWK9r/L0rH3UBcOSlMmTqIl4b1b3WV90C53DYjz9/ru++XG6TXYSmKSc9zeOdpVpGFyigrdnvtGYMnivkGZFuMqmMYp2PQEjd79b804UsoGagwNHrVH3DLLD2NVVmCqGzlaPGoSZJ8m0eCy6bKjwk1PDwoJqglHJdV90Mfdatmsv/Pbxl4lnY/t09ZEacSI8p/OTv+7CNXzIJq5cE2zhu/kSSQfBG8YO0zTCNMLDQR1bqp4KQqAaN8Wk2TIfqB212Vta62v9F+Sw2eZV50TXZjfnd22Z9bagztgKGT7gs99GJ5Jx55JLMxBYpYSmqEkGvJipBdSplJOjblcppimV3CkgTaCc7L6L6V4XXgR++mZ5lxLSU/4Pre4wcW8WV1Cv6ROLPKpQdKESU4sV8lX7J7tfjHiCAjNhVo/kE+U7glMUJ6f6Og== 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:(366004)(396003)(346002)(136003)(39860400002)(376002)(6506007)(7696005)(66946007)(30864003)(26005)(9686003)(55016002)(2906002)(8676002)(186003)(71200400001)(110136005)(8936002)(33656002)(966005)(86362001)(52536014)(4326008)(66446008)(64756008)(66476007)(66556008)(316002)(45080400002)(76116006)(53546011)(5660300002)(83380400001)(19627235002)(478600001)(54906003)(559001)(579004)(134885004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?LtVGrkZrantCCFmR2e8Skrvbq5T6yaK2WQhhb42nWliKyazF7zpCra9uHaTw?= =?us-ascii?Q?XcHLpI2BCWO6MC7m0z98pcQdWDysGWp9GAXZsby9KqFZwMWp2m++3iW9i1MK?= =?us-ascii?Q?f8B1qAy22Yv39lSTlRpjmStUvyXabOoazfRnGEvM0Wn9wxfOVFBKQ7aWZvpO?= =?us-ascii?Q?JS464bOcPIHZwi1q4efTfXaYIq7kRPPUww+XOUnxhGewVY6vViRFiIWWMvqt?= =?us-ascii?Q?Q9BFMI9zRQnQv8WZTe8CbGx8meL3lbk3rTsrXaf5Wqsi1C6Pm0QmOonpWCYD?= =?us-ascii?Q?OaBg3qRKV07mubkUuQZHGgy9ZpCNEPnnVR8AEbbuRr3cZa3rQBtn2JouCR5Z?= =?us-ascii?Q?yVVVV6L27P7ucIzAgR4CBBgAg5XVXlbHbKQf5TC6GuT+grwLYV+CO+361grc?= =?us-ascii?Q?w5XBIjYaoEiMnlijKIn9nJ6Cf5VDTjPPRF2qbiRziWILZ2AbOvcJpzLUI/0r?= =?us-ascii?Q?TLbrQZN5JBMGj6GdHxgqQHy4Wg2CzfxkSctA/myPWzwtJbZ9bsQgHoQAYq3C?= =?us-ascii?Q?DY6a7CA/YkH4ZGxJncJuUlSd243Hn1bE4bG9Ttbeu0EEMDoZwY1fWzIg6YYF?= =?us-ascii?Q?KkBj4s4HCwZG7FN171tHQTmpSn4QQPpVRk2VfX3byn7gcoh07doqo7WuEwu0?= =?us-ascii?Q?StDQi7YTAkw13zyx/WroYDzLw0p6mxjDObCh84kekvJu5zFnL6xkSDxIpd7K?= =?us-ascii?Q?Ph83xqBo6yMilsMrF1qKMerEDpbIyFNCTgBvdiLUV0yO8QYFpk8Tq5DuVYu7?= =?us-ascii?Q?twO8DZtd3VTkd6UcRG5H1U2Eg30RyTlzUd6E4CCheZbKO7cgVFfLwRY6UN5i?= =?us-ascii?Q?Rl/XzR/MEKzuZXY9lYcXtp2A8+/42p1kc6zcE0HZGrYfVOs71Klky9Q2mFhf?= =?us-ascii?Q?el4T7q2QNgqz1CeHK0M8DDCqr/7lcWJZbZSq9ym/wjUPnS2PQVMtwIZSDCb8?= =?us-ascii?Q?1lqnN1e86Q0HHLDdPQSH3EmAaRddBHIgL1NVQADlGMdBc2ok/H/ykMvIMXHv?= =?us-ascii?Q?l2HfkGRpl9DG4jrIWVGTGgqikwYz9oRdAGewJTAFdRsyxJmerDJaQLAhuhuL?= =?us-ascii?Q?mvi82mznN7VDgC9/sQuNsvfqBgyFqMyldMX4XCUIHXQy2Ws8uOENZyIpJvSj?= =?us-ascii?Q?bJNF6tMl87mGcrzALxpuTREGC+6op4AI4mpgwB9gkPYDkWpF7iYmP3I4xcja?= =?us-ascii?Q?XIWhR1BhMF9xDJJ6dUnGQdme0JnxyEGVMzfbDx3aR7zE2A7xOkNOAFyEttHR?= =?us-ascii?Q?w48APfzo8BqEXbuz61XJ1zCuotmBvSgna6jRM0N0FCGayBE9MmEmJLRR8c4l?= =?us-ascii?Q?S690Jbl1xOaYEcURFXgQIlHw?= 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: 33f40de8-ac2b-460f-2ae4-08d8cca2dbb8 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Feb 2021 02:31:51.4504 (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: ABDlA2438piX3lyQOSx63MsHwEgP2ZRUrvKgBsMTCuUJdnzLGqMQQugcz3ulKRG6Y+W6dWzBRTw3YN0N5svlpw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4738 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: matthewfcarlson@gmail.com > Sent: Tuesday, February 9, 2021 8:51 AM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Liming Gao > ; Chen, Christine ; > Matthew Carlson > Subject: [PATCH v5 1/1] BaseTools: Use pip module if available, CI uses i= t by > default >=20 > From: Matthew Carlson >=20 > Use the new edk2-basetools pip module. > Includes a helpful message in setup to let users know which has been > selected. >=20 > Cc: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen >=20 > Reviewed-by: Bob Feng >=20 > Signed-off-by: Matthew Carlson > --- > .pytool/CISettings.py = | 51 > +++++++++++++++----- > BaseTools/BinPipWrappers/PosixLike/AmlToC = | 14 > ++++++ > BaseTools/BinPipWrappers/PosixLike/BPDG = | 12 > +++++ > BaseTools/BinPipWrappers/PosixLike/BrotliCompress = | > 34 +++++++++++++ > BaseTools/BinPipWrappers/PosixLike/DevicePath = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/Ecc = | 13 > +++++ > BaseTools/BinPipWrappers/PosixLike/EfiRom = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/GenCrc32 = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/GenDepex = | 12 > +++++ > BaseTools/BinPipWrappers/PosixLike/GenFds = | 12 > +++++ > BaseTools/BinPipWrappers/PosixLike/GenFfs = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/GenFv = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/GenFw = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable = | > 12 +++++ > BaseTools/BinPipWrappers/PosixLike/GenSec = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/GenerateCapsule = | > 12 +++++ > BaseTools/BinPipWrappers/PosixLike/LzmaCompress = | > 29 +++++++++++ > BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress = | > 19 ++++++++ > BaseTools/BinPipWrappers/PosixLike/PatchPcdValue = | 12 > +++++ > BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign = | 12 > +++++ > BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys > | 12 +++++ > BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign = | > 12 +++++ > BaseTools/BinPipWrappers/PosixLike/Split = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/TargetTool = | 12 > +++++ > BaseTools/BinPipWrappers/PosixLike/TianoCompress = | > 29 +++++++++++ > BaseTools/BinPipWrappers/PosixLike/Trim = | 13 > +++++ > BaseTools/BinPipWrappers/PosixLike/UPT = | 12 > +++++ > BaseTools/BinPipWrappers/PosixLike/VfrCompile = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/VolInfo = | 29 > +++++++++++ > BaseTools/BinPipWrappers/PosixLike/build = | 12 > +++++ > BaseTools/{BinWrappers =3D> > BinPipWrappers}/PosixLike/posix_path_env.yaml | 21 ++++---- > BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat = | > 3 ++ > BaseTools/BinPipWrappers/WindowsLike/BPDG.bat = | > 3 ++ > BaseTools/BinPipWrappers/WindowsLike/Ecc.bat = | 3 > ++ > BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat > | 3 ++ > BaseTools/BinPipWrappers/WindowsLike/GenFds.bat = | > 3 ++ > BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat > | 3 ++ > BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat > | 1 + > BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat > | 3 ++ > BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat = | > 3 ++ > BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.bat > | 1 + > BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat > | 3 ++ > BaseTools/BinPipWrappers/WindowsLike/Split.bat = | 3 > ++ > BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat = | > 3 ++ > BaseTools/BinPipWrappers/WindowsLike/Trim.bat = | 3 > ++ > BaseTools/BinPipWrappers/WindowsLike/UPT.bat = | 3 > ++ > BaseTools/BinPipWrappers/WindowsLike/build.bat = | 3 > ++ > BaseTools/{BinWrappers =3D> > BinPipWrappers}/WindowsLike/win_build_tools_path_env.yaml | 3 +- > BaseTools/BinWrappers/PosixLike/posix_path_env.yaml = | > 1 + > BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml > | 1 + > BaseTools/BuildEnv = | 14 +++++- > BaseTools/Scripts/PatchCheck.py = | 1 + > BaseTools/Source/Python/README.md = | 29 > +++++++++++ > BaseTools/toolsetup.bat = | 19 ++++++++ > pip-requirements.txt = | 1 + > 55 files changed, 745 insertions(+), 25 deletions(-) >=20 > diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index > e6c5ac700ab2..5f71eca1992e 100644 > --- a/.pytool/CISettings.py > +++ b/.pytool/CISettings.py > @@ -22,16 +22,24 @@ class Settings(CiBuildSettingsManager, > UpdateSettingsManager, SetupSettingsManag > self.ActualTargets =3D [] self.ActualArchitectures =3D [= ] > self.ActualToolChainTag =3D ""+ self.UseBuiltInBaseTools =3D None+ > self.ActualScopes =3D None # > ################################################################ > ####################### # # Extra CmdLine > configuration # # > ################################################################ > ####################### # def AddCommandLineOptions(self, > parserObj):- pass+ group =3D > parserObj.add_mutually_exclusive_group()+ group.add_argument("- > force_piptools", "--fpt", dest=3D"force_piptools", action=3D"store_true", > default=3DFalse, help=3D"Force the system to use pip tools")+ > group.add_argument("-no_piptools", "--npt", dest=3D"no_piptools", > action=3D"store_true", default=3DFalse, help=3D"Force the system to not u= se pip > tools") def RetrieveCommandLineOptions(self, args):- pass+ > super().RetrieveCommandLineOptions(args)+ if args.force_piptools:+ > self.UseBuiltInBaseTools =3D True+ if args.no_piptools:+ > self.UseBuiltInBaseTools =3D False # > ################################################################ > ####################### # # Default Support fo= r this Ci > Build #@@ -128,19 +136,38 @@ class > Settings(CiBuildSettingsManager, UpdateSettingsManager, > SetupSettingsManag > def GetActiveScopes(self): ''' return tuple containing scop= es that > should be active for this process '''- scopes =3D ("cibuild", "edk= 2-build", > "host-based-test")+ if self.ActualScopes is None:+ scop= es =3D > ("cibuild", "edk2-build", "host-based-test") - self.ActualToolChai= nTag =3D > shell_environment.GetBuildVars().GetValue("TOOL_CHAIN_TAG", "")+ > self.ActualToolChainTag =3D > shell_environment.GetBuildVars().GetValue("TOOL_CHAIN_TAG", "") - = if > GetHostInfo().os.upper() =3D=3D "LINUX" and > self.ActualToolChainTag.upper().startswith("GCC"):- if "AARCH6= 4" in > self.ActualArchitectures:- scopes +=3D ("gcc_aarch64_linux= ",)- if > "ARM" in self.ActualArchitectures:- scopes +=3D ("gcc_arm_= linux",)- > if "RISCV64" in self.ActualArchitectures:- scopes +=3D > ("gcc_riscv64_unknown",)+ is_linux =3D GetHostInfo().os.upper(= ) =3D=3D > "LINUX" - return scopes+ if self.UseBuiltInBaseTools is= None:+ > is_linux =3D GetHostInfo().os.upper() =3D=3D "LINUX"+ # tr= y and import the > pip module for basetools+ try:+ import = edk2basetools+ > self.UseBuiltInBaseTools =3D True+ except ImportError:+ > self.UseBuiltInBaseTools =3D False+ pass++ = if > self.UseBuiltInBaseTools =3D=3D True:+ scopes +=3D ('pipbu= ild-unix',) if > is_linux else ('pipbuild-win',)+ logging.warning("Using Pi= p Tools > based BaseTools")+ else:+ logging.warning("Fall= ing back to > using in-tree BaseTools")++ if is_linux and > self.ActualToolChainTag.upper().startswith("GCC"):+ if "AA= RCH64" in > self.ActualArchitectures:+ scopes +=3D ("gcc_aarch64_l= inux",)+ > if "ARM" in self.ActualArchitectures:+ scopes +=3D > ("gcc_arm_linux",)+ if "RISCV64" in self.ActualArchitectur= es:+ > scopes +=3D ("gcc_riscv64_unknown",)+ self.ActualScopes =3D sc= opes+ > return self.ActualScopes def GetRequiredSubmodules(self): ''= ' return > iterable containing RequiredSubmodule objects.diff --git > a/BaseTools/BinPipWrappers/PosixLike/AmlToC > b/BaseTools/BinPipWrappers/PosixLike/AmlToC > new file mode 100755 > index 000000000000..1dd28e966288 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/AmlToC > @@ -0,0 +1,14 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") exe=3D$(basename > +"$full_cmd") > + > +export > PYTHONPATH=3D"$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" > "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/BPDG > b/BaseTools/BinPipWrappers/PosixLike/BPDG > new file mode 100755 > index 000000000000..a08cbd8de5c5 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/BPDG > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.EccMain "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/BrotliCompress > b/BaseTools/BinPipWrappers/PosixLike/BrotliCompress > new file mode 100755 > index 000000000000..663860bb3e57 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/BrotliCompress > @@ -0,0 +1,34 @@ > +#!/usr/bin/env bash > +# > +# This script will exec Brotli tool with -e/-d options. > +# > +# Copyright (c) 2017 - 2018, Intel Corporation. All rights > +reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # QLT=3D"-q > +9 -w 22" > +ARGS=3D > + > +while test $# -gt 0 > +do > + case $1 in > + -e) > + ;; > + -d) > + ARGS+=3D"$1 " > + ;; > + -o|-g) > + ARGS+=3D"$1 $2 " > + shift > + ;; > + -q) > + QLT=3D"$1 $2 " > + shift > + ;; > + *) > + ARGS+=3D"$1 " > + ;; > + esac > + shift > +done > + > +exec Brotli $QLT $ARGS > diff --git a/BaseTools/BinPipWrappers/PosixLike/DevicePath > b/BaseTools/BinPipWrappers/PosixLike/DevicePath > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/DevicePath > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/Ecc > b/BaseTools/BinPipWrappers/PosixLike/Ecc > new file mode 100755 > index 000000000000..598728915095 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/Ecc > @@ -0,0 +1,13 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +export > PYTHONPATH=3D"$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}" > +exec "${python_exe:-python}" -m $cmd.EccMain "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/EfiRom > b/BaseTools/BinPipWrappers/PosixLike/EfiRom > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/EfiRom > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenCrc32 > b/BaseTools/BinPipWrappers/PosixLike/GenCrc32 > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenCrc32 > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenDepex > b/BaseTools/BinPipWrappers/PosixLike/GenDepex > new file mode 100755 > index 000000000000..df75e43f9ec1 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenDepex > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.AutoGen.$cmd "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFds > b/BaseTools/BinPipWrappers/PosixLike/GenFds > new file mode 100755 > index 000000000000..b27e84eaa210 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenFds > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFfs > b/BaseTools/BinPipWrappers/PosixLike/GenFfs > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenFfs > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFv > b/BaseTools/BinPipWrappers/PosixLike/GenFv > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenFv > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFw > b/BaseTools/BinPipWrappers/PosixLike/GenFw > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenFw > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable > b/BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable > new file mode 100755 > index 000000000000..9d143c7fc6c2 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenSec > b/BaseTools/BinPipWrappers/PosixLike/GenSec > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenSec > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/GenerateCapsule > b/BaseTools/BinPipWrappers/PosixLike/GenerateCapsule > new file mode 100755 > index 000000000000..366a268802c4 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/GenerateCapsule > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.Capsule.$cmd "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/LzmaCompress > b/BaseTools/BinPipWrappers/PosixLike/LzmaCompress > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/LzmaCompress > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress > b/BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress > new file mode 100755 > index 000000000000..b55352ae4c79 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress > @@ -0,0 +1,19 @@ > +#!/usr/bin/env bash > +# > +# This script will exec LzmaCompress tool with --f86 option that enables > converter for x86 code. > +# > +# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# > +Copyright (c) 2012, Intel Corporation. All rights reserved.
# > +SPDX-License-Identifier: BSD-2-Clause-Patent # > + > +for arg; do > + case $arg in > + -e|-d) > + set -- "$@" --f86 > + break > + ;; > + esac > +done > + > +exec LzmaCompress "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/PatchPcdValue > b/BaseTools/BinPipWrappers/PosixLike/PatchPcdValue > new file mode 100755 > index 000000000000..9d143c7fc6c2 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/PatchPcdValue > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign > b/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign > new file mode 100755 > index 000000000000..9d143c7fc6c2 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@" > diff --git > a/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys > b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys > new file mode 100755 > index 000000000000..aca2f3a6fe2a > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.Rsa2048Sha256Sign.$cmd > "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign > b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign > new file mode 100755 > index 000000000000..068364070518 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@" > \ No newline at end of file > diff --git a/BaseTools/BinPipWrappers/PosixLike/Split > b/BaseTools/BinPipWrappers/PosixLike/Split > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/Split > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/TargetTool > b/BaseTools/BinPipWrappers/PosixLike/TargetTool > new file mode 100755 > index 000000000000..9d143c7fc6c2 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/TargetTool > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@" > diff --git a/BaseTools/BinPipWrappers/PosixLike/TianoCompress > b/BaseTools/BinPipWrappers/PosixLike/TianoCompress > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/TianoCompress > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/Trim > b/BaseTools/BinPipWrappers/PosixLike/Trim > new file mode 100755 > index 000000000000..0bd14ee03872 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/Trim > @@ -0,0 +1,13 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D$(basename "$full_cmd") > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@" > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/UPT > b/BaseTools/BinPipWrappers/PosixLike/UPT > new file mode 100755 > index 000000000000..068364070518 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/UPT > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@" > \ No newline at end of file > diff --git a/BaseTools/BinPipWrappers/PosixLike/VfrCompile > b/BaseTools/BinPipWrappers/PosixLike/VfrCompile > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/VfrCompile > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/VolInfo > b/BaseTools/BinPipWrappers/PosixLike/VolInfo > new file mode 100755 > index 000000000000..0945d86d9209 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/VolInfo > @@ -0,0 +1,29 @@ > +#!/usr/bin/env bash > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here dir=3D$(dirname "$full_cmd") cmd=3D${full_cmd##*/= } > + > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] > +then > + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then > + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] > + then > + echo "BaseTools C Tool binary was not found ($cmd)" > + echo "You may need to run:" > + echo " make -C $EDK_TOOLS_PATH/Source/C" > + else > + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" > + fi > +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then > + exec "$dir/../../Source/C/bin/$cmd" "$@" > +else > + echo "Unable to find the real '$cmd' to run" > + echo "This message was printed by" > + echo " $0" > + exit 127 > +fi > + > diff --git a/BaseTools/BinPipWrappers/PosixLike/build > b/BaseTools/BinPipWrappers/PosixLike/build > new file mode 100755 > index 000000000000..9d143c7fc6c2 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/PosixLike/build > @@ -0,0 +1,12 @@ > +#!/usr/bin/env bash > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a ${PYTHON_COMMAND} command is available, use it in preference to > +python if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then > + python_exe=3D${PYTHON_COMMAND} > +fi > + > +full_cmd=3D${BASH_SOURCE:-$0} # see > +http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is > +not a good choice here cmd=3D${full_cmd##*/} > + > +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml > b/BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml > similarity index 74% > copy from BaseTools/BinWrappers/PosixLike/posix_path_env.yaml > copy to BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml > index 8b32e010bb1d..830670305c0c 100644 > --- a/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml > +++ b/BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml > @@ -1,10 +1,11 @@ > -## @file-# Set this folder on the path for all linux builds-#-# Copyrigh= t (c) > Microsoft Corporation.-# SPDX-License-Identifier: BSD-2-Clause-Patent-##-= {- > "scope": "global-nix",- "flags": ["set_path"]-}+## @file > +# Set this folder on the path for all linux builds # # Copyright (c) > +Microsoft Corporation. > +# SPDX-License-Identifier: BSD-2-Clause-Patent ## { > + "scope": "pipbuild-unix", > + "override_id": "binwrappers", > + "flags": ["set_path"] > +} > diff --git a/BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat > b/BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat > +b/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat > +b/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat > new file mode 100644 > index 000000000000..16a0a799a43b > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.EccMain %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat > +b/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat > new file mode 100644 > index 000000000000..481b5ac47d24 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.AutoGen.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat > +b/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat > +b/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat > +b/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat > new file mode 100644 > index 000000000000..34c43ac7fc99 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat > @@ -0,0 +1 @@ > +@%PYTHON_COMMAND% -m > edk2basetools.Capsule.GenerateCapsule %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat > +b/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat > +b/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.b > at > +b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys. > bat > new file mode 100644 > index 000000000000..cdc2e3ea373d > --- /dev/null > +++ > b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.b > at > @@ -0,0 +1 @@ > +@%PYTHON_COMMAND% -m > +edk2basetools.Rsa2048Sha256Sign.Rsa2048Sha256GenerateKeys %*diff -- > git > +a/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat > +b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/Split.bat > +b/BaseTools/BinPipWrappers/WindowsLike/Split.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/Split.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat > +b/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/Trim.bat > +b/BaseTools/BinPipWrappers/WindowsLike/Trim.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/Trim.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/UPT.bat > +b/BaseTools/BinPipWrappers/WindowsLike/UPT.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/UPT.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinPipWrappers/WindowsLike/build.bat > +b/BaseTools/BinPipWrappers/WindowsLike/build.bat > new file mode 100644 > index 000000000000..d347d6484467 > --- /dev/null > +++ b/BaseTools/BinPipWrappers/WindowsLike/build.bat > @@ -0,0 +1,3 @@ > +@setlocal+@set ToolName=3D%~n0%+@%PYTHON_COMMAND% -m > +edk2basetools.%ToolName%.%ToolName% %*diff --git > +a/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml > +b/BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.ya > ml > similarity index 70% > copy from > BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml > copy to > BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.yaml > index 83f5856e75c6..9fdbe1bcb06b 100644 > --- a/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml > +++ > b/BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.yaml > @@ -5,6 +5,7 @@ > # SPDX-License-Identifier: BSD-2-Clause-Patent ## {- "scope": "global-w= in",+ > "scope": "pipbuild-win",+ "override_id": "binwrappers", "flags": > ["set_path"] }diff --git > a/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml > b/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml > index 8b32e010bb1d..99529235ec9a 100644 > --- a/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml > +++ b/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml > @@ -5,6 +5,7 @@ > # SPDX-License-Identifier: BSD-2-Clause-Patent ## {+ "id": "binwrappers= ", > "scope": "global-nix", "flags": ["set_path"] }diff --git > a/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml > b/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml > index 83f5856e75c6..43da76f354e5 100644 > --- a/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml > +++ > b/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml > @@ -5,6 +5,7 @@ > # SPDX-License-Identifier: BSD-2-Clause-Patent ## {+ "id": "binwrappers= ", > "scope": "global-win", "flags": ["set_path"] }diff --git a/BaseTools/Bu= ildEnv > b/BaseTools/BuildEnv > index 5943bb9ef908..275f4c5901aa 100755 > --- a/BaseTools/BuildEnv > +++ b/BaseTools/BuildEnv > @@ -46,7 +46,7 @@ RestorePreviousConfiguration() { > done > fi > fi > - > + > PREVIOUS_CONF_FILE=3D$CONF_PATH/BuildEnv.sh > if [ -e $PREVIOUS_CONF_FILE ] > then > @@ -198,7 +198,17 @@ AddEdkToolsToPath() { >=20 > EDK_TOOLS_PATH_BIN=3D`GetEdkToolsPathBinDirectory` >=20 > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > + # check if the edk2basetools pip package is available if > + $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > + # if it is, use the pip version of the wrappers > + echo "Using Pip Basetools" > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > + else > + echo "Using EDK2 in-source Basetools" > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > + fi > + > + > AddDirToStartOfPath $EDK_TOOLS_PATH_BIN >=20 > } > diff --git a/BaseTools/Scripts/PatchCheck.py > b/BaseTools/Scripts/PatchCheck.py index 68c984ed0e4d..80754e763c5a > 100755 > --- a/BaseTools/Scripts/PatchCheck.py > +++ b/BaseTools/Scripts/PatchCheck.py > @@ -359,6 +359,7 @@ class GitDiffCheck: > self.force_notabs =3D True if self.filen= ame.endswith('.sh') or > \ self.filename.startswith('BaseTools/BinWrappers/Pos= ixLike/') or > \+ self.filename.startswith('BaseTools/BinPipWrappers/= PosixLike/') > or \ self.filename.startswith('BaseTools/Bin/CYGWIN_N= T-5.1- > i686/') or \ self.filename =3D=3D 'BaseTools/BuildEnv= ': #diff > --git a/BaseTools/Source/Python/README.md > b/BaseTools/Source/Python/README.md > new file mode 100644 > index 000000000000..56f5b0ff027b > --- /dev/null > +++ b/BaseTools/Source/Python/README.md > @@ -0,0 +1,29 @@ > +# Edk2 Basetools++This folder has traditionally held the source of > +Python based tools used by EDK2. +The official repo this source has > +moved to https://github.com/tianocore/edk2-basetools.+This folder will > +remain in the tree until the next stable release (expected > +202102).+There is a new folder under Basetools `BinPipWrappers` that > +uses the pip module rather than this tree for Basetools.+By adding the > +scope `pipbuild-win` or `pipbuild-unix` (depending on your host > +system), the SDE will use the +`BinPipWrappers` instead of the regular > +`BinWrappers`.++## Why Move It?++The discussion is on the mailing list. > +The RFC is here: https://edk2.groups.io/g/rfc/topic/74009714#270+The > +benefits allow for the Basetools project to be used separately from > +EDK2 itself as well as offering it in a+globally accessible manner. > ++This makes it much easier to build a module using Basetools. > ++Separating the Basetools into their own repo allows for easier CI and > +contribution process.+Additional pros, cons, and process can be found > +on the mailing list.++## How Do I Install It?++By default, EDK2 is tied > +to and tested with a specific version of the Basetools through > +`pip-requirements.txt`.+You can simply run:++```bash+pip install -r > +pip-requirements.txt+```++This will install the required module, > +thought we strongly suggest setting up a virtual > +environment.+Additionally, you can also install a local clone of the > +Basetools as well as a specific git commit.diff --git > +a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat > index 61ebf4ae09bc..4b5256ab6e93 100755 > --- a/BaseTools/toolsetup.bat > +++ b/BaseTools/toolsetup.bat > @@ -393,12 +393,31 @@ goto end > goto check_freezer_path ) ++ :check_freezer_path > endlocal++ %PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL+ > if %ERRORLEVEL% EQU 0 (+ goto use_pip_basetools+ ) else (+ goto > use_builtin_basetools+ )++:use_builtin_basetools+ @echo Using EDK2 in- > source Basetools if defined BASETOOLS_PYTHON_SOURCE goto > print_python_info set > "PATH=3D%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%" set > BASETOOLS_PYTHON_SOURCE=3D%BASE_TOOLS_PATH%\Source\Python set > PYTHONPATH=3D%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%+ goto > print_python_info++:use_pip_basetools+ @echo Using Pip Basetools+ set > "PATH=3D%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%"+ > set BASETOOLS_PYTHON_SOURCE=3Dedk2basetools+ goto > print_python_info :print_python_info echo PATH =3D %PAT= H%diff -- > git a/pip-requirements.txt b/pip-requirements.txt > index 0fecd37f2a83..aea2e6ece431 100644 > --- a/pip-requirements.txt > +++ b/pip-requirements.txt > @@ -14,4 +14,5 @@ > edk2-pytool-library=3D=3D0.10.* edk2-pytool-extensions~=3D0.13.3+edk2- > basetools=3D=3D0.1.2 antlr4-python3-runtime=3D=3D4.7.1-- > 2.29.0.vfs.0.0