BaseTools: Rectify use of @ in .BAT files.

Tracing of the .BAT files is obscured by use of the @ prefix
and is confused by the "echo on" at the end of toolsetup.bat.

Silent all the 'echo' with '@'. And remove '@' from the non
'echo' line to make easier to trace the batch files when 'echo on'.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by Yingke Liu <yingke.d.liu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15253 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/edksetup.bat b/edksetup.bat
index 2c8c072884b87498f55c036065e9e170c296db95..6e526cdd03c6c12b4cd85177a23358bcd527b1d6 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -31,12 +31,12 @@ pushd .
 cd %~dp0\r
 \r
 if not defined WORKSPACE (\r
-  @goto SetWorkSpace\r
+  goto SetWorkSpace\r
 )\r
 \r
 if %WORKSPACE% == %CD% (\r
   @REM Workspace is not changed.\r
-  @goto ParseArgs\r
+  goto ParseArgs\r
 )\r
 \r
 :SetWorkSpace\r
@@ -47,14 +47,14 @@ set EFI_SOURCE=
 set EDK_SOURCE=\r
 \r
 :ParseArgs\r
-@if /I "%1"=="-h" goto Usage\r
-@if /I "%1"=="-help" goto Usage\r
-@if /I "%1"=="--help" goto Usage\r
-@if /I "%1"=="/h" goto Usage\r
-@if /I "%1"=="/?" goto Usage\r
-@if /I "%1"=="/help" goto Usage\r
+if /I "%1"=="-h" goto Usage\r
+if /I "%1"=="-help" goto Usage\r
+if /I "%1"=="--help" goto Usage\r
+if /I "%1"=="/h" goto Usage\r
+if /I "%1"=="/?" goto Usage\r
+if /I "%1"=="/help" goto Usage\r
 \r
-@if /I not "%1"=="--nt32" goto no_nt32\r
+if /I not "%1"=="--nt32" goto no_nt32\r
 \r
 @REM Flag, --nt32 is set\r
 @REM The Nt32 Emluation Platform requires Microsoft Libraries\r
@@ -88,38 +88,38 @@ if not defined VCINSTALLDIR (
 shift\r
 \r
 :no_nt32\r
-@if /I "%1"=="NewBuild" shift\r
-@if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\r
-@IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools\r
-@call %EDK_TOOLS_PATH%\toolsetup.bat %*\r
-@if /I "%1"=="Reconfig" shift\r
-@goto check_cygwin\r
+if /I "%1"=="NewBuild" shift\r
+if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\r
+IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools\r
+call %EDK_TOOLS_PATH%\toolsetup.bat %*\r
+if /I "%1"=="Reconfig" shift\r
+goto check_cygwin\r
 \r
 :BadBaseTools\r
   @REM\r
-  @REM Need the BaseTools Package in order to build\r
+  REM Need the BaseTools Package in order to build\r
   @REM\r
-  echo.\r
-  echo !!! ERROR !!! The BaseTools Package was not found !!!\r
-  echo.\r
-  echo Set the system environment variable, EDK_TOOLS_PATH to the BaseTools,\r
-  echo For example,\r
-  echo   set EDK_TOOLS_PATH=C:\MyTools\BaseTools\r
-  echo The setup script, toolsetup.bat must reside in this folder.\r
-  echo.\r
-  @goto end\r
+  @echo.\r
+  @echo !!! ERROR !!! The BaseTools Package was not found !!!\r
+  @echo.\r
+  @echo Set the system environment variable, EDK_TOOLS_PATH to the BaseTools,\r
+  @echo For example,\r
+  @echo   set EDK_TOOLS_PATH=C:\MyTools\BaseTools\r
+  @echo The setup script, toolsetup.bat must reside in this folder.\r
+  @echo.\r
+  goto end\r
 \r
 :check_cygwin\r
-  @if exist c:\cygwin (\r
-    @set CYGWIN_HOME=c:\cygwin\r
+  if exist c:\cygwin (\r
+    set CYGWIN_HOME=c:\cygwin\r
   ) else (\r
     @echo.\r
     @echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!\r
     @echo.\r
   )\r
 \r
-@if NOT "%1"=="" goto Usage\r
-@goto end\r
+if NOT "%1"=="" goto Usage\r
+goto end\r
 \r
 :Usage\r
   @echo.\r
@@ -132,9 +132,8 @@ shift
   @echo  will be only copied to target.txt, tools_def.txt and build_rule.txt\r
   @echo  respectively if they do not exist. Using option [Reconfig] to force the copy. \r
   @echo.\r
-  @goto end\r
+  goto end\r
 \r
 :end\r
-  @popd\r
-  @echo on\r
+  popd\r
 \r