BaseTools: suppress usage instructions with rebuild options

When using edksetup.bat Rebuild, the script outputs usage instructions
to the console, when no usage error is encountered.  Update the usage
instructions and suppress these usage instructions when using the
Rebuild, ForceRebuild options.

Change-Id: Ica98e19f3d5198df2519106e4c55314c255e04ac
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chris Ruffin <chris.ruffin@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/edksetup.bat b/edksetup.bat
index 7aa167549bb2d88c08723338641149a43d4dcf0b..97e2330e8c68956a166f0a7d7f0ade073fe9c19a 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -14,10 +14,10 @@
 \r
 @REM set CYGWIN_HOME=C:\cygwin\r
 \r
-@REM usage: \r
+@REM usage:\r
 @REM   edksetup.bat [--nt32] [AntBuild] [Rebuild] [ForceRebuild] [Reconfig]\r
 @REM if the argument, skip is present, only the paths and the\r
-@REM test and set of environment settings are performed. \r
+@REM test and set of environment settings are performed.\r
 \r
 @REM ##############################################################\r
 @REM # You should not have to modify anything below this line\r
@@ -72,7 +72,7 @@ if not defined EDK_TOOLS_PATH (
     ) else (\r
       echo.\r
       echo !!! ERROR !!! Cannot find BaseTools !!!\r
-      echo. \r
+      echo.\r
       goto BadBaseTools\r
     )\r
   )\r
@@ -141,11 +141,13 @@ if defined CYGWIN_HOME (
 )\r
 \r
 :cygwin_done\r
+if /I "%1"=="Rebuild" shift\r
+if /I "%1"=="ForceRebuild" shift\r
 if "%1"=="" goto end\r
 \r
 :Usage\r
   @echo.\r
-  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32 [X64]] [Reconfig]"\r
+  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32 [X64]] [Reconfig] [Rebuild] [ForceRebuild]"\r
   @echo         --nt32 [X64]   If a compiler tool chain is not available in the\r
   @echo                        environment, call a script to attempt to set one up.\r
   @echo                        This flag is only required if building the\r
@@ -157,6 +159,8 @@ if "%1"=="" goto end
   @echo                        rebuild.\r
   @echo.\r
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.\r
+  @echo         Rebuild        Perform incremental rebuild of BaseTools binaries.\r
+  @echo         ForceRebuild   Force a full rebuild of BaseTools binaries.\r
   @echo.\r
   @echo  Note that target.template, tools_def.template and build_rules.template\r
   @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt\r
@@ -166,4 +170,3 @@ if "%1"=="" goto end
 \r
 :end\r
   popd\r
-\r