[PATCH] BaseTools: suppress usage instructions with rebuild options

[PATCH] BaseTools: suppress usage instructions with rebuild options

[Yonghong Zhu]

From: Chris Ruffin <chris.ruffin@intel.com>

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>
---
 edksetup.bat | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

Re: [PATCH] BaseTools: suppress usage instructions with rebuild options

[Zhu, Yonghong]

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong


-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
Sent: Thursday, June 29, 2017 3:10 PM
To: edk2-devel@lists.01.org
Cc: Ruffin, Chris <chris.ruffin@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [edk2] [PATCH] BaseTools: suppress usage instructions with rebuild options

From: Chris Ruffin <chris.ruffin@intel.com>

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>
---
 edksetup.bat | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel