* [Patch] BaseTools: Fix the ending character for Linux script BuildEnv @ 2021-02-09 14:58 Bob Feng 2021-02-09 15:01 ` Leif Lindholm 0 siblings, 1 reply; 6+ messages in thread From: Bob Feng @ 2021-02-09 14:58 UTC (permalink / raw) To: devel Cc: Liming Gao, Yuwei Chen, Matthew Carlson, Michael D Kinney, Leif Lindholm 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: Matthew Carlson <matthewfcarlson@gmail.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Leif Lindholm <leif@nuviainc.com> --- BaseTools/BuildEnv | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index 8d283e10c0..275f4c5901 100755 --- a/BaseTools/BuildEnv +++ b/BaseTools/BuildEnv @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { break fi done fi fi - + PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh if [ -e $PREVIOUS_CONF_FILE ] then echo Loading previous configuration from $PREVIOUS_CONF_FILE . $PREVIOUS_CONF_FILE @@ -196,21 +196,21 @@ AddEdkToolsToPath() { return 1 fi EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` - # check if the edk2basetools pip package is available - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then - # if it is, use the pip version of the wrappers - echo "Using Pip Basetools" - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike - else - echo "Using EDK2 in-source Basetools" - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike - fi - - + # check if the edk2basetools pip package is available + if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then + # if it is, use the pip version of the wrappers + echo "Using Pip Basetools" + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike + else + echo "Using EDK2 in-source Basetools" + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike + fi + + AddDirToStartOfPath $EDK_TOOLS_PATH_BIN } CopySingleTemplateFile() { -- 2.29.1.windows.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv 2021-02-09 14:58 [Patch] BaseTools: Fix the ending character for Linux script BuildEnv Bob Feng @ 2021-02-09 15:01 ` Leif Lindholm 2021-02-09 15:03 ` Bob Feng 0 siblings, 1 reply; 6+ messages in thread From: Leif Lindholm @ 2021-02-09 15:01 UTC (permalink / raw) To: Bob Feng; +Cc: devel, Liming Gao, Yuwei Chen, Matthew Carlson, Michael D Kinney On Tue, Feb 09, 2021 at 22:58:08 +0800, Bob Feng wrote: > 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: Matthew Carlson <matthewfcarlson@gmail.com> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Cc: Leif Lindholm <leif@nuviainc.com> SMTP strips the intersting aspect, but as long as the end result is a BuildEnv that has no <CR> characters: Reviewed-by: Leif Lindholm <leif@nuviainc.com> > --- > BaseTools/BuildEnv | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv > index 8d283e10c0..275f4c5901 100755 > --- a/BaseTools/BuildEnv > +++ b/BaseTools/BuildEnv > @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { > break > fi > done > fi > fi > - > + > PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh > if [ -e $PREVIOUS_CONF_FILE ] > then > echo Loading previous configuration from $PREVIOUS_CONF_FILE > . $PREVIOUS_CONF_FILE > @@ -196,21 +196,21 @@ AddEdkToolsToPath() { > return 1 > fi > > EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` > > - # check if the edk2basetools pip package is available > - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > - # if it is, use the pip version of the wrappers > - echo "Using Pip Basetools" > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > - else > - echo "Using EDK2 in-source Basetools" > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > - fi > - > - > + # check if the edk2basetools pip package is available > + if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > + # if it is, use the pip version of the wrappers > + echo "Using Pip Basetools" > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > + else > + echo "Using EDK2 in-source Basetools" > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > + fi > + > + > AddDirToStartOfPath $EDK_TOOLS_PATH_BIN > > } > > CopySingleTemplateFile() { > -- > 2.29.1.windows.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv 2021-02-09 15:01 ` Leif Lindholm @ 2021-02-09 15:03 ` Bob Feng 2021-02-10 1:20 ` Michael D Kinney 0 siblings, 1 reply; 6+ messages in thread From: Bob Feng @ 2021-02-09 15:03 UTC (permalink / raw) To: Kinney, Michael D, Leif Lindholm Cc: devel@edk2.groups.io, Liming Gao, Chen, Christine, Matthew Carlson Hi Mike Could you help review this patch and push it? Liming may take leave now. Thanks, Bob -----Original Message----- From: Leif Lindholm <leif@nuviainc.com> Sent: Tuesday, February 9, 2021 11:01 PM To: Feng, Bob C <bob.c.feng@intel.com> Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson <matthewfcarlson@gmail.com>; Kinney, Michael D <michael.d.kinney@intel.com> Subject: Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv On Tue, Feb 09, 2021 at 22:58:08 +0800, Bob Feng wrote: > 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: Matthew Carlson <matthewfcarlson@gmail.com> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Cc: Leif Lindholm <leif@nuviainc.com> SMTP strips the intersting aspect, but as long as the end result is a BuildEnv that has no <CR> characters: Reviewed-by: Leif Lindholm <leif@nuviainc.com> > --- > BaseTools/BuildEnv | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index > 8d283e10c0..275f4c5901 100755 > --- a/BaseTools/BuildEnv > +++ b/BaseTools/BuildEnv > @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { > break > fi > done > fi > fi > - > + > PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh > if [ -e $PREVIOUS_CONF_FILE ] > then > echo Loading previous configuration from $PREVIOUS_CONF_FILE > . $PREVIOUS_CONF_FILE > @@ -196,21 +196,21 @@ AddEdkToolsToPath() { > return 1 > fi > > EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` > > - # check if the edk2basetools pip package is available > - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > - # if it is, use the pip version of the wrappers > - echo "Using Pip Basetools" > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > - else > - echo "Using EDK2 in-source Basetools" > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > - fi > - > - > + # check if the edk2basetools pip package is available if > + $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > + # if it is, use the pip version of the wrappers > + echo "Using Pip Basetools" > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > + else > + echo "Using EDK2 in-source Basetools" > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > + fi > + > + > AddDirToStartOfPath $EDK_TOOLS_PATH_BIN > > } > > CopySingleTemplateFile() { > -- > 2.29.1.windows.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv 2021-02-09 15:03 ` Bob Feng @ 2021-02-10 1:20 ` Michael D Kinney 2021-02-10 1:52 ` Michael D Kinney 0 siblings, 1 reply; 6+ messages in thread From: Michael D Kinney @ 2021-02-10 1:20 UTC (permalink / raw) To: Feng, Bob C, Leif Lindholm, Kinney, Michael D Cc: devel@edk2.groups.io, Liming Gao, Chen, Christine, Matthew Carlson Hi Bob, Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> It is difficult to see the changes. I did verify that the file before the patch had mixed line endings and the one after the patch is LF only line endings. Minor issues with Author name with a ','. I fixed that when I added the rb to the commit message. Best regards, Mike > -----Original Message----- > From: Feng, Bob C <bob.c.feng@intel.com> > Sent: Tuesday, February 9, 2021 7:03 AM > To: Kinney, Michael D <michael.d.kinney@intel.com>; Leif Lindholm <leif@nuviainc.com> > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson > <matthewfcarlson@gmail.com> > Subject: RE: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv > > Hi Mike > > Could you help review this patch and push it? > Liming may take leave now. > > Thanks, > Bob > > -----Original Message----- > From: Leif Lindholm <leif@nuviainc.com> > Sent: Tuesday, February 9, 2021 11:01 PM > To: Feng, Bob C <bob.c.feng@intel.com> > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson > <matthewfcarlson@gmail.com>; Kinney, Michael D <michael.d.kinney@intel.com> > Subject: Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv > > On Tue, Feb 09, 2021 at 22:58:08 +0800, Bob Feng wrote: > > 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: Matthew Carlson <matthewfcarlson@gmail.com> > > Cc: Michael D Kinney <michael.d.kinney@intel.com> > > Cc: Leif Lindholm <leif@nuviainc.com> > > SMTP strips the intersting aspect, but as long as the end result is a BuildEnv that has no <CR> characters: > Reviewed-by: Leif Lindholm <leif@nuviainc.com> > > > --- > > BaseTools/BuildEnv | 24 ++++++++++++------------ > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index > > 8d283e10c0..275f4c5901 100755 > > --- a/BaseTools/BuildEnv > > +++ b/BaseTools/BuildEnv > > @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { > > break > > fi > > done > > fi > > fi > > - > > + > > PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh > > if [ -e $PREVIOUS_CONF_FILE ] > > then > > echo Loading previous configuration from $PREVIOUS_CONF_FILE > > . $PREVIOUS_CONF_FILE > > @@ -196,21 +196,21 @@ AddEdkToolsToPath() { > > return 1 > > fi > > > > EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` > > > > - # check if the edk2basetools pip package is available > > - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > > - # if it is, use the pip version of the wrappers > > - echo "Using Pip Basetools" > > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > > - else > > - echo "Using EDK2 in-source Basetools" > > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > > - fi > > - > > - > > + # check if the edk2basetools pip package is available if > > + $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > > + # if it is, use the pip version of the wrappers > > + echo "Using Pip Basetools" > > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > > + else > > + echo "Using EDK2 in-source Basetools" > > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > > + fi > > + > > + > > AddDirToStartOfPath $EDK_TOOLS_PATH_BIN > > > > } > > > > CopySingleTemplateFile() { > > -- > > 2.29.1.windows.1 > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv 2021-02-10 1:20 ` Michael D Kinney @ 2021-02-10 1:52 ` Michael D Kinney 2021-02-10 9:54 ` Bob Feng 0 siblings, 1 reply; 6+ messages in thread From: Michael D Kinney @ 2021-02-10 1:52 UTC (permalink / raw) To: Feng, Bob C, Leif Lindholm, Kinney, Michael D Cc: devel@edk2.groups.io, Liming Gao, Chen, Christine, Matthew Carlson Pushed PR: https://github.com/tianocore/edk2/pull/1419 Commit: https://github.com/tianocore/edk2/pull/1419/commits/c10b513830e63fa4fc28f1edc43352de8d97b61f Mike > -----Original Message----- > From: Kinney, Michael D <michael.d.kinney@intel.com> > Sent: Tuesday, February 9, 2021 5:21 PM > To: Feng, Bob C <bob.c.feng@intel.com>; Leif Lindholm <leif@nuviainc.com>; Kinney, Michael D <michael.d.kinney@intel.com> > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson > <matthewfcarlson@gmail.com> > Subject: RE: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv > > Hi Bob, > > Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> > > It is difficult to see the changes. I did verify that the file before the patch had mixed line > endings and the one after the patch is LF only line endings. > > Minor issues with Author name with a ','. I fixed that when I added the rb to the commit message. > > Best regards, > > Mike > > > > -----Original Message----- > > From: Feng, Bob C <bob.c.feng@intel.com> > > Sent: Tuesday, February 9, 2021 7:03 AM > > To: Kinney, Michael D <michael.d.kinney@intel.com>; Leif Lindholm <leif@nuviainc.com> > > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson > > <matthewfcarlson@gmail.com> > > Subject: RE: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv > > > > Hi Mike > > > > Could you help review this patch and push it? > > Liming may take leave now. > > > > Thanks, > > Bob > > > > -----Original Message----- > > From: Leif Lindholm <leif@nuviainc.com> > > Sent: Tuesday, February 9, 2021 11:01 PM > > To: Feng, Bob C <bob.c.feng@intel.com> > > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson > > <matthewfcarlson@gmail.com>; Kinney, Michael D <michael.d.kinney@intel.com> > > Subject: Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv > > > > On Tue, Feb 09, 2021 at 22:58:08 +0800, Bob Feng wrote: > > > 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: Matthew Carlson <matthewfcarlson@gmail.com> > > > Cc: Michael D Kinney <michael.d.kinney@intel.com> > > > Cc: Leif Lindholm <leif@nuviainc.com> > > > > SMTP strips the intersting aspect, but as long as the end result is a BuildEnv that has no <CR> characters: > > Reviewed-by: Leif Lindholm <leif@nuviainc.com> > > > > > --- > > > BaseTools/BuildEnv | 24 ++++++++++++------------ > > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > > > diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index > > > 8d283e10c0..275f4c5901 100755 > > > --- a/BaseTools/BuildEnv > > > +++ b/BaseTools/BuildEnv > > > @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { > > > break > > > fi > > > done > > > fi > > > fi > > > - > > > + > > > PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh > > > if [ -e $PREVIOUS_CONF_FILE ] > > > then > > > echo Loading previous configuration from $PREVIOUS_CONF_FILE > > > . $PREVIOUS_CONF_FILE > > > @@ -196,21 +196,21 @@ AddEdkToolsToPath() { > > > return 1 > > > fi > > > > > > EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` > > > > > > - # check if the edk2basetools pip package is available > > > - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > > > - # if it is, use the pip version of the wrappers > > > - echo "Using Pip Basetools" > > > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > > > - else > > > - echo "Using EDK2 in-source Basetools" > > > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > > > - fi > > > - > > > - > > > + # check if the edk2basetools pip package is available if > > > + $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > > > + # if it is, use the pip version of the wrappers > > > + echo "Using Pip Basetools" > > > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > > > + else > > > + echo "Using EDK2 in-source Basetools" > > > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > > > + fi > > > + > > > + > > > AddDirToStartOfPath $EDK_TOOLS_PATH_BIN > > > > > > } > > > > > > CopySingleTemplateFile() { > > > -- > > > 2.29.1.windows.1 > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv 2021-02-10 1:52 ` Michael D Kinney @ 2021-02-10 9:54 ` Bob Feng 0 siblings, 0 replies; 6+ messages in thread From: Bob Feng @ 2021-02-10 9:54 UTC (permalink / raw) To: Kinney, Michael D, Leif Lindholm Cc: devel@edk2.groups.io, Liming Gao, Chen, Christine, Matthew Carlson Thank you Mike. Thanks, Bob -----Original Message----- From: Kinney, Michael D <michael.d.kinney@intel.com> Sent: Wednesday, February 10, 2021 9:53 AM To: Feng, Bob C <bob.c.feng@intel.com>; Leif Lindholm <leif@nuviainc.com>; Kinney, Michael D <michael.d.kinney@intel.com> Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson <matthewfcarlson@gmail.com> Subject: RE: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv Pushed PR: https://github.com/tianocore/edk2/pull/1419 Commit: https://github.com/tianocore/edk2/pull/1419/commits/c10b513830e63fa4fc28f1edc43352de8d97b61f Mike > -----Original Message----- > From: Kinney, Michael D <michael.d.kinney@intel.com> > Sent: Tuesday, February 9, 2021 5:21 PM > To: Feng, Bob C <bob.c.feng@intel.com>; Leif Lindholm > <leif@nuviainc.com>; Kinney, Michael D <michael.d.kinney@intel.com> > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, > Christine <yuwei.chen@intel.com>; Matthew Carlson > <matthewfcarlson@gmail.com> > Subject: RE: [Patch] BaseTools: Fix the ending character for Linux > script BuildEnv > > Hi Bob, > > Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> > > It is difficult to see the changes. I did verify that the file before > the patch had mixed line endings and the one after the patch is LF only line endings. > > Minor issues with Author name with a ','. I fixed that when I added the rb to the commit message. > > Best regards, > > Mike > > > > -----Original Message----- > > From: Feng, Bob C <bob.c.feng@intel.com> > > Sent: Tuesday, February 9, 2021 7:03 AM > > To: Kinney, Michael D <michael.d.kinney@intel.com>; Leif Lindholm > > <leif@nuviainc.com> > > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; > > Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson > > <matthewfcarlson@gmail.com> > > Subject: RE: [Patch] BaseTools: Fix the ending character for Linux > > script BuildEnv > > > > Hi Mike > > > > Could you help review this patch and push it? > > Liming may take leave now. > > > > Thanks, > > Bob > > > > -----Original Message----- > > From: Leif Lindholm <leif@nuviainc.com> > > Sent: Tuesday, February 9, 2021 11:01 PM > > To: Feng, Bob C <bob.c.feng@intel.com> > > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; > > Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson > > <matthewfcarlson@gmail.com>; Kinney, Michael D > > <michael.d.kinney@intel.com> > > Subject: Re: [Patch] BaseTools: Fix the ending character for Linux > > script BuildEnv > > > > On Tue, Feb 09, 2021 at 22:58:08 +0800, Bob Feng wrote: > > > 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: Matthew Carlson <matthewfcarlson@gmail.com> > > > Cc: Michael D Kinney <michael.d.kinney@intel.com> > > > Cc: Leif Lindholm <leif@nuviainc.com> > > > > SMTP strips the intersting aspect, but as long as the end result is a BuildEnv that has no <CR> characters: > > Reviewed-by: Leif Lindholm <leif@nuviainc.com> > > > > > --- > > > BaseTools/BuildEnv | 24 ++++++++++++------------ > > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > > > diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index > > > 8d283e10c0..275f4c5901 100755 > > > --- a/BaseTools/BuildEnv > > > +++ b/BaseTools/BuildEnv > > > @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { > > > break > > > fi > > > done > > > fi > > > fi > > > - > > > + > > > PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh > > > if [ -e $PREVIOUS_CONF_FILE ] > > > then > > > echo Loading previous configuration from $PREVIOUS_CONF_FILE > > > . $PREVIOUS_CONF_FILE > > > @@ -196,21 +196,21 @@ AddEdkToolsToPath() { > > > return 1 > > > fi > > > > > > EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` > > > > > > - # check if the edk2basetools pip package is available > > > - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > > > - # if it is, use the pip version of the wrappers > > > - echo "Using Pip Basetools" > > > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > > > - else > > > - echo "Using EDK2 in-source Basetools" > > > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > > > - fi > > > - > > > - > > > + # check if the edk2basetools pip package is available if > > > + $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > > > + # if it is, use the pip version of the wrappers > > > + echo "Using Pip Basetools" > > > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > > > + else > > > + echo "Using EDK2 in-source Basetools" > > > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > > > + fi > > > + > > > + > > > AddDirToStartOfPath $EDK_TOOLS_PATH_BIN > > > > > > } > > > > > > CopySingleTemplateFile() { > > > -- > > > 2.29.1.windows.1 > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-10 9:54 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-02-09 14:58 [Patch] BaseTools: Fix the ending character for Linux script BuildEnv Bob Feng 2021-02-09 15:01 ` Leif Lindholm 2021-02-09 15:03 ` Bob Feng 2021-02-10 1:20 ` Michael D Kinney 2021-02-10 1:52 ` Michael D Kinney 2021-02-10 9:54 ` Bob Feng
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox