X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=edksetup.bat;h=f6e0ae6c953fdd7ba88fb8699f68f03c70774fe1;hb=50fe73a1aa8599e31af9ed8f59fcf95e8c58642a;hp=7c7f52f6dd145c0c96a8b7286716383cdcb2fd7d;hpb=d27bd9e95b313435fb243dbebc5dd10da4798c13;p=mirror_edk2.git

diff --git a/edksetup.bat b/edksetup.bat
index 7c7f52f6dd..f6e0ae6c95 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 - 2012, 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
@@ -30,13 +30,16 @@
 pushd .
 cd %~dp0
 
-if defined WORKSPACE (
-  if %WORKSPACE% == %CD% (
-    @REM workspace is not changed.
-    @goto ParseArgs
-  )
+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%
@@ -58,18 +61,22 @@ set EDK_SOURCE=
 @REM and headers to interface with Windows.
 
 if not defined VCINSTALLDIR (
-  if defined VS71COMNTOOLS (
-    call "%VS71COMNTOOLS%\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 VS90COMNTOOLS (
-        call "%VS90COMNTOOLS%\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.
+        )
       )
     )
   )