[Patch 1/1] BaseTools: Fix a bug of genffs command generation

[Patch 1/1] BaseTools: Fix a bug of genffs command generation

[Bob Feng]

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

The command used by multiple thread genffs feature in makefile
for testing if file exist is generated based on the toolchain family.
It should be based on the OS type.

Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 4d8b2bdee299..bd97aa9dd208 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -11,10 +11,11 @@
 #
 from __future__ import print_function
 from __future__ import absolute_import
 
 import Common.LongFilePathOs as os
+import sys
 from sys import stdout
 from subprocess import PIPE,Popen
 from struct import Struct
 from array import array
 
@@ -484,11 +485,11 @@ class GenFdsGlobalVariable:
             Cmd += ("-o", Output)
             Cmd += Input
 
             SaveFileOnChange(CommandFile, ' '.join(Cmd), False)
             if IsMakefile:
-                if GlobalData.gGlobalDefines.get("FAMILY") == "MSFT":
+                if sys.platform == "win32":
                     Cmd = ['if', 'exist', Input[0]] + Cmd
                 else:
                     Cmd = ['-test', '-e', Input[0], "&&"] + Cmd
                 if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:
                     GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
-- 
2.20.1.windows.1

Re: [edk2-devel] [Patch 1/1] BaseTools: Fix a bug of genffs command generation

[Philippe Mathieu-Daudé]

On 9/27/19 4:30 AM, Bob Feng wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2221
> 
> The command used by multiple thread genffs feature in makefile
> for testing if file exist is generated based on the toolchain family.
> It should be based on the OS type.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> ---
>  BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> index 4d8b2bdee299..bd97aa9dd208 100644
> --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> @@ -11,10 +11,11 @@
>  #
>  from __future__ import print_function
>  from __future__ import absolute_import
>  
>  import Common.LongFilePathOs as os
> +import sys
>  from sys import stdout
>  from subprocess import PIPE,Popen
>  from struct import Struct
>  from array import array
>  
> @@ -484,11 +485,11 @@ class GenFdsGlobalVariable:
>              Cmd += ("-o", Output)
>              Cmd += Input
>  
>              SaveFileOnChange(CommandFile, ' '.join(Cmd), False)
>              if IsMakefile:
> -                if GlobalData.gGlobalDefines.get("FAMILY") == "MSFT":
> +                if sys.platform == "win32":
>                      Cmd = ['if', 'exist', Input[0]] + Cmd
>                  else:
>                      Cmd = ['-test', '-e', Input[0], "&&"] + Cmd
>                  if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:
>                      GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [Patch 1/1] BaseTools: Fix a bug of genffs command generation

[Liming Gao]

Bob:
  Can BaseTools base on make command to generate Makefile? The different make command will use the different Makefile type. 

Thanks
Liming
>-----Original Message-----
>From: Feng, Bob C
>Sent: Friday, September 27, 2019 10:30 AM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
>Subject: [Patch 1/1] BaseTools: Fix a bug of genffs command generation
>
>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2221
>
>The command used by multiple thread genffs feature in makefile
>for testing if file exist is generated based on the toolchain family.
>It should be based on the OS type.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>index 4d8b2bdee299..bd97aa9dd208 100644
>--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>@@ -11,10 +11,11 @@
> #
> from __future__ import print_function
> from __future__ import absolute_import
>
> import Common.LongFilePathOs as os
>+import sys
> from sys import stdout
> from subprocess import PIPE,Popen
> from struct import Struct
> from array import array
>
>@@ -484,11 +485,11 @@ class GenFdsGlobalVariable:
>             Cmd += ("-o", Output)
>             Cmd += Input
>
>             SaveFileOnChange(CommandFile, ' '.join(Cmd), False)
>             if IsMakefile:
>-                if GlobalData.gGlobalDefines.get("FAMILY") == "MSFT":
>+                if sys.platform == "win32":
>                     Cmd = ['if', 'exist', Input[0]] + Cmd
>                 else:
>                     Cmd = ['-test', '-e', Input[0], "&&"] + Cmd
>                 if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:
>                     GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
>--
>2.20.1.windows.1

