From d25c096d27e5b67aed38cadb76ea8fde81655596 Mon Sep 17 00:00:00 2001 From: Yunhua Feng Date: Tue, 25 Sep 2018 12:25:30 +0800 Subject: [PATCH] BaseTools: Use PYTHON3 variable instead of PYTHON_HOME Use PYTHON3 variable instead of PYTHON_HOME path Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yunhua Feng Reviewed-by: Liming Gao --- BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc | 6 +++--- BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex | 6 +++--- BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds | 6 +++--- BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool | 6 +++--- BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim | 6 +++--- BaseTools/Bin/CYGWIN_NT-5.1-i686/build | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc index 214d88fff1..0b173eb33c 100755 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc @@ -1,9 +1,9 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* -# If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then - python_exe=python2 +# If a $PYTHON3 command is available, use it in preference to python +if command -v $PYTHON3 >/dev/null 2>&1; then + python_exe=$PYTHON3 fi full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex index 214d88fff1..0b173eb33c 100755 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex @@ -1,9 +1,9 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* -# If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then - python_exe=python2 +# If a $PYTHON3 command is available, use it in preference to python +if command -v $PYTHON3 >/dev/null 2>&1; then + python_exe=$PYTHON3 fi full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds index 214d88fff1..0b173eb33c 100755 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds @@ -1,9 +1,9 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* -# If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then - python_exe=python2 +# If a $PYTHON3 command is available, use it in preference to python +if command -v $PYTHON3 >/dev/null 2>&1; then + python_exe=$PYTHON3 fi full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool b/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool index 214d88fff1..0b173eb33c 100755 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool @@ -1,9 +1,9 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* -# If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then - python_exe=python2 +# If a $PYTHON3 command is available, use it in preference to python +if command -v $PYTHON3 >/dev/null 2>&1; then + python_exe=$PYTHON3 fi full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim index 7cac4f7c4f..736ff12f14 100755 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim @@ -1,9 +1,9 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* -# If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then - python_exe=python2 +# If a $PYTHON3 command is available, use it in preference to python +if command -v $PYTHON3 >/dev/null 2>&1; then + python_exe=$PYTHON3 fi full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/build b/BaseTools/Bin/CYGWIN_NT-5.1-i686/build index 214d88fff1..0b173eb33c 100755 --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/build +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/build @@ -1,9 +1,9 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* -# If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then - python_exe=python2 +# If a $PYTHON3 command is available, use it in preference to python +if command -v $PYTHON3 >/dev/null 2>&1; then + python_exe=$PYTHON3 fi full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here