[Patch] BaseTools: Correct bin wrappers for GenDepex.py path

[Patch] BaseTools: Correct bin wrappers for GenDepex.py path

[Yonghong Zhu]

The WindowsLike and PosixLike bin wrappers for GenDepex.py do not use
correct path. GenDepex.py is not in a GenDepex directory. Instead, it is
in the AutoGen directory.

Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=292
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/BinWrappers/PosixLike/GenDepex       | 2 +-
 BaseTools/BinWrappers/WindowsLike/GenDepex.bat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/BinWrappers/PosixLike/GenDepex b/BaseTools/BinWrappers/PosixLike/GenDepex
index 214d88f..bdb6722 100755
--- a/BaseTools/BinWrappers/PosixLike/GenDepex
+++ b/BaseTools/BinWrappers/PosixLike/GenDepex
@@ -9,6 +9,6 @@ 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
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
 export PYTHONPATH="$dir/../../Source/Python"
-exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
+exec "${python_exe:-python}" "$dir/../../Source/Python/AutoGen/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/WindowsLike/GenDepex.bat b/BaseTools/BinWrappers/WindowsLike/GenDepex.bat
index 9fbb704..ffc783d 100644
--- a/BaseTools/BinWrappers/WindowsLike/GenDepex.bat
+++ b/BaseTools/BinWrappers/WindowsLike/GenDepex.bat
@@ -1,3 +1,3 @@
 @setlocal
 @set ToolName=%~n0%
-@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
+@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\AutoGen\%ToolName%.py %*
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Correct bin wrappers for GenDepex.py path

[Gao, Liming]

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

> -----Original Message-----
> From: Zhu, Yonghong
> Sent: Monday, December 19, 2016 11:30 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [Patch] BaseTools: Correct bin wrappers for GenDepex.py path
> 
> The WindowsLike and PosixLike bin wrappers for GenDepex.py do not use
> correct path. GenDepex.py is not in a GenDepex directory. Instead, it is
> in the AutoGen directory.
> 
> Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=292
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/BinWrappers/PosixLike/GenDepex       | 2 +-
>  BaseTools/BinWrappers/WindowsLike/GenDepex.bat | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/BinWrappers/PosixLike/GenDepex
> b/BaseTools/BinWrappers/PosixLike/GenDepex
> index 214d88f..bdb6722 100755
> --- a/BaseTools/BinWrappers/PosixLike/GenDepex
> +++ b/BaseTools/BinWrappers/PosixLike/GenDepex
> @@ -9,6 +9,6 @@ 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
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
>  export PYTHONPATH="$dir/../../Source/Python"
> -exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py"
> "$@"
> +exec "${python_exe:-python}"
> "$dir/../../Source/Python/AutoGen/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/WindowsLike/GenDepex.bat
> b/BaseTools/BinWrappers/WindowsLike/GenDepex.bat
> index 9fbb704..ffc783d 100644
> --- a/BaseTools/BinWrappers/WindowsLike/GenDepex.bat
> +++ b/BaseTools/BinWrappers/WindowsLike/GenDepex.bat
> @@ -1,3 +1,3 @@
>  @setlocal
>  @set ToolName=%~n0%
> -
> @%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%
> ToolName%\%ToolName%.py %*
> +@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\
> AutoGen\%ToolName%.py %*
> --
> 2.6.1.windows.1