X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=e065b6470a2b988d587b021e87524ad86cd9b738;hp=25a5a6e8d7e37f11ab7f0ffd8c4f332c6e16514e;hb=520a0746dc0e7212e22894dfffa7cec5c035f137;hpb=b176333801d0f4e7593579ec3d86163224ed6ed8

diff --git a/edksetup.bat b/edksetup.bat
index 25a5a6e8d7..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 - 2014, 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 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
@@ -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
@@ -61,27 +63,31 @@ if /I not "%1"=="--nt32" goto no_nt32
 @REM and headers to interface with Windows.
 
 if not defined VCINSTALLDIR (
-  if defined VS120COMNTOOLS (
-    call "%VS120COMNTOOLS%\vsvars32.bat"
+  if defined VS140COMNTOOLS (
+    call "%VS140COMNTOOLS%\vsvars32.bat"
   ) else (
-    if defined VS110COMNTOOLS (
-      call "%VS110COMNTOOLS%\vsvars32.bat"
-    ) else (
-      if defined VS100COMNTOOLS (
-        call "%VS100COMNTOOLS%\vsvars32.bat"
+    if defined VS120COMNTOOLS (
+      call "%VS120COMNTOOLS%\vsvars32.bat"
+    ) else (	
+      if defined VS110COMNTOOLS (
+        call "%VS110COMNTOOLS%\vsvars32.bat"
       ) else (
-        if defined VS90COMNTOOLS (
-          call "%VS90COMNTOOLS%\vsvars32.bat"
+        if defined VS100COMNTOOLS (
+          call "%VS100COMNTOOLS%\vsvars32.bat"
         ) else (
-          if defined VS80COMNTOOLS (
-            call "%VS80COMNTOOLS%\vsvars32.bat"
+          if defined VS90COMNTOOLS (
+            call "%VS90COMNTOOLS%\vsvars32.bat"
           ) else (
-            if defined VS71COMNTOOLS (
-              call "%VS71COMNTOOLS%\vsvars32.bat"
+            if defined VS80COMNTOOLS (
+              call "%VS80COMNTOOLS%\vsvars32.bat"
             ) else (
-              echo.
-              echo !!! WARNING !!! Cannot find Visual Studio !!!
-              echo.
+              if defined VS71COMNTOOLS (
+                call "%VS71COMNTOOLS%\vsvars32.bat"
+              ) else (
+                echo.
+                echo !!! WARNING !!! Cannot find Visual Studio !!!
+                echo.
+              )
             )
           )
         )
@@ -92,8 +98,30 @@ if not defined VCINSTALLDIR (
 shift
 
 :no_nt32
+
 if /I "%1"=="NewBuild" shift
-set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+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
+    )
+  )
+)
+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