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 07DBED80888 for ; Tue, 9 Jan 2024 02:01:50 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=ggIjg9VahGsP8H6nKFS7B9ht7YOXI4t2tDF8FTyq0jg=; 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-Language; s=20140610; t=1704765709; v=1; b=tM9sKJQOwb/+sLHIjJGNKAxqu4IlG4/S3ZTgvgvQpLzuVyf/x79d4OUB0KBTqCLWu635VO+N tzBdmbuu2pgnVsthRSQMScmTI0jhDnloidIJIwYnTMYcCEaffrbMdHWPiOGB2IoKGBYMD/k6nWU fdqypLq29xfazrU2Ounlj0rs= X-Received: by 127.0.0.2 with SMTP id kWcdYY7687511xIhz5gYSxi4; Mon, 08 Jan 2024 18:01:49 -0800 X-Received: from flee.yi-enter.com (flee.yi-enter.com [162.216.18.248]) by mx.groups.io with SMTP id smtpd.web10.7743.1704765707484736366 for ; Mon, 08 Jan 2024 18:01:48 -0800 X-Received: from look.yi-enter.com (look.yi-enter.com [159.138.153.227]) by flee.yi-enter.com (Postfix) with ESMTPS id 2252960152 for ; Tue, 9 Jan 2024 10:01:43 +0800 (CST) X-Received: from zrleap.intel-email.com (unknown [114.80.218.36]) by look.yi-enter.com (Postfix) with ESMTPS id 2ECC9220996 for ; Tue, 9 Jan 2024 10:01:36 +0800 (CST) X-Received: from zrleap.intel-email.com (localhost [127.0.0.1]) by zrleap.intel-email.com (Postfix) with ESMTP id BEC18A32E071 for ; Tue, 9 Jan 2024 10:01:13 +0800 (CST) X-Received: from localhost (localhost [127.0.0.1]) by zrleap.intel-email.com (Postfix) with ESMTP id A4679A32E057 for ; Tue, 9 Jan 2024 10:01:13 +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 C9C2DA32E000 for ; Tue, 9 Jan 2024 10:01:10 +0800 (CST) X-Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP(SSL) for ; Tue, 09 Jan 2024 10:01:05 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming via groups.io" To: , , "'Huang, Yanbo'" Cc: "'Chen, Christine'" , "'Feng, Bob C'" , "'Kinney, Michael D'" , "'Rebecca Cran'" References: <20231228164739.1042-1-joey.vagedes@gmail.com> <20231228164739.1042-2-joey.vagedes@gmail.com> <17A83A4D186CC8F7.1387@groups.io> <03b201da4236$1c8c87d0$55a59770$@byosoft.com.cn> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHYxIDEvMV0gQmFzZVRvb2xzOiBGaXggcmF3IHN0cmluZ3MgY29udGFpbmluZyB2YWxpZCBlc2NhcGUgY2hhcmFjdGVycw==?= Date: Tue, 9 Jan 2024 10:01:06 +0800 Message-ID: <001901da429f$b527d210$1f777630$@byosoft.com.cn> MIME-Version: 1.0 Thread-Index: AQJhfXyjiUfR5CqAX8xIKaXq91bEjQKTptQ8AYYEBE4BEWAWewErR3tMAmb16pgBDNcVs69z8xwQ 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: 5gVnJPhIZSJTGnIz0xmZEfTrx7686176AA= Content-Type: multipart/alternative; boundary="----=_NextPart_000_001A_01DA42E2.C34D8310" 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=tM9sKJQO; 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=none ------=_NextPart_000_001A_01DA42E2.C34D8310 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Joey and Yanbo: Thanks for your update. So, this one is new introduced issue. I agree to r= esolve it asap.=20 =20 Christine: Can you create Pull Request to merge it? =20 Thanks Liming =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io = =E4=BB=A3=E8=A1=A8 Joey Vagedes via groups.io =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2024=E5=B9=B41=E6=9C=888=E6=97=A5 23:= 09 =E6=94=B6=E4=BB=B6=E4=BA=BA: Huang, Yanbo =E6=8A=84=E9=80=81: Chen, Christine ; Feng, Bob C ; Gao, Liming ; Kinney, Michae= l D ; Rebecca Cran ; devel@e= dk2.groups.io =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw stri= ngs containing valid escape characters =20 Hi Liming, =20 It was introduced due to the fact that a few of the regex strings with inva= lid escape sequences (due to regex using their own escape sequences) also i= ncluded valid escape sequences - for handling new lines. I did not see the = valid escape characters in the strings, and the virtual platforms (Ovmf, et= c) did not have the circumstances to catch this, so it slipped through the = cracks.=20 =20 Some platform DSCs do, and cause the break that the patch is resolving. I= =E2=80=99ve already verified this fix resolves the issue on numerous platfo= rms.=20 =20 thanks, Joey =20 On Mon, Jan 8, 2024 at 5:59=E2=80=AFAM Huang, Yanbo > wrote: Hi Liming, This issue is introduced by this commit:=20 SHA-1: 9f0061a03b61d282fbc0ba5be22155d06a5e64a1 * BaseTools: Resolve regex syntax warnings Switches regex patterns to raw text to resolve python 3.12 syntax warnings in regards to invalid escape sequences, as is suggested by the re (regex) module in python. Best Regards, Yanbo Huang -----Original Message----- From: gaoliming = >=20 Sent: Monday, January 8, 2024 9:25 PM To: devel@edk2.groups.io ; Chen, Christine >; 'Joey Vagedes' > Cc: 'Rebecca Cran' >; Feng, B= ob C >; Huang, Yanbo >; Kinney, Michael D > Subject: =E5=9B=9E=E5=A4=8D: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw= strings containing valid escape characters Christine: Is this a regression issue? Or does it resolve new usage? I am curious wh= y it is not reported before. Thanks Liming > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io > =E4=BB=A3=E8= =A1=A8 Yuwei Chen > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2024=E5=B9=B41=E6=9C=888=E6=97=A5 1= 3:37 > =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io ; Chen, Christine >;=20 > Joey Vagedes > > =E6=8A=84=E9=80=81: Rebecca Cran >; Gao, Liming=20 > >; Feng, Bob = C >; Huang,=20 > Yanbo >; Kinney, Mi= chael D=20 > > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw st= rings 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=20 > > Chen > > Sent: Monday, January 8, 2024 9:16 AM > > To: Joey Vagedes >; devel@edk2.groups.io =20 > > Cc: Rebecca Cran >; Gao, = Liming=20 > > >; Feng, Bo= b 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 =20 > > > Cc: Rebecca Cran >; Gao= , Liming=20 > > > >; Feng, = Bob C >; > Chen, > > > Christine > > > > Subject: [PATCH v1 1/1] BaseTools: Fix raw strings containing=20 > > > valid escape characters > > > > > > Fixes raw regex strings that contain valid (and purposeful) escape=20 > > > characters as they are being treated as individual characters=20 > > > rather than the single escaped character they represent (i.e. '\t'=20 > > > 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(?:[=20 > > > \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[ \"<]?[ \t]*)([-\w.\\/()=20 > > > \t]+)(?:[ \t]*[\">]?\)?)", re.MULTILINE | re.UNICODE | > > > re.IGNORECASE) ## Regular expression for matching macro used in=20 > > > header file inclusion-gMacroPattern =3D=20 > > > re.compile(r"([_A-Z][_A-Z0-9]*)[ \t]*\((.+)\)",=20 > > > re.UNICODE)+gMacroPattern =3D re.compile("([_A-Z][_A-Z0-9]*)[=20 > > > \t]*\\((.+)\\)", > > > re.UNICODE) gIsFileMap =3D {} diff --git=20 > > > 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=20 > > > %s\n' % (PcdValueInitName) + r'OBJECTS =3D %s\%s.obj %s.obj\n' %=20 > > > (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=20 > > > %s\n' % (PcdValueInitName) + 'OBJECTS =3D %s\\%s.obj %s.obj\n' %=20 > > > (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' %=20 > > > (self.OutputPath, PcdValueInitName, os.path.join(self.OutputPath,=20 > > > 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 (#113415): https://edk2.groups.io/g/devel/message/113415 Mute This Topic: https://groups.io/mt/103612970/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- ------=_NextPart_000_001A_01DA42E2.C34D8310 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Joey and Yanbo:

