X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=33301542785f07a53a536983988802ad4c6f76af;hp=4412ac27ed0fbb4e47d5fdf050774ddae7fe0730;hb=f43b0774f2a094bed3b71664c39db6515a688289;hpb=3a6b4559e5182bd50a2f1de5abe5373d6c379388

diff --git a/edksetup.bat b/edksetup.bat
index 4412ac27ed..3330154278 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -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
@@ -51,9 +67,13 @@ if not defined VCINSTALLDIR (
     if defined VS80COMNTOOLS (
       call "%VS80COMNTOOLS%\vsvars32.bat"
     ) else (
-      echo.
-      echo !!! WARNING !!! Cannot find Visual Studio !!!
-      echo.
+      if defined VS90COMNTOOLS (
+        call "%VS90COMNTOOLS%\vsvars32.bat"
+      ) else (
+        echo.
+        echo !!! WARNING !!! Cannot find Visual Studio !!!
+        echo.
+      )
     )
   )
 )