From 4699edfe948bee5b6e83c374c3f1866901970b05 Mon Sep 17 00:00:00 2001 From: Evan Lloyd Date: Fri, 17 Jan 2014 16:34:38 +0000 Subject: [PATCH 1/4] 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 --- BaseTools/toolsetup.bat | 44 +++++++++++++++++----------------- edksetup.bat | 63 ++++++++++++++++++++++++------------------------- 2 files changed, 52 insertions(+), 55 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 98d0247..24bf76c 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -22,32 +22,32 @@ pushd . @REM # You should not have to modify anything below this line @REM # -@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"=="/help" goto Usage -@if /I "%1"=="/?" goto Usage +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"=="/help" goto Usage +if /I "%1"=="/?" goto Usage :loop - @if "%1"=="" goto setup_workspace - @if /I "%1"=="--nt32" ( + if "%1"=="" goto setup_workspace + if /I "%1"=="--nt32" ( @REM Ignore --nt32 flag shift goto loop ) - @if /I "%1"=="Reconfig" ( + if /I "%1"=="Reconfig" ( shift set RECONFIG=TRUE goto loop ) - @if /I "%1"=="Rebuild" ( + if /I "%1"=="Rebuild" ( shift set REBUILD=TRUE goto loop ) - @if /I "%1"=="ForceRebuild" ( + if /I "%1"=="ForceRebuild" ( shift set FORCE_REBUILD=TRUE goto loop @@ -352,17 +352,17 @@ goto end goto end :Usage - echo. + @echo. echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]]" - echo. - echo base_tools_path BaseTools project path, BASE_TOOLS_PATH will be set to this path. - echo edk_tools_path EDK_TOOLS_PATH will be set to this path. - echo Rebuild If sources are available perform an Incremental build, only - echo build those updated tools. - echo ForceRebuild If sources are available, rebuild all tools regardless of - echo whether they have been updated or not. - echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt. -echo. + @echo. + @echo base_tools_path BaseTools project path, BASE_TOOLS_PATH will be set to this path. + @echo edk_tools_path EDK_TOOLS_PATH will be set to this path. + @echo Rebuild If sources are available perform an Incremental build, only + @echo build those updated tools. + @echo ForceRebuild If sources are available, rebuild all tools regardless of + @echo whether they have been updated or not. + @echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt. + @echo. :end set REBUILD= @@ -370,5 +370,3 @@ set FORCE_REBUILD= set RECONFIG= popd -@echo on - diff --git a/edksetup.bat b/edksetup.bat index 2c8c072..6e526cd 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -31,12 +31,12 @@ pushd . cd %~dp0 if not defined WORKSPACE ( - @goto SetWorkSpace + goto SetWorkSpace ) if %WORKSPACE% == %CD% ( @REM Workspace is not changed. - @goto ParseArgs + goto ParseArgs ) :SetWorkSpace @@ -47,14 +47,14 @@ set EFI_SOURCE= set EDK_SOURCE= :ParseArgs -@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"=="-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 no_nt32 +if /I not "%1"=="--nt32" goto no_nt32 @REM Flag, --nt32 is set @REM The Nt32 Emluation Platform requires Microsoft Libraries @@ -88,38 +88,38 @@ if not defined VCINSTALLDIR ( shift :no_nt32 -@if /I "%1"=="NewBuild" shift -@if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools -@IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools -@call %EDK_TOOLS_PATH%\toolsetup.bat %* -@if /I "%1"=="Reconfig" shift -@goto check_cygwin +if /I "%1"=="NewBuild" shift +if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools +IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools +call %EDK_TOOLS_PATH%\toolsetup.bat %* +if /I "%1"=="Reconfig" shift +goto check_cygwin :BadBaseTools @REM - @REM Need the BaseTools Package in order to build + REM Need the BaseTools Package in order to build @REM - echo. - echo !!! ERROR !!! The BaseTools Package was not found !!! - echo. - echo Set the system environment variable, EDK_TOOLS_PATH to the BaseTools, - echo For example, - echo set EDK_TOOLS_PATH=C:\MyTools\BaseTools - echo The setup script, toolsetup.bat must reside in this folder. - echo. - @goto end + @echo. + @echo !!! ERROR !!! The BaseTools Package was not found !!! + @echo. + @echo Set the system environment variable, EDK_TOOLS_PATH to the BaseTools, + @echo For example, + @echo set EDK_TOOLS_PATH=C:\MyTools\BaseTools + @echo The setup script, toolsetup.bat must reside in this folder. + @echo. + goto end :check_cygwin - @if exist c:\cygwin ( - @set CYGWIN_HOME=c:\cygwin + if exist c:\cygwin ( + set CYGWIN_HOME=c:\cygwin ) else ( @echo. @echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!! @echo. ) -@if NOT "%1"=="" goto Usage -@goto end +if NOT "%1"=="" goto Usage +goto end :Usage @echo. @@ -132,9 +132,8 @@ shift @echo will be only copied to target.txt, tools_def.txt and build_rule.txt @echo respectively if they do not exist. Using option [Reconfig] to force the copy. @echo. - @goto end + goto end :end - @popd - @echo on + popd -- 1.8.5