remove member context from _EFI_MTFTP4_TOKEN structure.

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 9bb95a54862394e6136f93b5d14c34d787f84770..91b83c637d21ead17e07639b06bc7b6b9af383bf 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -39,8 +39,20 @@ set WORKSPACE=%CD%
 @if /I "%1"=="/?" goto Usage\r
 @if /I "%1"=="/help" goto Usage\r
 @if /I not "%1"=="--nt32" goto check_new_build\r
+if not defined VCINSTALLDIR (\r
+  if defined VS71COMNTOOLS (\r
+    call "%VS71COMNTOOLS%\vsvars32.bat"\r
+  ) else (\r
+    if defined VS80COMNTOOLS (\r
+      call "%VS80COMNTOOLS%\vsvars32.bat"\r
+    ) else (\r
+      echo.\r
+      echo !!! WARNING !!! Cannot find Visual Studio !!!\r
+      echo.\r
+    )\r
+  )\r
+)\r
 shift\r
-goto check_vc\r
 \r
 :check_new_build\r
 @if /I "%1"=="NewBuild" goto NewBuild\r
@@ -51,21 +63,14 @@ goto check_vc
 @REM\r
 \r
 :check_vc\r
-@REM The following setup is required for building the Nt32Pkg\Nt32.dsc\r
-@REM platform emulation environment.\r
 if defined VCINSTALLDIR goto check_cygwin\r
 if defined VS71COMNTOOLS (\r
- @REM Use Visual Studio .NET 2003 if it is installed\r
  call "%VS71COMNTOOLS%\vsvars32.bat"\r
-) else if defined VS80COMNTOOLS (\r
- @REM Use Visual Studio 2005 iff Visual Studio .NET 2003 is not installed.\r
- call "%VS80COMNTOOLS%\vsvars32.bat"\r
 ) else (\r
   echo.\r
-  echo !!! WARNING !!!! Cannot find Visual Studio !!!\r
+  echo !!! WARNING !!! Cannot find Visual Studio !!!\r
   echo.\r
 )\r
-goto check_new_build\r
 \r
 :check_cygwin\r
 if defined CYGWIN_HOME goto check_java\r
@@ -73,7 +78,7 @@ if exist c:\cygwin (
   set CYGWIN_HOME=c:\cygwin\r
 ) else (\r
   echo.\r
-  echo !!! WARNING !!!! Not set CYGWIN_HOME, gcc build may not be used !!!\r
+  echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!\r
   echo.\r
 )\r
 \r
@@ -279,12 +284,12 @@ goto end
 \r
 :Usage\r
 echo.\r
-echo  Usage: %0 [--nt32] [NewBuild] [Rebuild] [ForceRebuild] [Reconfig]\r
+echo  Usage: "%0 [--nt32] [NewBuild | Rebuild | ForceRebuild | Reconfig]"\r
 echo         --nt32         Call vsvars32.bat for NT32 platform build\r
 echo         NewBuild       Using new build tools in BaseTools package\r
-echo         Rebuild:       Incremental build, only build those updated tools; \r
-echo         ForceRebuild:  Rebuild all tools neither updated or not; \r
-echo         Reconfig:      Reinstall target.txt, tools_def.txt, FrameworkDatabase.db. \r
+echo         Rebuild        Incremental build, only build those updated tools (Ant build only)\r
+echo         ForceRebuild   Rebuild all tools neither updated or not (Ant build only)\r
+echo         Reconfig       Reinstall target.txt, tools_def.txt, FrameworkDatabase.db (Ant build only) \r
 echo.\r
 echo  Note that target.template, tools_def.template, FrameworkDatabase.template will be\r
 echo  only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectively if they\r