From 1834aeeac68677cb2040b101428966a5654d73dc Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Tue, 17 Nov 2015 07:45:04 +0000 Subject: BaseTools/toolsetup.bat: fixed the error when the path contains space when the path contains space, it will report error for PATH Environment update. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18852 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/toolsetup.bat | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 59874c5839..310ddd030c 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -322,13 +322,24 @@ goto end echo !!! WARNING !!! Will not be able to compile Python programs to .exe echo Will setup environment to run Python scripts directly. echo. - 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 UpdatePATH ) + 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% -- cgit v1.2.3