public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [Patch V2] BaseTools/Ecc: Fix an issue of path separator compatibility
@ 2020-09-01 10:23 Bob Feng
  2020-09-01 14:42 ` 回复: [edk2-devel] " gaoliming
  0 siblings, 1 reply; 5+ messages in thread
From: Bob Feng @ 2020-09-01 10:23 UTC (permalink / raw)
  To: devel; +Cc: Liming Gao, Yuwei Chen, Shenglei Zhang

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2904

The path separator is different in Windows and Linux, the
original code does not handle this difference. This patch
is to fix this issue.

Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Shenglei Zhang <shenglei.zhang@intel.com>
---
V2
Change to a better method to get path separator.

 BaseTools/Source/Python/Ecc/Check.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python/Ecc/Check.py
index 0fdc7e35c1..6087abfa4d 100644
--- a/BaseTools/Source/Python/Ecc/Check.py
+++ b/BaseTools/Source/Python/Ecc/Check.py
@@ -1101,15 +1101,15 @@ class Check(object):
             for Item in InfPathSet:
                 if Item[0] not in InfPathList:
                     InfPathList.append(Item[0])
             SqlCommand = """
                          select ID, Path, FullPath from File where upper(FullPath) not in
-                            (select upper(A.Path) || '\\' || upper(B.Value1) from File as A, INF as B
+                            (select upper(A.Path) || '%s' || upper(B.Value1) from File as A, INF as B
                             where A.ID in (select BelongsToFile from INF where Model = %s group by BelongsToFile) and
                             B.BelongsToFile = A.ID and B.Model = %s)
                             and (Model = %s or Model = %s)
-                        """ % (MODEL_EFI_SOURCE_FILE, MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
+                        """ % (os.sep, MODEL_EFI_SOURCE_FILE, MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
             RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)
             for Record in RecordSet:
                 Path = Record[1]
                 Path = Path.upper().replace('\X64', '').replace('\IA32', '').replace('\EBC', '').replace('\IPF', '').replace('\ARM', '')
                 if Path in InfPathList:
@@ -1130,13 +1130,13 @@ class Check(object):
                 if Pcd[3]:
                     PcdName = Pcd[3]
                 BelongsToFile = Pcd[4]
                 SqlCommand = """
                              select ID from File where FullPath in
-                            (select B.Path || '\\' || A.Value1 from INF as A, File as B where A.Model = %s and A.BelongsToFile = %s
+                            (select B.Path || '%s' || A.Value1 from INF as A, File as B where A.Model = %s and A.BelongsToFile = %s
                              and B.ID = %s and (B.Model = %s or B.Model = %s))
-                             """ % (MODEL_EFI_SOURCE_FILE, BelongsToFile, BelongsToFile, MODEL_FILE_C, MODEL_FILE_H)
+                             """ % (os.sep, MODEL_EFI_SOURCE_FILE, BelongsToFile, BelongsToFile, MODEL_FILE_C, MODEL_FILE_H)
                 TableSet = EccGlobalData.gDb.TblFile.Exec(SqlCommand)
                 for Tbl in TableSet:
                     TblName = 'Identifier' + str(Tbl[0])
                     SqlCommand = """
                                  select Name, ID from %s where value like '%s' and Model = %s
-- 
2.20.1.windows.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* 回复: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path separator compatibility
  2020-09-01 10:23 [Patch V2] BaseTools/Ecc: Fix an issue of path separator compatibility Bob Feng
@ 2020-09-01 14:42 ` gaoliming
  2020-09-01 18:03   ` Laszlo Ersek
  0 siblings, 1 reply; 5+ messages in thread
From: gaoliming @ 2020-09-01 14:42 UTC (permalink / raw)
  To: devel, bob.c.feng; +Cc: 'Yuwei Chen', 'Shenglei Zhang'

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: bounce+27952+64887+4905953+8761045@groups.io
> <bounce+27952+64887+4905953+8761045@groups.io> 代表 Bob Feng
> 发送时间: 2020年9月1日 18:23
> 收件人: devel@edk2.groups.io
> 抄送: Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen
> <yuwei.chen@intel.com>; Shenglei Zhang <shenglei.zhang@intel.com>
> 主题: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path
separator
> compatibility
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2904
> 
> The path separator is different in Windows and Linux, the
> original code does not handle this difference. This patch
> is to fix this issue.
> 
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
> V2
> Change to a better method to get path separator.
> 
>  BaseTools/Source/Python/Ecc/Check.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/Ecc/Check.py
> b/BaseTools/Source/Python/Ecc/Check.py
> index 0fdc7e35c1..6087abfa4d 100644
> --- a/BaseTools/Source/Python/Ecc/Check.py
> +++ b/BaseTools/Source/Python/Ecc/Check.py
> @@ -1101,15 +1101,15 @@ class Check(object):
>              for Item in InfPathSet:
>                  if Item[0] not in InfPathList:
>                      InfPathList.append(Item[0])
>              SqlCommand = """
>                           select ID, Path, FullPath from File where
> upper(FullPath) not in
> -                            (select upper(A.Path) || '\\' ||
> upper(B.Value1) from File as A, INF as B
> +                            (select upper(A.Path) || '%s' ||
> upper(B.Value1) from File as A, INF as B
>                              where A.ID in (select BelongsToFile from
> INF where Model = %s group by BelongsToFile) and
>                              B.BelongsToFile = A.ID and B.Model = %s)
>                              and (Model = %s or Model = %s)
> -                        """ % (MODEL_EFI_SOURCE_FILE,
> MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
> +                        """ % (os.sep, MODEL_EFI_SOURCE_FILE,
> MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
>              RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)
>              for Record in RecordSet:
>                  Path = Record[1]
>                  Path = Path.upper().replace('\X64', '').replace('\IA32',
> '').replace('\EBC', '').replace('\IPF', '').replace('\ARM', '')
>                  if Path in InfPathList:
> @@ -1130,13 +1130,13 @@ class Check(object):
>                  if Pcd[3]:
>                      PcdName = Pcd[3]
>                  BelongsToFile = Pcd[4]
>                  SqlCommand = """
>                               select ID from File where FullPath in
> -                            (select B.Path || '\\' || A.Value1 from INF
> as A, File as B where A.Model = %s and A.BelongsToFile = %s
> +                            (select B.Path || '%s' || A.Value1 from
> INF as A, File as B where A.Model = %s and A.BelongsToFile = %s
>                               and B.ID = %s and (B.Model = %s or
> B.Model = %s))
> -                             """ % (MODEL_EFI_SOURCE_FILE,
> BelongsToFile, BelongsToFile, MODEL_FILE_C, MODEL_FILE_H)
> +                             """ % (os.sep,
> MODEL_EFI_SOURCE_FILE, BelongsToFile, BelongsToFile, MODEL_FILE_C,
> MODEL_FILE_H)
>                  TableSet =
> EccGlobalData.gDb.TblFile.Exec(SqlCommand)
>                  for Tbl in TableSet:
>                      TblName = 'Identifier' + str(Tbl[0])
>                      SqlCommand = """
>                                   select Name, ID from %s where
> value like '%s' and Model = %s
> --
> 2.20.1.windows.1
> 
> 
> 




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: 回复: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path separator compatibility
  2020-09-01 14:42 ` 回复: [edk2-devel] " gaoliming
