X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=edksetup.bat;h=91b83c637d21ead17e07639b06bc7b6b9af383bf;hb=c713e7c8a0eeebb3b2c22beb4aa85d1be07942d5;hp=d91bd1cf0b8d5a0e64501a320e9e75eef8a830b7;hpb=19ed1f42ffbf4c4e710258e581b78c62bfd18a8a;p=mirror_edk2.git

diff --git a/edksetup.bat b/edksetup.bat
index d91bd1cf0b..91b83c637d 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -39,8 +39,20 @@ set WORKSPACE=%CD%
 @if /I "%1"=="/?" goto Usage
 @if /I "%1"=="/help" goto Usage
 @if /I not "%1"=="--nt32" goto check_new_build
+if not defined VCINSTALLDIR (
+  if defined VS71COMNTOOLS (
+    call "%VS71COMNTOOLS%\vsvars32.bat"
+  ) else (
+    if defined VS80COMNTOOLS (
+      call "%VS80COMNTOOLS%\vsvars32.bat"
+    ) else (
+      echo.
+      echo !!! WARNING !!! Cannot find Visual Studio !!!
+      echo.
+    )
+  )
+)
 shift
-goto check_vc
 
 :check_new_build
 @if /I "%1"=="NewBuild" goto NewBuild
@@ -56,10 +68,9 @@ if defined VS71COMNTOOLS (
  call "%VS71COMNTOOLS%\vsvars32.bat"
 ) else (
   echo.
-  echo !!! WARNING !!!! Cannot find Visual Studio !!!
+  echo !!! WARNING !!! Cannot find Visual Studio !!!
   echo.
 )
-goto check_new_build
 
 :check_cygwin
 if defined CYGWIN_HOME goto check_java
@@ -67,7 +78,7 @@ if exist c:\cygwin (
   set CYGWIN_HOME=c:\cygwin
 ) else (
   echo.
-  echo !!! WARNING !!!! Not set CYGWIN_HOME, gcc build may not be used !!!
+  echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!
   echo.
 )
 
@@ -273,12 +284,12 @@ goto end
 
 :Usage
 echo.
-echo  Usage: %0 [--nt32] [NewBuild] [Rebuild] [ForceRebuild] [Reconfig]
+echo  Usage: "%0 [--nt32] [NewBuild | Rebuild | ForceRebuild | Reconfig]"
 echo         --nt32         Call vsvars32.bat for NT32 platform build
 echo         NewBuild       Using new build tools in BaseTools package
-echo         Rebuild:       Incremental build, only build those updated tools; 
-echo         ForceRebuild:  Rebuild all tools neither updated or not; 
-echo         Reconfig:      Reinstall target.txt, tools_def.txt, FrameworkDatabase.db. 
+echo         Rebuild        Incremental build, only build those updated tools (Ant build only)
+echo         ForceRebuild   Rebuild all tools neither updated or not (Ant build only)
+echo         Reconfig       Reinstall target.txt, tools_def.txt, FrameworkDatabase.db (Ant build only) 
 echo.
 echo  Note that target.template, tools_def.template, FrameworkDatabase.template will be
 echo  only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectively if they
@@ -287,9 +298,9 @@ echo.
 @goto end
 
 :NewBuild
-@IF NOT EXIST "Tools\BaseTools\toolsetup.bat" goto AntBuild
-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\Tools\BaseTools
-@call Tools\BaseTools\toolsetup.bat
+@IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild
+if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+@call BaseTools\toolsetup.bat
 @goto end
 
 :end