From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 63490D80A07 for ; Mon, 8 Jan 2024 05:37:20 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=f1AJbweHzvkajpugH8j8OMJn1vRZ4zetarmFNEsFXb8=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1704692239; v=1; b=K2D0tqXpSDopSEomHSfbIXa2pUDa13pUJCjgGe1L8b1dnbMcEtHIOumcU5P+DGMo2+PTwrzy wOBkhXjEMZ/u6YwMHUR7wkvMJl5wxsICa/ex1Re8QV6i7WMAztH4MXKOWUVqN3oeJpwSLS/I4Yr nG3etO9EdmkT98n8s95713K4= X-Received: by 127.0.0.2 with SMTP id 34bXYY7687511x8Rko1ewgHX; Sun, 07 Jan 2024 21:37:19 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web10.856.1704692238083806668 for ; Sun, 07 Jan 2024 21:37:18 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10946"; a="462089033" X-IronPort-AV: E=Sophos;i="6.04,340,1695711600"; d="scan'208";a="462089033" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2024 21:37:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10946"; a="847111494" X-IronPort-AV: E=Sophos;i="6.04,340,1695711600"; d="scan'208";a="847111494" X-Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga008.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 07 Jan 2024 21:37:17 -0800 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Sun, 7 Jan 2024 21:37:16 -0800 X-Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) 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.2507.35 via Frontend Transport; Sun, 7 Jan 2024 21:37:16 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Sun, 7 Jan 2024 21:37:16 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gTI5sUBq+BPeAEgSco1PVBsnR1BtYLlmWxNHdE4QU1zX6zu2NchmkQTCrFPv6+8/2gteeS4J9SrFVt6Wi4trlzq5jN9/dDR7/asRD8O3kv0e7/evDFDPu+8uVJhHESygTiZZZCzGiFxvyHU7SWLTE/aBkla3b43mhKuCHjeqyg/ZOkCpl65PnZIrSxPE3O0YHZuvJEDo6eQRpazD8DpRwEogEpSw5Udp+lgmMpQjCOX1sms3jiRu0J3/ibaotG/pr9QZXKSmZ/rCJtedrayQQGbYIf1oqJ8GXaYpFfJvnZxabP8plV/Bwqgxle+iVT33p1mBSdoLv2HEqRtj7hSoHQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3l3sk1iZP1Rvy4Pr0XoAfaA+ZHWdi+Fu+RyJUZKVY5g=; b=H5R04teaecbI5vT0fX/syghJGiUj25LwmpWx/0uSVsbn2g3oqpRf2qf2YS12/uVe19Pz48OTVOp7e0IHNSzPwB9Wv7urna9aotZkt04M8veRN4jJGpfsH5k+/LHlv+H3ALSGzRnJSNZBR/dhAgT2LLb1DsvXo5WErbvmVHFnr78OXAAjP+0yVanyzKDpnASrDLvvc1A1g7B6d7meQw6FqfaDzkVw0UKNjEETuSxvpYoSG1TAzhFTu9QZJmllGD4g2l9h1GRAWzoQ4w+NE4V7rclaKZpXh823XMIWO3vQsoKZRZtbQSRbLP/CvWmtpK6Rt+xaXeSxMSw+h1MvBQdZzQ== 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 X-Received: from MW5PR11MB5906.namprd11.prod.outlook.com (2603:10b6:303:1a0::21) by CO1PR11MB4786.namprd11.prod.outlook.com (2603:10b6:303:94::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.21; Mon, 8 Jan 2024 05:37:13 +0000 X-Received: from MW5PR11MB5906.namprd11.prod.outlook.com ([fe80::75a3:d66d:5791:3b7b]) by MW5PR11MB5906.namprd11.prod.outlook.com ([fe80::75a3:d66d:5791:3b7b%5]) with mapi id 15.20.7159.020; Mon, 8 Jan 2024 05:37:13 +0000 From: "Yuwei Chen" To: "devel@edk2.groups.io" , "Chen, Christine" , Joey Vagedes CC: Rebecca Cran , "Gao, Liming" , "Feng, Bob C" , "Huang, Yanbo" , "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw strings containing valid escape characters Thread-Topic: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw strings containing valid escape characters Thread-Index: AQHaOa3GS2OyZ+RNUEWv0xqf6uDjQbDPLNHAgABI3cA= Date: Mon, 8 Jan 2024 05:37:13 +0000 Message-ID: References: <20231228164739.1042-1-joey.vagedes@gmail.com> <20231228164739.1042-2-joey.vagedes@gmail.com> <17A83A4D186CC8F7.1387@groups.io> In-Reply-To: <17A83A4D186CC8F7.1387@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW5PR11MB5906:EE_|CO1PR11MB4786:EE_ x-ms-office365-filtering-correlation-id: 999584c5-c3f7-4aba-9f0b-08dc100bde33 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: xCP0MsdmijF/G2yKMutDhRl+ixO3N3VteFHYS8wxZEdOd/tvO+dZI5kqlkyN+Q2rc6QilXiDCNarh1mxOdTMo0omymBxSzRadVPwNH0P0MBacKX5VzaDsO77yiuzutYZn9XZGIaN+QVDBDglWZLayJ+zOkW4YSt7m9apzaSGCe0OxnoAYIk78/3JKAC1yzC75duZOAyeAieB4IMbLq4k+0TP/rGSpMDhGBdHbWD82tmqvy6hotJQot8ENopEY7V78NR455U7283MlbTqkpPWI9ThltJpPl9w21GjDAwamFq2Jc6WWopJVd9tpMHCYHpJi7hYXy0+PEymc7hyaGIkptviQLLTIXKbUa3eVYrzMTaG5ioS4+RKhJDvHsdtfrJMr1UHWB4UCw6kyd3ickmAF0031z/hYTK+KiovPsDr+9ML6ah9CWZSSxYNx9TuiMCu5HIqqMSTKOj8DUfbwC/frWsrwe/kMk0Op/xRS13eYLNUo4fIRxYm8takJhuXMaEBWM2GzBfQ/NJw46z5E7xa8WajC3HkB7XLUjTZXas7EyaUmCAKMtTZ9nE0KzPzoTFLqGFhkN1xzfEV4bIgVDVaCjcdi3SlhLT3TTULhi1jMZZsCFFHHXlfgnLQsvGn55bp x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?dcDs33CHv/eML3/YCcjSR0910mWI6MdO04kAgKWcWsvvUou458ddgO/wPkeP?= =?us-ascii?Q?IPJhMMXerfKMazery2fZHRjMreCA8rd0NwI/C3IDaDQH3pgwLCf1RZv42tX3?= =?us-ascii?Q?7KwOZisICFlEUi6pLHI+mcKL23paNJuzzp0MHpzRAwNtZP9ANQJNdtkkX+LB?= =?us-ascii?Q?GK0k/KY/hO6cEJUtWMRqIkoRXtpFp8qhSAZ/bgGS1Nx1PjhNJfyVjsMU6FCM?= =?us-ascii?Q?ZikFa5SccvYerYN33V2kJGd+ohKYCG8MRS69dMLvSJl2TvFEzWW+Sz/Ogvwi?= =?us-ascii?Q?jpT5Wx7xX5W9psCYCl0sHWizOS+jo1FhygOLTXyycTFXl/cFdsCuvlxE0e9Y?= =?us-ascii?Q?pNFNidsRn+d948tzQXuR3Adm03DxPm1reepU9+pokO1XJN4rWcz45Kmix+Iw?= =?us-ascii?Q?4swVslGKSojB2osKn5DgtPbRt+/8vNvtLsaFP+hSUOZo3s41AONXvI5CqK/X?= =?us-ascii?Q?oJay5X7ZK5xLj9lWnpN/h2Z4QfALovnyOSgrqFMLARw/HBrl2C7il+xQzW+i?= =?us-ascii?Q?owb/7VUuvd51gXuPQtQR09yb0a5yNJ20F1GlvHSzXG/lk7PvhaAlVjUs5hQ+?= =?us-ascii?Q?ohFNXDFyi9xBUE2XDCq+fdbTL2vpUZKK3C+a2ToGKYjZKZVI/sCfpfeoksk9?= =?us-ascii?Q?m/rXJXcRBdSJsIsvXYM71OhZURXlv3fwXFnZCzYZ0Kza8h0UXYTpa4YrmSGq?= =?us-ascii?Q?xhnCGV3R3ZrW4E1BpZicbyoZLERpfTtp86Zx9jPhdjlugPj7rrg/sHKGPnHD?= =?us-ascii?Q?MOwgJn/y49Aroe+11lepLdB92EjSbGrg1SjdhWnX0erXexLzBw82zE6KdXpj?= =?us-ascii?Q?nFx6tcngHCOWYo+VedsJUuXcR8CRPNiHjZvmB0WZ7/es/BRL5kHZ2nZr2b0y?= =?us-ascii?Q?7AA5KSizZ6OkCEX7lL0W3DUvRhKL9t2EFRDIfrU9j9F/UvTz6PaAyX279iAQ?= =?us-ascii?Q?anzDfD+EwBnNx3rESBRda37KSTzKPtgIZ3wVmCxbFfkX1n5e0D98Dtp/jYG/?= =?us-ascii?Q?AaO3/2iTdV9kE+EH5N5+o37tA0w13yyN9LLSQVtoAarAugiyPfKUXYtXOtnx?= =?us-ascii?Q?JMUvnV7y93zx3wbqAmf+j2Feiz0HYt4WFNLo/2dlxbWlnw/QVwbyQ7H180NI?= =?us-ascii?Q?qtixcw7iG2MQiUtfkLQuYv9axt6HO3RulC/1We2bvHmesbXhCJYKl6fM8Z4c?= =?us-ascii?Q?vcfbRsBlOpeQ6HU6uqlryvp588h8fzbOkFMmCRfW2QqYzXnv1Tb3SuD8wfC5?= =?us-ascii?Q?BWYU4QUTqdXMffeCuB6fku4m8tAcZQ8XIbZU5C0b1/R9PnPyvbQsRIOaFw54?= =?us-ascii?Q?39tCGufZx77PRawq9ehD2tU8P5Ubwso5+nE4AsVcTA4kBdZorZaz5abFTDiw?= =?us-ascii?Q?o3t5wFns53Jdv5CcLLHFCsjEhvclhVuVVtdM8MpfBMnoMEG9bryGRht0xxFB?= =?us-ascii?Q?CW0AF+JKUkgHonEFZHoadvvBPD2TaiTy6YF3A0xUO2uNN02i38cVipZquXgF?= =?us-ascii?Q?69ln+5HdWFtGEwoxuo99R/CtET5/z1MpcgKLZgKIIwYpf+snIT9CcLpUzFma?= =?us-ascii?Q?iRVNKqv3f7rfkj6NXAdGfxUJ3rUhZhAKOcHFQxNc?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5906.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 999584c5-c3f7-4aba-9f0b-08dc100bde33 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2024 05:37:13.8169 (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: /X29BmoHOd8Xij7LHt+3h6UXGu48pGH/SZSA7JwG9Op590XtjFkJ4TAPbjbqMCCwvhz0B+O2CSOReEwcwOfwMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4786 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yuwei.chen@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: axaI3R0sc9bWGFjrmG40gtCFx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=K2D0tqXp; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Hi Liming and Cran, We should merge this fixing patch asap as it influences BaseTool's usage. Thanks, Christine > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Yuwei > Chen > Sent: Monday, January 8, 2024 9:16 AM > To: Joey Vagedes ; devel@edk2.groups.io > Cc: Rebecca Cran ; Gao, Liming > ; Feng, Bob C > Subject: Re: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw strings conta= ining > valid escape characters >=20 > Hi Joey, >=20 > Thanks for fixing. >=20 > Reviewed-by: Yuwei Chen >=20 > > -----Original Message----- > > From: Joey Vagedes > > Sent: Friday, December 29, 2023 12:48 AM > > To: devel@edk2.groups.io > > Cc: Rebecca Cran ; Gao, Liming > > ; Feng, Bob C ; Chen, > > Christine > > Subject: [PATCH v1 1/1] BaseTools: Fix raw strings containing valid > > escape characters > > > > Fixes raw regex strings that contain valid (and purposeful) escape > > characters as they are being treated as individual characters rather > > than the single escaped character they represent (i.e. '\t' is being tr= eated as > a '\' and a 't' > > rather than a single tab character). > > > > Signed-off-by: Joey Vagedes > > Cc: Rebecca Cran > > Cc: Liming Gao > > Cc: Bob Feng > > Cc: Yuwei Chen > > --- > > BaseTools/Source/Python/AutoGen/GenMake.py | 2 +- > > BaseTools/Source/Python/Common/Misc.py | 2 +- > > BaseTools/Source/Python/Workspace/DscBuildData.py | 4 ++-- > > 3 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py > > b/BaseTools/Source/Python/AutoGen/GenMake.py > > index c416fe172fe5..fbd35d498923 100755 > > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > > @@ -28,7 +28,7 @@ from Common.DataType import > TAB_COMPILER_MSFT > > gIncludePattern =3D re.compile(r"^[ \t]*[#%]?[ \t]*include(?:[ > > \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[ \"<]?[ \t]*)([-\w.\\/() > > \t]+)(?:[ \t]*[\">]?\)?)", re.MULTILINE | re.UNICODE | > > re.IGNORECASE) ## Regular expression for matching macro used in > > header file inclusion-gMacroPattern =3D re.compile(r"([_A-Z][_A-Z0-9]*)= [ > > \t]*\((.+)\)", re.UNICODE)+gMacroPattern =3D > > re.compile("([_A-Z][_A-Z0-9]*)[ \t]*\\((.+)\\)", > > re.UNICODE) gIsFileMap =3D {} diff --git > > a/BaseTools/Source/Python/Common/Misc.py > > b/BaseTools/Source/Python/Common/Misc.py > > index f87d9dbdba39..34bfc90abd94 100755 > > --- a/BaseTools/Source/Python/Common/Misc.py > > +++ b/BaseTools/Source/Python/Common/Misc.py > > @@ -1926,4 +1926,4 @@ def CopyDict(ori_dict): > > # Remove the c/c++ comments: // and /* */ # def > > RemoveCComments(ctext):- return re.sub(r'//.*?\n|/\*.*?\*/', '\n', c= text, > > flags=3Dre.S)+ return re.sub('//.*?\n|/\\*.*?\\*/', '\n', ctext, fla= gs=3Dre.S)diff -- > git > > a/BaseTools/Source/Python/Workspace/DscBuildData.py > > b/BaseTools/Source/Python/Workspace/DscBuildData.py > > index 817cdbe5f19c..4768099343e5 100644 > > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py > > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > > @@ -2840,7 +2840,7 @@ class DscBuildData(PlatformBuildClassObject): > > # start generating makefile MakeApp =3D PcdMakefileHea= der if > > sys.platform =3D=3D "win32":- MakeApp =3D MakeApp + r'APPFIL= E > > =3D %s\%s.exe\n' % (self.OutputPath, PcdValueInitName) + r'APPNAME =3D > > %s\n' % (PcdValueInitName) + r'OBJECTS =3D %s\%s.obj %s.obj\n' % > > (self.OutputPath, PcdValueInitName, os.path.join(self.OutputPath, > > PcdValueCommonName)) + 'INC =3D '+ MakeApp =3D MakeApp + 'AP= PFILE > > =3D %s\\%s.exe\n' % (self.OutputPath, PcdValueInitName) + 'APPNAME =3D > > %s\n' % (PcdValueInitName) + 'OBJECTS =3D %s\\%s.obj %s.obj\n' % > > (self.OutputPath, PcdValueInitName, os.path.join(self.OutputPath, > > PcdValueCommonName)) + 'INC =3D ' else: MakeApp =3D= MakeApp + > > PcdGccMakefile MakeApp =3D MakeApp + 'APPFILE =3D %s/%s\n' = % > > (self.OutputPath, PcdValueInitName) + 'APPNAME =3D %s\n' % > > (PcdValueInitName) + 'OBJECTS =3D %s/%s.o %s.o\n' % (self.OutputPath, > > PcdValueInitName, os.path.join(self.OutputPath, PcdValueCommonName)) > + > > \@@ -2950,7 +2950,7 @@ class DscBuildData(PlatformBuildClassObject): > > MakeApp +=3D "$(OBJECTS) : %s\n" % include_file if= sys.platform > =3D=3D > > "win32": PcdValueCommonPath =3D > > > os.path.normpath(mws.join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"] > > , "Source\C\Common\PcdValueCommon.c"))- MakeApp =3D MakeApp = + > > r'%s\PcdValueCommon.c : %s\n' % (self.OutputPath, > PcdValueCommonPath)+ > > MakeApp =3D MakeApp + '%s\\PcdValueCommon.c : %s\n' % (self.OutputPath, > > PcdValueCommonPath) MakeApp =3D MakeApp + '\tcopy /y %s > $@\n' % > > (PcdValueCommonPath) else: PcdValueCommonPath =3D > > > os.path.normpath(mws.join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"] > > , "Source/C/Common/PcdValueCommon.c"))-- > > 2.43.0.windows.1 >=20 >=20 >=20 >=20 >=20 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113358): https://edk2.groups.io/g/devel/message/113358 Mute This Topic: https://groups.io/mt/103403582/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-