summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Lin <glin@suse.com>2018-07-13 18:18:41 +0800
committerYonghong Zhu <yonghong.zhu@intel.com>2018-07-16 11:22:16 +0800
commite52b39ab8e9911dacb2c83a87bfe483397f1ea5f (patch)
treeb54a7cfb2f51ca61b6f3cf89badeba150e5def67
parentf3fc5b47ad195dd9e2b644cb294448a386e18a53 (diff)
downloadedk2-e52b39ab8e9911dacb2c83a87bfe483397f1ea5f.tar.gz
edk2-e52b39ab8e9911dacb2c83a87bfe483397f1ea5f.tar.bz2
edk2-e52b39ab8e9911dacb2c83a87bfe483397f1ea5f.zip
BaseTools: Treat Ecc.py as a python module
Since Ecc.py import modules from its own directory, add "-m" to the python parameters so that they can import its own modules after adopting absolute import. Contributed-under: TianoCore Contribution Agreement 1.1 Cc: Yonghong Zhu <yonghong.zhu@intel.com> Cc: Liming Gao <liming.gao@intel.com> Signed-off-by: Gary Lin <glin@suse.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
-rwxr-xr-xBaseTools/BinWrappers/PosixLike/Ecc2
-rw-r--r--BaseTools/BinWrappers/WindowsLike/Ecc.bat3
2 files changed, 3 insertions, 2 deletions
diff --git a/BaseTools/BinWrappers/PosixLike/Ecc b/BaseTools/BinWrappers/PosixLike/Ecc
index 01ae23ddeb..bca1bae96a 100755
--- a/BaseTools/BinWrappers/PosixLike/Ecc
+++ b/BaseTools/BinWrappers/PosixLike/Ecc
@@ -11,4 +11,4 @@ dir=$(dirname "$full_cmd")
cmd=${full_cmd##*/}
export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
-exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
+exec "${python_exe:-python}" -m $cmd.$cmd "$@"
diff --git a/BaseTools/BinWrappers/WindowsLike/Ecc.bat b/BaseTools/BinWrappers/WindowsLike/Ecc.bat
index 9fbb704a6e..98095cfbd4 100644
--- a/BaseTools/BinWrappers/WindowsLike/Ecc.bat
+++ b/BaseTools/BinWrappers/WindowsLike/Ecc.bat
@@ -1,3 +1,4 @@
@setlocal
@set ToolName=%~n0%
-@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
+@set PYTHONPATH=%PYTHONPATH%;%BASE_TOOLS_PATH%\Source\Python
+@%PYTHON_HOME%\python.exe -m %ToolName%.%ToolName% %*