diff options
| author | Jeff Fan <jeff.fan@intel.com> | 2015-12-01 06:13:41 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-01 06:13:41 +0000 |
| commit | 76c092589ed74931ece00e3505979d80042f7b50 (patch) | |
| tree | 5abbeaf57dc4efec65b6b7eda5d3f942918f728d /edksetup.bat | |
| parent | 955b2d2e7b446488bb9333910e440c0b0f09f78e (diff) | |
| download | edk2-platforms-76c092589ed74931ece00e3505979d80042f7b50.tar.xz | |
Sync the files in root dirctory from main trunk r19027.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19081 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'edksetup.bat')
| -rwxr-xr-x | edksetup.bat | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/edksetup.bat b/edksetup.bat index 25a5a6e8d7..b63c29916b 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -42,9 +42,11 @@ if %WORKSPACE% == %CD% ( :SetWorkSpace
@REM set new workspace
@REM clear EFI_SOURCE and EDK_SOURCE for the new workspace
-set WORKSPACE=%CD%
-set EFI_SOURCE=
-set EDK_SOURCE=
+if not defined WORKSPACE (
+ set WORKSPACE=%CD%
+ set EFI_SOURCE=
+ set EDK_SOURCE=
+)
:ParseArgs
if /I "%1"=="-h" goto Usage
@@ -92,8 +94,28 @@ if not defined VCINSTALLDIR ( shift
:no_nt32
+
if /I "%1"=="NewBuild" shift
-set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+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
+ )
+)
+if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%
+
+:checkBaseTools
IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools
call %EDK_TOOLS_PATH%\toolsetup.bat %*
if /I "%1"=="Reconfig" shift
|