=C2=A0Thanks for your update. So, this= one is new introduced issue. I agree to resolve it asap.

 

Christine:

=C2=A0Can you create Pull Request to me= rge it?

&= nbsp;

Thanks

Liming=

=E5=8F=91=E4=BB=B6=E4= =BA=BA: devel@edk2.groups.io <dev= el@edk2.groups.io> =E4=BB=A3=E8=A1=A8 Joey Vagedes via group= s.io
=E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2024=E5=B9=B41=E6=9C=888=E6=97=A5 23:09
=E6=94=B6=E4=BB= =B6=E4=BA=BA: Huang, Yanbo= <yanbo.huang@intel.com>
=E6=8A=84=E9=80=81: Chen, Christine <yuwei.chen@intel.= com>; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaolimin= g@byosoft.com.cn>; Kinney, Michael D <michael.d.kinney@intel.com>;= Rebecca Cran <rebecca@bsdio.com>; devel@edk2.groups.io
= =E4=B8=BB=E9=A2=98: Re: [e= dk2-devel] [PATCH v1 1/1] BaseTools: Fix raw strings containing valid escap= e characters

<= span lang=3DEN-US> 

Hi Liming,

 

It was introduced due to the fact that a few of= the regex strings with invalid escape sequences (due to regex using their = own escape sequences) also included valid escape sequences - for handling n= ew lines. I did not see the valid escape characters in the strings, and the= virtual platforms (Ovmf, etc) did not have the circumstances to catch this= , so it slipped through the cracks. 

