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 AACC9740038 for ; Mon, 8 Jan 2024 13:25:27 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=KIvseWpYs87cI+bQsF6uWn46XSExc0JFaihuJElX/K0=; c=relaxed/simple; d=groups.io; h=From:To:Cc:References:In-Reply-To:Subject:Date:Message-ID:MIME-Version:Thread-Index:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type:Content-Transfer-Encoding:Content-Language; s=20140610; t=1704720326; v=1; b=hYORkQR3J2SquHy2F866RhEgPgAE/xDxaHtJsNmTutoiQwsHX5BV93B1zT5m9yPFxIspK4WG 5q8FMI120IhOvyD2Dvo0z9mK8v/7EyQpMcE7NeUE/BY9ltOsPa8u9uiB+8oRqT0H8lvBZUwFodi uDZKbH3mQ0C5sOKlyRb/5tpw= X-Received: by 127.0.0.2 with SMTP id XisqYY7687511xRvvVEwgshx; Mon, 08 Jan 2024 05:25:26 -0800 X-Received: from zrleap.intel-email.com (zrleap.intel-email.com [114.80.218.36]) by mx.groups.io with SMTP id smtpd.web10.6462.1704720324969838781 for ; Mon, 08 Jan 2024 05:25:25 -0800 X-Received: from zrleap.intel-email.com (localhost [127.0.0.1]) by zrleap.intel-email.com (Postfix) with ESMTP id B4F79A32DFFA for ; Mon, 8 Jan 2024 21:25:19 +0800 (CST) X-Received: from localhost (localhost [127.0.0.1]) by zrleap.intel-email.com (Postfix) with ESMTP id A4002A32DFE5 for ; Mon, 8 Jan 2024 21:25:19 +0800 (CST) X-Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by zrleap.intel-email.com (Postfix) with SMTP id 96C14A32E071 for ; Mon, 8 Jan 2024 21:25:16 +0800 (CST) X-Received: from DESKTOPS6D0PVI ([114.93.194.54]) (envelope-sender ) by 192.168.6.13 with ESMTP(SSL) for ; Mon, 08 Jan 2024 21:25:12 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 114.93.194.54 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming via groups.io" To: , , "'Joey Vagedes'" Cc: "'Rebecca Cran'" , "'Feng, Bob C'" , "'Huang, Yanbo'" , "'Kinney, Michael D'" References: <20231228164739.1042-1-joey.vagedes@gmail.com> <20231228164739.1042-2-joey.vagedes@gmail.com> <17A83A4D186CC8F7.1387@groups.io> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHYxIDEvMV0gQmFzZVRvb2xzOiBGaXggcmF3IHN0cmluZ3MgY29udGFpbmluZyB2YWxpZCBlc2NhcGUgY2hhcmFjdGVycw==?= Date: Mon, 8 Jan 2024 21:25:13 +0800 Message-ID: <03b201da4236$1c8c87d0$55a59770$@byosoft.com.cn> MIME-Version: 1.0 Thread-Index: AQJhfXyjiUfR5CqAX8xIKaXq91bEjQKTptQ8AYYEBE4BEWAWe6+YGLXQ 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,gaoliming@byosoft.com.cn List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 27jxCppVK1BvtD2sECIka7Drx7686176AA= Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=hYORkQR3; dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Christine: Is this a regression issue? Or does it resolve new usage? I am curious wh= y it is not reported before. Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io =B4=FA=B1= =ED Yuwei Chen > =B7=A2=CB=CD=CA=B1=BC=E4: 2024=C4=EA1=D4=C28=C8=D5 13:37 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io; Chen, Christine ; > Joey Vagedes > =B3=AD=CB=CD: Rebecca Cran ; Gao, Liming > ; Feng, Bob C ; Huang, > Yanbo ; Kinney, Michael D > > =D6=F7=CC=E2: Re: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw strings containing > valid escape characters >=20 > Hi Liming and Cran, >=20 > We should merge this fixing patch asap as it influences BaseTool's usage. >=20 > Thanks, > Christine >=20 > > -----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 > containing > > valid escape characters > > > > Hi Joey, > > > > Thanks for fixing. > > > > Reviewed-by: Yuwei Chen > > > > > -----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 treated > 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', > ctext, > > > flags=3Dre.S)+ return re.sub('//.*?\n|/\\*.*?\\*/', '\n', ctext, > flags=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 > PcdMakefileHeader if > > > sys.platform =3D=3D "win32":- MakeApp =3D MakeApp + r'APPF= ILE > > > =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 > + 'APPFILE > > > =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 (#113391): https://edk2.groups.io/g/devel/message/113391 Mute This Topic: https://groups.io/mt/103596531/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-