From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=195.135.221.5; helo=smtp.nue.novell.com; envelope-from=glin@suse.com; receiver=edk2-devel@lists.01.org Received: from smtp.nue.novell.com (smtp.nue.novell.com [195.135.221.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 447AC211F8899 for ; Wed, 27 Jun 2018 03:08:21 -0700 (PDT) Received: from localhost.localdomain (unknown.telstraglobal.net [134.159.103.118]) by smtp.nue.novell.com with ESMTP (NOT encrypted); Wed, 27 Jun 2018 12:08:18 +0200 From: Gary Lin To: edk2-devel@lists.01.org Cc: Yonghong Zhu , Liming Gao Date: Wed, 27 Jun 2018 18:07:57 +0800 Message-Id: <20180627100757.3405-4-glin@suse.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180627100757.3405-1-glin@suse.com> References: <20180627100757.3405-1-glin@suse.com> Subject: [PATCH 3/3] BaseTools: Read the env variable PYTHON_DEFAULT X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2018 10:08:22 -0000 When PYTHON_DEFAULT is set as "python3", the bash scripts in PosixLike will perfer python3. Currently, this is for the evaluation of the python3 support and errors from the python3 interperter are expected. For example, to build OvmfPkg with python3: $ export PYTHON_DEFAULT=python3 $ ./OvmfPkg/build.sh Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu Cc: Liming Gao Signed-off-by: Gary Lin --- BaseTools/BinWrappers/PosixLike/BPDG | 6 +++++- BaseTools/BinWrappers/PosixLike/Ecc | 6 +++++- BaseTools/BinWrappers/PosixLike/GenDepex | 6 +++++- BaseTools/BinWrappers/PosixLike/GenFds | 6 +++++- BaseTools/BinWrappers/PosixLike/GenPatchPcdTable | 6 +++++- BaseTools/BinWrappers/PosixLike/PatchPcdValue | 6 +++++- BaseTools/BinWrappers/PosixLike/Pkcs7Sign | 6 +++++- BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys | 6 +++++- BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign | 6 +++++- BaseTools/BinWrappers/PosixLike/TargetTool | 6 +++++- BaseTools/BinWrappers/PosixLike/Trim | 6 +++++- BaseTools/BinWrappers/PosixLike/UPT | 6 +++++- BaseTools/BinWrappers/PosixLike/build | 6 +++++- 13 files changed, 65 insertions(+), 13 deletions(-) diff --git a/BaseTools/BinWrappers/PosixLike/BPDG b/BaseTools/BinWrappers/PosixLike/BPDG index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/BPDG +++ b/BaseTools/BinWrappers/PosixLike/BPDG @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/Ecc b/BaseTools/BinWrappers/PosixLike/Ecc index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/Ecc +++ b/BaseTools/BinWrappers/PosixLike/Ecc @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/GenDepex b/BaseTools/BinWrappers/PosixLike/GenDepex index dad174788bc3..c311d76238e4 100755 --- a/BaseTools/BinWrappers/PosixLike/GenDepex +++ b/BaseTools/BinWrappers/PosixLike/GenDepex @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/GenFds b/BaseTools/BinWrappers/PosixLike/GenFds index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/GenFds +++ b/BaseTools/BinWrappers/PosixLike/GenFds @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable +++ b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/PatchPcdValue b/BaseTools/BinWrappers/PosixLike/PatchPcdValue index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/PatchPcdValue +++ b/BaseTools/BinWrappers/PosixLike/PatchPcdValue @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign +++ b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys index 1bc1054a3452..d6f3d0e23083 100755 --- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys +++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign +++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/TargetTool b/BaseTools/BinWrappers/PosixLike/TargetTool index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/TargetTool +++ b/BaseTools/BinWrappers/PosixLike/TargetTool @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/Trim b/BaseTools/BinWrappers/PosixLike/Trim index 6c8dde5bec3e..6ec76c3a45c9 100755 --- a/BaseTools/BinWrappers/PosixLike/Trim +++ b/BaseTools/BinWrappers/PosixLike/Trim @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/UPT b/BaseTools/BinWrappers/PosixLike/UPT index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/UPT +++ b/BaseTools/BinWrappers/PosixLike/UPT @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi diff --git a/BaseTools/BinWrappers/PosixLike/build b/BaseTools/BinWrappers/PosixLike/build index 01ae23ddeb4f..aef1bc444a64 100755 --- a/BaseTools/BinWrappers/PosixLike/build +++ b/BaseTools/BinWrappers/PosixLike/build @@ -1,8 +1,12 @@ #!/usr/bin/env bash #python `dirname $0`/RunToolFromSource.py `basename $0` $* +# If a python3 command is available and PYTHON_DEFAULT is "python3", +# use it in preference to python +if test "$PYTHON_DEFAULT" == "python3" && command -v python3 >/dev/null 2>&1; then + python_exe=python3 # If a python2 command is available, use it in preference to python -if command -v python2 >/dev/null 2>&1; then +elif command -v python2 >/dev/null 2>&1; then python_exe=python2 fi -- 2.17.1