<= p class=3DMsoNormal> 

Some platform DSCs do, and cause= the break that the patch is resolving. I=E2=80=99ve already verified this = fix resolves the issue on numerous platforms. 

 

thanks,

Joey

 

On Mon, Jan = 8, 2024 at 5:59=E2=80=AFAM Huang, Yanbo <yanbo.huang@intel.com> wrote:=

=

Hi L= iming,

This issue is introduced by this commit:
SHA-1: 9f0061a03= b61d282fbc0ba5be22155d06a5e64a1

* BaseTools: Resolve regex syntax wa= rnings

Switches regex patterns to raw text to resolve python 3.12 sy= ntax
warnings in regards to invalid escape sequences, as is suggested by= the
re (regex) module in python.

Best Regards,
Yanbo Huang
-----Original Message-----
From: gaoliming <gaoliming@byosoft.com.cn> =
Sent: Monday, January 8, 2024 9:25 PM
To: devel@edk2.groups.io; Chen, Christine &= lt;yuwei.chen@int= el.com>; 'Joey Vagedes' <joey.vagedes@gmail.com>
Cc: 'Rebecca Cran' &l= t;rebecca@bsdio.com<= /a>>; Feng, Bob C <bob.c.feng@intel.com>; Huang, Yanbo <yanbo.huang@intel.com>; Kinne= y, Michael D <michael.d.kinney@intel.com>
Subject: =E5=9B=9E=E5=A4= =8D: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw stri= ngs containing valid escape characters

Christine:
  Is this = a regression issue? Or does it resolve new usage? I am curious why it is no= t reported before.