Re: [Patch 1/1] BaseTools: Fix a bug of genffs command generation

[Liming Gao]

Bob:
  I think this version patch is correct, because this case uses the different command in Makefile instead of the different syntax. 
 The command 'test' depends on batch environment. It is only available in bash, not in ms-dos. So, the check condition should be OS instead of make command.

Reviewed-by: Liming Gao <liming.gao@intel.com>

Thanks
Liming
>-----Original Message-----
>From: Feng, Bob C
>Sent: Friday, September 27, 2019 10:30 AM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
>Subject: [Patch 1/1] BaseTools: Fix a bug of genffs command generation
>
>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2221
>
>The command used by multiple thread genffs feature in makefile
>for testing if file exist is generated based on the toolchain family.
>It should be based on the OS type.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>index 4d8b2bdee299..bd97aa9dd208 100644
>--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>@@ -11,10 +11,11 @@
> #
> from __future__ import print_function
> from __future__ import absolute_import
>
> import Common.LongFilePathOs as os
>+import sys
> from sys import stdout
> from subprocess import PIPE,Popen
> from struct import Struct
> from array import array
>
>@@ -484,11 +485,11 @@ class GenFdsGlobalVariable:
>             Cmd += ("-o", Output)
>             Cmd += Input
>
>             SaveFileOnChange(CommandFile, ' '.join(Cmd), False)
>             if IsMakefile:
>-                if GlobalData.gGlobalDefines.get("FAMILY") == "MSFT":
>+                if sys.platform == "win32":
>                     Cmd = ['if', 'exist', Input[0]] + Cmd
>                 else:
>                     Cmd = ['-test', '-e', Input[0], "&&"] + Cmd
>                 if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:
>                     GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
>--
>2.20.1.windows.1

Re: [Patch 1/1] BaseTools: Fix a bug of genffs command generation

[Bob Feng]

Pushed at a1f94045ffe9218ec438c4d23980de4243d21cd0

-----Original Message-----
From: Gao, Liming 
Sent: Saturday, October 12, 2019 2:04 PM
To: Feng, Bob C <bob.c.feng@intel.com>; devel@edk2.groups.io
Subject: RE: [Patch 1/1] BaseTools: Fix a bug of genffs command generation

Bob:
  I think this version patch is correct, because this case uses the different command in Makefile instead of the different syntax. 
 The command 'test' depends on batch environment. It is only available in bash, not in ms-dos. So, the check condition should be OS instead of make command.

Reviewed-by: Liming Gao <liming.gao@intel.com>

Thanks
Liming
>-----Original Message-----
>From: Feng, Bob C
>Sent: Friday, September 27, 2019 10:30 AM
>To: devel@edk2.groups.io
>Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C 
><bob.c.feng@intel.com>
>Subject: [Patch 1/1] BaseTools: Fix a bug of genffs command generation
>
>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2221
>
>The command used by multiple thread genffs feature in makefile for 
>testing if file exist is generated based on the toolchain family.
>It should be based on the OS type.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>index 4d8b2bdee299..bd97aa9dd208 100644
>--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
>@@ -11,10 +11,11 @@
> #
> from __future__ import print_function
> from __future__ import absolute_import
>
> import Common.LongFilePathOs as os
>+import sys
> from sys import stdout
> from subprocess import PIPE,Popen
> from struct import Struct
> from array import array
>
>@@ -484,11 +485,11 @@ class GenFdsGlobalVariable:
>             Cmd += ("-o", Output)
>             Cmd += Input
>
>             SaveFileOnChange(CommandFile, ' '.join(Cmd), False)
>             if IsMakefile:
>-                if GlobalData.gGlobalDefines.get("FAMILY") == "MSFT":
>+                if sys.platform == "win32":
>                     Cmd = ['if', 'exist', Input[0]] + Cmd
>                 else:
>                     Cmd = ['-test', '-e', Input[0], "&&"] + Cmd
>                 if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:
>                     GenFdsGlobalVariable.SecCmdList.append(' 
>'.join(Cmd).strip())
>--
>2.20.1.windows.1