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

diff --git a/edksetup.bat b/edksetup.bat
index 2f7fedef33..91b83c637d 100644
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -28,8 +28,33 @@
 @REM
 @REM Set the WORKSPACE to the current working directory
 @REM
+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
+
+:check_new_build
 @if /I "%1"=="NewBuild" goto NewBuild
 
 :AntBuild
@@ -40,10 +65,10 @@ set WORKSPACE=%CD%
 :check_vc
 if defined VCINSTALLDIR goto check_cygwin
 if defined VS71COMNTOOLS (
-  call "%VS71COMNTOOLS%\vsvars32.bat"
+ call "%VS71COMNTOOLS%\vsvars32.bat"
 ) else (
   echo.
-  echo !!! WARNING !!!! Cannot find Visual Studio !!!
+  echo !!! WARNING !!! Cannot find Visual Studio !!!
   echo.
 )
 
@@ -53,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.
 )
 
@@ -87,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
 
@@ -265,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
@@ -282,5 +304,6 @@ if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
 @goto end
 
 :end
+@popd
 @echo on