X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=91b83c637d21ead17e07639b06bc7b6b9af383bf;hp=37c1b2615955ceb3d26cffdb2af53eae74dd699b;hb=36ee91ca3661d3d020a7841aacbf858d885c4728;hpb=b7509087b09ea8e121aae348892205700a75dfdc

diff --git a/edksetup.bat b/edksetup.bat
index 37c1b26159..91b83c637d 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -32,9 +32,27 @@ pushd .
 cd %~dp0
 set WORKSPACE=%CD%
 
+@if /I "%1"=="-h" goto Usage
+@if /I "%1"=="-help" goto Usage
+@if /I "%1"=="--help" goto Usage
+@if /I "%1"=="/h" goto Usage
+@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
@@ -50,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
@@ -61,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.
 )
 
@@ -95,12 +112,6 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO
 
 :path_ok
 
-@if /I "%1"=="-h" goto Usage
-@if /I "%1"=="-help" goto Usage
-@if /I "%1"=="--help" goto Usage
-@if /I "%1"=="/h" goto Usage
-@if /I "%1"=="/?" goto Usage
-@if /I "%1"=="/help" goto Usage
 @if /I "%1"=="ForceRebuild" goto ForceBuild
 @if /I "%1"=="Reconfig" goto Reconfig
 
@@ -273,15 +284,18 @@ goto end
 
 :Usage
 echo.
-echo  Usage: %0 [Rebuild] [ForceRebuild] [Reconfig]
-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  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 (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
 echo  are not existed. Using option [Reconfig] to do the force copy. 
 echo.
+@goto end
 
 :NewBuild
 @IF NOT EXIST "BaseTools\toolsetup.bat" goto AntBuild