@ 2020-09-01 18:03   ` Laszlo Ersek
  2020-09-02  0:39     ` 回复: " gaoliming
  2020-09-02  0:44     ` Bob Feng
  0 siblings, 2 replies; 5+ messages in thread
From: Laszlo Ersek @ 2020-09-01 18:03 UTC (permalink / raw)
  To: devel, gaoliming, bob.c.feng
  Cc: 'Yuwei Chen', 'Shenglei Zhang'

On 09/01/20 16:42, gaoliming wrote:
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

Merged in commit 751355992635, via
<https://github.com/tianocore/edk2/pull/910>.

Thanks
Laszlo

>> -----邮件原件-----
>> 发件人: bounce+27952+64887+4905953+8761045@groups.io
>> <bounce+27952+64887+4905953+8761045@groups.io> 代表 Bob Feng
>> 发送时间: 2020年9月1日 18:23
>> 收件人: devel@edk2.groups.io
>> 抄送: Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen
>> <yuwei.chen@intel.com>; Shenglei Zhang <shenglei.zhang@intel.com>
>> 主题: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path
> separator
>> compatibility
>>
>> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2904
>>
>> The path separator is different in Windows and Linux, the
>> original code does not handle this difference. This patch
>> is to fix this issue.
>>
>> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>> Cc: Liming Gao <gaoliming@byosoft.com.cn>
>> Cc: Yuwei Chen <yuwei.chen@intel.com>
>> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
>> ---
>> V2
>> Change to a better method to get path separator.
>>
>>  BaseTools/Source/Python/Ecc/Check.py | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/BaseTools/Source/Python/Ecc/Check.py
>> b/BaseTools/Source/Python/Ecc/Check.py
>> index 0fdc7e35c1..6087abfa4d 100644
>> --- a/BaseTools/Source/Python/Ecc/Check.py
>> +++ b/BaseTools/Source/Python/Ecc/Check.py
>> @@ -1101,15 +1101,15 @@ class Check(object):
>>              for Item in InfPathSet:
>>                  if Item[0] not in InfPathList:
>>                      InfPathList.append(Item[0])
>>              SqlCommand = """
>>                           select ID, Path, FullPath from File where
>> upper(FullPath) not in
>> -                            (select upper(A.Path) || '\\' ||
>> upper(B.Value1) from File as A, INF as B
>> +                            (select upper(A.Path) || '%s' ||
>> upper(B.Value1) from File as A, INF as B
>>                              where A.ID in (select BelongsToFile from
>> INF where Model = %s group by BelongsToFile) and
>>                              B.BelongsToFile = A.ID and B.Model = %s)
>>                              and (Model = %s or Model = %s)
>> -                        """ % (MODEL_EFI_SOURCE_FILE,
>> MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
>> +                        """ % (os.sep, MODEL_EFI_SOURCE_FILE,
>> MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
>>              RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)
>>              for Record in RecordSet:
>>                  Path = Record[1]
>>                  Path = Path.upper().replace('\X64', '').replace('\IA32',
>> '').replace('\EBC', '').replace('\IPF', '').replace('\ARM', '')
>>                  if Path in InfPathList:
>> @@ -1130,13 +1130,13 @@ class Check(object):
>>                  if Pcd[3]:
>>                      PcdName = Pcd[3]
>>                  BelongsToFile = Pcd[4]
>>                  SqlCommand = """
>>                               select ID from File where FullPath in
>> -                            (select B.Path || '\\' || A.Value1 from INF
>> as A, File as B where A.Model = %s and A.BelongsToFile = %s
>> +                            (select B.Path || '%s' || A.Value1 from
>> INF as A, File as B where A.Model = %s and A.BelongsToFile = %s
>>                               and B.ID = %s and (B.Model = %s or
>> B.Model = %s))
>> -                             """ % (MODEL_EFI_SOURCE_FILE,
>> BelongsToFile, BelongsToFile, MODEL_FILE_C, MODEL_FILE_H)
>> +                             """ % (os.sep,
>> MODEL_EFI_SOURCE_FILE, BelongsToFile, BelongsToFile, MODEL_FILE_C,
>> MODEL_FILE_H)
>>                  TableSet =
>> EccGlobalData.gDb.TblFile.Exec(SqlCommand)
>>                  for Tbl in TableSet:
>>                      TblName = 'Identifier' + str(Tbl[0])
>>                      SqlCommand = """
>>                                   select Name, ID from %s where
>> value like '%s' and Model = %s
>> --
>> 2.20.1.windows.1
>>
>>
>>
> 
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* 回复: 回复: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path separator compatibility
  2020-09-01 18:03   ` Laszlo Ersek
