X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=e065b6470a2b988d587b021e87524ad86cd9b738;hp=b63c29916b0622d3b319751175e67e77398807b6;hb=fd096a99a99bd2d59ad6619b53477e6365df8850;hpb=dcc807869986f9e4e5afdf62206f467bec261bc8

diff --git a/edksetup.bat b/edksetup.bat
index b63c29916b..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
@@ -63,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.
+              )
             )
           )
         )
@@ -96,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%