X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;fp=edksetup.bat;h=e065b6470a2b988d587b021e87524ad86cd9b738;hp=b69bd26857f573bc37c9e05437d6adb513bd0380;hb=cc7c6a37d4b4fbcccb3718384d98dcd48494fe90;hpb=08a41a25f43284d28a724fc8c74bda1d2c2f8528
diff --git a/edksetup.bat b/edksetup.bat
index b69bd26857..e065b6470a 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,7 +1,7 @@
@REM @file
@REM Windows batch file to setup a WORKSPACE environment
@REM
-@REM Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
@REM This program and the accompanying materials
@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
@@ -100,21 +100,23 @@ shift
:no_nt32
if /I "%1"=="NewBuild" shift
-if exist %WORKSPACE%\BaseTools (
- set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
-) else (
- if defined PACKAGES_PATH (
- for %%i IN (%PACKAGES_PATH%) DO (
- if exist %%~fi\BaseTools (
- set EDK_TOOLS_PATH=%%~fi\BaseTools
- goto checkBaseTools
+if not defined EDK_TOOLS_PATH (
+ if exist %WORKSPACE%\BaseTools (
+ set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+ ) else (
+ if defined PACKAGES_PATH (
+ for %%i IN (%PACKAGES_PATH%) DO (
+ if exist %%~fi\BaseTools (
+ set EDK_TOOLS_PATH=%%~fi\BaseTools
+ goto checkBaseTools
+ )
)
+ ) else (
+ echo.
+ echo !!! ERROR !!! Cannot find BaseTools !!!
+ echo.
+ goto BadBaseTools
)
- ) else (
- echo.
- echo !!! ERROR !!! Cannot find BaseTools !!!
- echo.
- goto BadBaseTools
)
)
if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%