@ 2020-09-02  0:39     ` gaoliming
  2020-09-02  0:44     ` Bob Feng
  1 sibling, 0 replies; 5+ messages in thread
From: gaoliming @ 2020-09-02  0:39 UTC (permalink / raw)
  To: devel, lersek, bob.c.feng; +Cc: 'Yuwei Chen', 'Shenglei Zhang'

Laszlo:
  Thank you!

Liming
> -----邮件原件-----
> 发件人: bounce+27952+64917+4905953+8761045@groups.io
> <bounce+27952+64917+4905953+8761045@groups.io> 代表 Laszlo Ersek
> 发送时间: 2020年9月2日 2:04
> 收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn;
> bob.c.feng@intel.com
> 抄送: 'Yuwei Chen' <yuwei.chen@intel.com>; 'Shenglei Zhang'
> <shenglei.zhang@intel.com>
> 主题: Re: 回复: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path
> separator compatibility
> 
> On 09/01/20 16:42, gaoliming wrote:
> > Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> 
> Merged in commit 751355992635, via
> <https://github.com/tianocore/edk2/pull/910>.
> 
> Thanks
> Laszlo
> 
> >> -----邮件原件-----
> >> 发件人: bounce+27952+64887+4905953+8761045@groups.io
> >> <bounce+27952+64887+4905953+8761045@groups.io> 代表 Bob Feng
> >> 发送时间: 2020年9月1日 18:23
> >> 收件人: devel@edk2.groups.io
> >> 抄送: Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen
> >> <yuwei.chen@intel.com>; Shenglei Zhang <shenglei.zhang@intel.com>
> >> 主题: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path
> > separator
> >> compatibility
> >>
> >> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2904
> >>
> >> The path separator is different in Windows and Linux, the
> >> original code does not handle this difference. This patch
> >> is to fix this issue.
> >>
> >> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> >> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> >> Cc: Yuwei Chen <yuwei.chen@intel.com>
> >> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
> >> ---
> >> V2
> >> Change to a better method to get path separator.
> >>
> >>  BaseTools/Source/Python/Ecc/Check.py | 8 ++++----
> >>  1 file changed, 4 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/BaseTools/Source/Python/Ecc/Check.py
> >> b/BaseTools/Source/Python/Ecc/Check.py
> >> index 0fdc7e35c1..6087abfa4d 100644
> >> --- a/BaseTools/Source/Python/Ecc/Check.py
> >> +++ b/BaseTools/Source/Python/Ecc/Check.py
> >> @@ -1101,15 +1101,15 @@ class Check(object):
> >>              for Item in InfPathSet:
> >>                  if Item[0] not in InfPathList:
> >>                      InfPathList.append(Item[0])
> >>              SqlCommand = """
> >>                           select ID, Path, FullPath from File where
> >> upper(FullPath) not in
> >> -                            (select upper(A.Path) || '\\' ||
> >> upper(B.Value1) from File as A, INF as B
> >> +                            (select upper(A.Path) || '%s' ||
> >> upper(B.Value1) from File as A, INF as B
> >>                              where A.ID in (select BelongsToFile
> from
> >> INF where Model = %s group by BelongsToFile) and
> >>                              B.BelongsToFile = A.ID and B.Model
> = %s)
> >>                              and (Model = %s or Model = %s)
> >> -                        """ % (MODEL_EFI_SOURCE_FILE,
> >> MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
> >> +                        """ % (os.sep, MODEL_EFI_SOURCE_FILE,
> >> MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
> >>              RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)
> >>              for Record in RecordSet:
> >>                  Path = Record[1]
> >>                  Path = Path.upper().replace('\X64', '').replace('\IA32',
> >> '').replace('\EBC', '').replace('\IPF', '').replace('\ARM', '')
> >>                  if Path in InfPathList:
> >> @@ -1130,13 +1130,13 @@ class Check(object):
> >>                  if Pcd[3]:
> >>                      PcdName = Pcd[3]
> >>                  BelongsToFile = Pcd[4]
> >>                  SqlCommand = """
> >>                               select ID from File where FullPath in
> >> -                            (select B.Path || '\\' || A.Value1 from
> INF
> >> as A, File as B where A.Model = %s and A.BelongsToFile = %s
> >> +                            (select B.Path || '%s' || A.Value1 from
> >> INF as A, File as B where A.Model = %s and A.BelongsToFile = %s
> >>                               and B.ID = %s and (B.Model = %s or
> >> B.Model = %s))
> >> -                             """ % (MODEL_EFI_SOURCE_FILE,
> >> BelongsToFile, BelongsToFile, MODEL_FILE_C, MODEL_FILE_H)
> >> +                             """ % (os.sep,
> >> MODEL_EFI_SOURCE_FILE, BelongsToFile, BelongsToFile, MODEL_FILE_C,
> >> MODEL_FILE_H)
> >>                  TableSet =
> >> EccGlobalData.gDb.TblFile.Exec(SqlCommand)
> >>                  for Tbl in TableSet:
> >>                      TblName = 'Identifier' + str(Tbl[0])
> >>                      SqlCommand = """
> >>                                   select Name, ID from %s where
> >> value like '%s' and Model = %s
> >> --
> >> 2.20.1.windows.1
> >>
> >>
> >>
> >
> >
> >
> >
> >
> >
> 
> 
> 




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: 回复: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path separator compatibility
  2020-09-01 18:03   ` Laszlo Ersek
  2020-09-02  0:39     ` 回复: " gaoliming
@ 2020-09-02  0:44     ` Bob Feng
  1 sibling, 0 replies; 5+ messages in thread
From: Bob Feng @ 2020-09-02  0:44 UTC (permalink / raw)
  To: devel@edk2.groups.io, lersek@redhat.com, gaoliming@byosoft.com.cn
  Cc: Chen, Christine, Zhang, Shenglei

Thank you Laszlo.

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Laszlo Ersek
Sent: Wednesday, September 2, 2020 2:04 AM
To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; Feng, Bob C <bob.c.feng@intel.com>
Cc: Chen, Christine <yuwei.chen@intel.com>; Zhang, Shenglei <shenglei.zhang@intel.com>
Subject: Re: 回复: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path separator compatibility

On 09/01/20 16:42, gaoliming wrote:
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

Merged in commit 751355992635, via
<https://github.com/tianocore/edk2/pull/910>.

Thanks
Laszlo

>> -----邮件原件-----
>> 发件人: bounce+27952+64887+4905953+8761045@groups.io
>> <bounce+27952+64887+4905953+8761045@groups.io> 代表 Bob Feng
>> 发送时间: 2020年9月1日 18:23
>> 收件人: devel@edk2.groups.io
>> 抄送: Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen 
>> <yuwei.chen@intel.com>; Shenglei Zhang <shenglei.zhang@intel.com>
>> 主题: [edk2-devel] [Patch V2] BaseTools/Ecc: Fix an issue of path
> separator
>> compatibility
>>
>> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2904
>>
>> The path separator is different in Windows and Linux, the original 
>> code does not handle this difference. This patch is to fix this 
>> issue.
>>
>> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>> Cc: Liming Gao <gaoliming@byosoft.com.cn>
>> Cc: Yuwei Chen <yuwei.chen@intel.com>
>> Cc: Shenglei Zhang <shenglei.zhang@intel.com>
>> ---
>> V2
>> Change to a better method to get path separator.
>>
>>  BaseTools/Source/Python/Ecc/Check.py | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/BaseTools/Source/Python/Ecc/Check.py
>> b/BaseTools/Source/Python/Ecc/Check.py
>> index 0fdc7e35c1..6087abfa4d 100644
>> --- a/BaseTools/Source/Python/Ecc/Check.py
>> +++ b/BaseTools/Source/Python/Ecc/Check.py
>> @@ -1101,15 +1101,15 @@ class Check(object):
>>              for Item in InfPathSet:
>>                  if Item[0] not in InfPathList:
>>                      InfPathList.append(Item[0])
>>              SqlCommand = """
>>                           select ID, Path, FullPath from File where
>> upper(FullPath) not in
>> -                            (select upper(A.Path) || '\\' ||
>> upper(B.Value1) from File as A, INF as B
>> +                            (select upper(A.Path) || '%s' ||
>> upper(B.Value1) from File as A, INF as B
>>                              where A.ID in (select BelongsToFile from 
>> INF where Model = %s group by BelongsToFile) and
>>                              B.BelongsToFile = A.ID and B.Model = %s)
>>                              and (Model = %s or Model = %s)
>> -                        """ % (MODEL_EFI_SOURCE_FILE,
>> MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
>> +                        """ % (os.sep, MODEL_EFI_SOURCE_FILE,
>> MODEL_EFI_SOURCE_FILE, MODEL_FILE_C, MODEL_FILE_H)
>>              RecordSet = EccGlobalData.gDb.TblInf.Exec(SqlCommand)
>>              for Record in RecordSet:
>>                  Path = Record[1]
>>                  Path = Path.upper().replace('\X64', 
>> '').replace('\IA32', '').replace('\EBC', '').replace('\IPF', '').replace('\ARM', '')
>>                  if Path in InfPathList:
>> @@ -1130,13 +1130,13 @@ class Check(object):
>>                  if Pcd[3]:
>>                      PcdName = Pcd[3]
>>                  BelongsToFile = Pcd[4]
>>                  SqlCommand = """
>>                               select ID from File where FullPath in
>> -                            (select B.Path || '\\' || A.Value1 from INF
>> as A, File as B where A.Model = %s and A.BelongsToFile = %s
>> +                            (select B.Path || '%s' || A.Value1 from
>> INF as A, File as B where A.Model = %s and A.BelongsToFile = %s
>>                               and B.ID = %s and (B.Model = %s or 
>> B.Model = %s))
>> -                             """ % (MODEL_EFI_SOURCE_FILE,
>> BelongsToFile, BelongsToFile, MODEL_FILE_C, MODEL_FILE_H)
>> +                             """ % (os.sep,
>> MODEL_EFI_SOURCE_FILE, BelongsToFile, BelongsToFile, MODEL_FILE_C,
>> MODEL_FILE_H)
>>                  TableSet =
>> EccGlobalData.gDb.TblFile.Exec(SqlCommand)
>>                  for Tbl in TableSet:
>>                      TblName = 'Identifier' + str(Tbl[0])
>>                      SqlCommand = """
>>                                   select Name, ID from %s where value 
>> like '%s' and Model = %s
>> --
>> 2.20.1.windows.1
>>
>>
>>
> 
> 
> 
> 
> 
> 





^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-09-02  0:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-01 10:23 [Patch V2] BaseTools/Ecc: Fix an issue of path separator compatibility Bob Feng
2020-09-01 14:42 ` 回复: [edk2-devel] " gaoliming
2020-09-01 18:03   ` Laszlo Ersek
2020-09-02  0:39     ` 回复: " gaoliming
2020-09-02  0:44     ` Bob Feng

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox