tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Liming Gao 2017-08-25 16:51:49 +08:00
parent 578211b882
commit 0cd84daa67
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BaseTools/toolsetup.bat
View File

@ -118,16 +118,13 @@ if /I "%1"=="/?" goto Usage
:set_PATH :set_PATH
if defined WORKSPACE_TOOLS_PATH goto check_PATH if defined WORKSPACE_TOOLS_PATH goto check_PATH
if not defined EDK_TOOLS_BIN ( if not defined EDK_TOOLS_BIN (
if exist %EDK_TOOLS_PATH%\Bin\Win32 ( set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32 if not exist %EDK_TOOLS_PATH%\Bin\Win32 (
) else (
set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"
echo. echo.
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!! echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32 echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
echo Or configure EDK_TOOLS_BIN env to point Win32 directory. echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
echo. echo.
goto check_build_environment
) )
) )
set PATH=%EDK_TOOLS_BIN%;%PATH% set PATH=%EDK_TOOLS_BIN%;%PATH%
@ -137,16 +134,13 @@ if /I "%1"=="/?" goto Usage
:check_PATH :check_PATH
if "%EDK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto PATH_ok if "%EDK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto PATH_ok
if not defined EDK_TOOLS_BIN ( if not defined EDK_TOOLS_BIN (
if exist %EDK_TOOLS_PATH%\Bin\Win32 ( set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32 if not exist %EDK_TOOLS_PATH%\Bin\Win32 (
) else (
set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"
echo. echo.
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!! echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32 echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
echo Or configure EDK_TOOLS_BIN env to point Win32 directory. echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
echo. echo.
goto check_build_environment
) )
) )
set PATH=%EDK_TOOLS_BIN%;%PATH% set PATH=%EDK_TOOLS_BIN%;%PATH%
@ -260,6 +254,7 @@ echo.
if defined FORCE_REBUILD goto check_build_environment if defined FORCE_REBUILD goto check_build_environment
if defined 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_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%\BootSectImage.exe" goto check_c_tools
IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools