From 0cd84daa676270e541f1e9e96d0660f8d37de4ac Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Fri, 25 Aug 2017 16:51:49 +0800 Subject: [PATCH] BaseTools: Update toolsetup.bat to support the case without EDK_TOOLS_BIN When EDK_TOOLS_BIN is not set, %EDK_TOOLS_PATH%\Bin\Win32 will be used as the binary tool directory. But, %EDK_TOOLS_PATH%\Bin\Win32 may not exist. On this case, toolsetup.bat should continue to do the other setting, such VS tool chain and tool conf file copy. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Reviewed-by: Yonghong Zhu --- BaseTools/toolsetup.bat | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 3801ce033f..51c276060d 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -118,16 +118,13 @@ if /I "%1"=="/?" goto Usage :set_PATH if defined WORKSPACE_TOOLS_PATH goto check_PATH if not defined EDK_TOOLS_BIN ( - if exist %EDK_TOOLS_PATH%\Bin\Win32 ( - set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32 - ) else ( - set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%" + set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32 + if not exist %EDK_TOOLS_PATH%\Bin\Win32 ( echo. echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!! echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32 echo Or configure EDK_TOOLS_BIN env to point Win32 directory. echo. - goto check_build_environment ) ) set PATH=%EDK_TOOLS_BIN%;%PATH% @@ -137,16 +134,13 @@ if /I "%1"=="/?" goto Usage :check_PATH if "%EDK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto PATH_ok if not defined EDK_TOOLS_BIN ( - if exist %EDK_TOOLS_PATH%\Bin\Win32 ( - set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32 - ) else ( - set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%" + set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32 + if not exist %EDK_TOOLS_PATH%\Bin\Win32 ( echo. echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!! echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32 echo Or configure EDK_TOOLS_BIN env to point Win32 directory. echo. - goto check_build_environment ) ) set PATH=%EDK_TOOLS_BIN%;%PATH% @@ -260,6 +254,7 @@ echo. if defined FORCE_REBUILD goto check_build_environment if defined REBUILD goto check_build_environment if not exist "%EDK_TOOLS_PATH%" goto check_build_environment +if not exist "%EDK_TOOLS_BIN%" goto check_build_environment IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_c_tools IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools -- 2.39.2