Update edksetup.bat to check EDK_TOOLS_PATH before set it.

If EDK_TOOLS_PATH is set, then not set it again.
If EDK_TOOLS_PATH is not set, then set it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Liming Gao 2016-04-08 13:32:07 +08:00
parent 08a41a25f4
commit cc7c6a37d4

View File

@ -1,7 +1,7 @@
@REM @file @REM @file
@REM Windows batch file to setup a WORKSPACE environment @REM Windows batch file to setup a WORKSPACE environment
@REM @REM
@REM Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> @REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
@REM This program and the accompanying materials @REM This program and the accompanying materials
@REM are licensed and made available under the terms and conditions of the BSD License @REM are licensed and made available under the terms and conditions of the BSD License
@REM which accompanies this distribution. The full text of the license may be found at @REM which accompanies this distribution. The full text of the license may be found at
@ -100,21 +100,23 @@ shift
:no_nt32 :no_nt32
if /I "%1"=="NewBuild" shift if /I "%1"=="NewBuild" shift
if exist %WORKSPACE%\BaseTools ( if not defined EDK_TOOLS_PATH (
set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools if exist %WORKSPACE%\BaseTools (
) else ( set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
if defined PACKAGES_PATH (
for %%i IN (%PACKAGES_PATH%) DO (
if exist %%~fi\BaseTools (
set EDK_TOOLS_PATH=%%~fi\BaseTools
goto checkBaseTools
)
)
) else ( ) else (
echo. if defined PACKAGES_PATH (
echo !!! ERROR !!! Cannot find BaseTools !!! for %%i IN (%PACKAGES_PATH%) DO (
echo. if exist %%~fi\BaseTools (
goto BadBaseTools set EDK_TOOLS_PATH=%%~fi\BaseTools
goto checkBaseTools
)
)
) else (
echo.
echo !!! ERROR !!! Cannot find BaseTools !!!
echo.
goto BadBaseTools
)
) )
) )
if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH% if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%