diff options
| author | Liming Gao <liming.gao@intel.com> | 2017-08-25 16:51:49 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2017-08-29 09:30:32 +0800 |
| commit | 0cd84daa676270e541f1e9e96d0660f8d37de4ac (patch) | |
| tree | d9ea273e3cc3e663a2342e9d8983bbe3faf39c4f /BaseTools/toolsetup.bat | |
| parent | 578211b882fa99b1f7c82c3e5fd7eeee1510772c (diff) | |
| download | edk2-0cd84daa676270e541f1e9e96d0660f8d37de4ac.tar.gz | |
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>
Diffstat (limited to 'BaseTools/toolsetup.bat')
| -rwxr-xr-x | BaseTools/toolsetup.bat | 15 |
1 files 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
|