We have a new simple and effective method to resolve the original issue
that the PATH env's update error when the path contains space, so this
patch remove the last check in and use the new method to fix the original
issue.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong....@intel.com>
---
toolsetup.bat | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/toolsetup.bat b/toolsetup.bat
index 310ddd0..76fd8bb 100755
--- a/toolsetup.bat
+++ b/toolsetup.bat
@@ -320,28 +320,17 @@ goto end
if not defined PYTHON_FREEZER_PATH (
echo.
echo !!! WARNING !!! Will not be able to compile Python programs to .exe
echo Will setup environment to run Python scripts directly.
echo.
- goto UpdatePATH
+ set "PATH=%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%"
+ set "PATH=%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%"
+ set "PATH=%BASETOOLS_PYTHON_SOURCE%\build;%PATH%"
+ set PATHEXT=%PATHEXT%;.py
)
- else (
- goto UpdateEnv
- )
- )
- else (
- goto UpdateEnv
)
-
-:UpdatePATH
- set PATH=%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%
- set PATH=%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%
- set PATH=%BASETOOLS_PYTHON_SOURCE%\build;%PATH%
- set PATHEXT=%PATHEXT%;.py
- goto UpdateEnv
-
-:UpdateEnv
+
echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH%
echo PYTHON_PATH = %PYTHON_PATH%
echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%
echo.
--
2.6.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