Thanks
Liming
> -----=E9=82=AE=E4= =BB=B6=E5=8E=9F=E4=BB=B6-----
> =E5=8F=91= =E4=BB=B6=E4=BA=BA: devel@edk2.groups.io <devel@edk2.groups.io> =E4= =BB=A3=E8=A1=A8 Yuwei Chen
> =E5=8F=91=E9= =80=81=E6=97=B6=E9=97=B4: 2024=E5=B9=B41=E6=9C=888=E6=97=A5 13:37
> =E6=94=B6=E4=BB=B6=E4=BA=BA:= devel@edk2.group= s.io; Chen, Christine <yuwei.chen@intel.com>;
> Joey Vagedes <joey.vagedes@gmail.co= m>
> =E6=8A=84=E9=80=81: Rebecca Cra= n <rebecca@bsdio.= com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Feng, Bob C <= bob.c.feng@intel.= com>; Huang,
> Yanbo <yanbo.huang@intel.com>; Kinney, Michael D > <m= ichael.d.kinney@intel.com>
> =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw strings
= containing
> valid escape characters
>
> Hi Liming and C= ran,
>
> We should merge this fixing patch asap as it influenc= es BaseTool's usage.
>
> Thanks,
> Christine
> > > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yuwei
> > Chen
> > Sent: Monday, Janu= ary 8, 2024 9:16 AM
> > To: Joey Vagedes <joey.vagedes@gmail.com>; devel@edk2.groups.io<= /a>
> > Cc: Rebecca Cran <rebecca@bsdio.com>; Gao, Liming
> > <= gaoliming@byo= soft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>
> > Subject: Re: = [edk2-devel] [PATCH v1 1/1] BaseTools: Fix raw strings
> containing> > valid escape characters
> >
> > Hi Joey,
&= gt; >
> > Thanks for fixing.
> >
> > Reviewed= -by: Yuwei Chen <yuwei.chen@intel.com>
> >
> > > -----Origina= l Message-----
> > > From: Joey Vagedes <joey.vagedes@gmail.com>
= > > > Sent: Friday, December 29, 2023 12:48 AM
> > > T= o: devel@edk2.gro= ups.io
> > > Cc: Rebecca Cran <rebecca@bsdio.com>; Gao, Liming
&g= t; > > <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>;
> = Chen,
> > > Christine <yuwei.chen@intel.com>
> > > Subject= : [PATCH v1 1/1] BaseTools: Fix raw strings containing
> > > v= alid escape characters
> > >
> > > Fixes raw regex = strings that contain valid (and purposeful) escape
> > > chara= cters 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).
> > >
&g= t; > > Signed-off-by: Joey Vagedes <joey.vagedes@gmail.com>
> > &= gt; Cc: Rebecca Cran <rebecca@bsdio.com>
> > > Cc: Liming Gao <gaoliming@byosoft.co= m.cn>
> > > Cc: Bob Feng <bob.c.feng@intel.com>
> > &g= t; Cc: Yuwei Chen <yuwei.chen@intel.com>
> > > ---
> > >&n= bsp; BaseTools/Source/Python/AutoGen/GenMake.py        = | 2 +-
> > >  BaseTools/Source/Python/Common/Misc.py =           | 2 +-
> > >  BaseTool= s/Source/Python/Workspace/DscBuildData.py | 4 ++--
> > >  = 3 files changed, 4 insertions(+), 4 deletions(-)
> > >
> = > > diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py
> &= gt; > b/BaseTools/Source/Python/AutoGen/GenMake.py
> > > ind= ex c416fe172fe5..fbd35d498923 100755
> > > --- a/BaseTools/Sour= ce/Python/AutoGen/GenMake.py
> > > +++ b/BaseTools/Source/Pytho= n/AutoGen/GenMake.py
> > > @@ -28,7 +28,7 @@ from Common.DataTy= pe import
> > TAB_COMPILER_MSFT
> > > gIncludePattern = =3D re.compile(r"^[ \t]*[#%]?[ \t]*include(?:[
> > > \t]*= (?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[ \"<]?[ \t]*)([-\w.\\/()
&g= t; > > \t]+)(?:[ \t]*[\">]?\)?)", re.MULTILINE | re.UNIC= ODE |
> > > re.IGNORECASE)  ## Regular expression for matc= hing macro used in
> > > header file inclusion-gMacroPattern = =3D
> > > re.compile(r"([_A-Z][_A-Z0-9]*)[ \t]*\((.+)\)&q= uot;,
> > > re.UNICODE)+gMacroPattern =3D re.compile("([_= A-Z][_A-Z0-9]*)[
> > > \t]*\\((.+)\\)",
> > >= re.UNICODE)  gIsFileMap =3D {} diff --git
> > > a/BaseTo= ols/Source/Python/Common/Misc.py
> > > b/BaseTools/Source/Pytho= n/Common/Misc.py
> > > index f87d9dbdba39..34bfc90abd94 100755<= br>> > > --- a/BaseTools/Source/Python/Common/Misc.py
> >= > +++ b/BaseTools/Source/Python/Common/Misc.py
> > > @@ -19= 26,4 +1926,4 @@ def CopyDict(ori_dict):
> > >  # Remove th= e c/c++ comments: // and /* */ # def
> > > RemoveCComments(ctex= t):-    return re.sub(r'//.*?\n|/\*.*?\*/', '\n',
> ctext,<= br>> > > 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/S= ource/Python/Workspace/DscBuildData.py
> > > +++ b/BaseTools/So= urce/Python/Workspace/DscBuildData.py
> > > @@ -2840,7 +2840,7 = @@ class DscBuildData(PlatformBuildClassObject):
> > >  &n= bsp;       # start generating makefile      &= nbsp;  MakeApp =3D
> PcdMakefileHeader       = ;  if
> > > sys.platform =3D=3D "win32":-  =           MakeApp =3D MakeApp + r'APPFILE
> = > > =3D %s\%s.exe\n' % (self.OutputPath, PcdValueInitName) + r'APPNAM= E =3D
> > > %s\n' % (PcdValueInitName) + r'OBJECTS =3D %s\%s.o= bj %s.obj\n' %
> > > (self.OutputPath, PcdValueInitName, os.pa= th.join(self.OutputPath,
> > > PcdValueCommonName)) + 'INC =3D = '+            MakeApp =3D MakeApp
> + '= APPFILE
> > > =3D %s\\%s.exe\n' % (self.OutputPath, PcdValueIni= tName) + 'APPNAME =3D
> > > %s\n' % (PcdValueInitName) + 'OBJE= CTS =3D %s\\%s.obj %s.obj\n' %
> > > (self.OutputPath, PcdValu= eInitName, os.path.join(self.OutputPath,
> > > PcdValueCommonNa= me)) + 'INC =3D '         else:
> MakeApp = =3D MakeApp +
> > > PcdGccMakefile        &= nbsp;    MakeApp =3D MakeApp + 'APPFILE
> =3D %s/%s\n' %> > > (self.OutputPath, PcdValueInitName) + 'APPNAME =3D %s\n' %<= br>> > > (PcdValueInitName) + 'OBJECTS =3D %s/%s.o %s.o\n' %
&= gt; > > (self.OutputPath, PcdValueInitName, os.path.join(self.OutputP= ath,
> > > PcdValueCommonName))
> > +
> > &g= t; \@@ -2950,7 +2950,7 @@ class DscBuildData(PlatformBuildClassObject):
= > > >              MakeApp +=3D= "$(OBJECTS) : %s\n" % include_file
> if sys.platform
&g= t; > =3D=3D
> > > "win32":      &nb= sp;      PcdValueCommonPath =3D
> > >
> &g= t;
> os.path.normpath(mws.join(GlobalData.gGlobalDefines["EDK_TO= OLS_PATH"]
> > > , "Source\C\Common\PcdValueCommon.c&= quot;))-            MakeApp =3D
> MakeA= pp +
> > > r'%s\PcdValueCommon.c : %s\n' % (self.OutputPath,> > PcdValueCommonPath)+
> > > MakeApp =3D MakeApp + '%s= \\PcdValueCommon.c : %s\n' %
> (self.OutputPath,
> > > Pc= dValueCommonPath)             MakeApp = =3D MakeApp + '\tcopy
> /y %s
> > $@\n' %
> > > = (PcdValueCommonPath)         else:
> PcdValu= eCommonPath =3D
> > >
> >
> os.path.normpath(mws= .join(GlobalData.gGlobalDefines["EDK_TOOLS_PATH"]
> > &g= t; , "Source/C/Common/PcdValueCommon.c"))--
> > > 2.4= 3.0.windows.1
> >
> >
> >
> >
> &= gt;
>
>
>
>
>


=
_._,_._,_
Groups.io Links:

=20 You receive all messages sent to this group. =20 =20

View/Reply Online (#113415) | =20 | Mute= This Topic | New Topic
Your Subscriptio= n | Contact Group Owner | Unsubscribe [rebecca@openfw.io]

_._,_._,_
------=_NextPart_000_001A_01DA42E2.C34D8310--