X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=2c8c072884b87498f55c036065e9e170c296db95;hp=d81e7fd5edd300b75a6258b67dc4db826adcbeb5;hb=44446d10b098d1b05f03d450cb6290eb1a1de3b8;hpb=c16243d8e653b0a5febc2b0094f18d8171bab253

diff --git a/edksetup.bat b/edksetup.bat
index d81e7fd5ed..2c8c072884 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,8 +1,8 @@
 @REM @file
 @REM   Windows batch file to setup a WORKSPACE environment
 @REM
-@REM Copyright (c) 2006 - 2008, Intel Corporation
-@REM All rights reserved. This program and the accompanying materials
+@REM Copyright (c) 2006 - 2013, 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
 @REM http://opensource.org/licenses/bsd-license.php
@@ -29,8 +29,24 @@
 @REM
 pushd .
 cd %~dp0
+
+if not defined WORKSPACE (
+  @goto SetWorkSpace
+)
+
+if %WORKSPACE% == %CD% (
+  @REM Workspace is not changed.
+  @goto ParseArgs
+)
+
+: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=
 
+:ParseArgs
 @if /I "%1"=="-h" goto Usage
 @if /I "%1"=="-help" goto Usage
 @if /I "%1"=="--help" goto Usage
@@ -45,18 +61,26 @@ set WORKSPACE=%CD%
 @REM and headers to interface with Windows.
 
 if not defined VCINSTALLDIR (
-  if defined VS71COMNTOOLS (
-    call "%VS71COMNTOOLS%\vsvars32.bat"
+  if defined VS110COMNTOOLS (
+    call "%VS110COMNTOOLS%\vsvars32.bat"
   ) else (
-    if defined VS80COMNTOOLS (
-      call "%VS80COMNTOOLS%\vsvars32.bat"
+    if defined VS100COMNTOOLS (
+      call "%VS100COMNTOOLS%\vsvars32.bat"
     ) else (
       if defined VS90COMNTOOLS (
         call "%VS90COMNTOOLS%\vsvars32.bat"
       ) else (
-        echo.
-        echo !!! WARNING !!! Cannot find Visual Studio !!!
-        echo.
+        if defined VS80COMNTOOLS (
+          call "%VS80COMNTOOLS%\vsvars32.bat"
+        ) else (
+          if defined VS71COMNTOOLS (
+            call "%VS71COMNTOOLS%\vsvars32.bat"
+          ) else (
+            echo.
+            echo !!! WARNING !!! Cannot find Visual Studio !!!
+            echo.
+          )
+        )
       )
     )
   )