Index: Setup/archive.bat
==================================================================
--- Setup/archive.bat
+++ Setup/archive.bat
@@ -10,10 +10,11 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO2=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -27,11 +28,11 @@
 %_VECHO% Root = '%ROOT%'
 %_VECHO% Tools = '%TOOLS%'
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% PUSHD "%ROOT%"
+%__ECHO2% PUSHD "%ROOT%"
 
 IF ERRORLEVEL 1 (
   ECHO Could not change directory to "%ROOT%".
   GOTO errors
 )
@@ -80,11 +81,11 @@
 IF ERRORLEVEL 1 (
   ECHO Failed to archive source files.
   GOTO errors
 )
 
-%__ECHO% POPD
+%__ECHO2% POPD
 
 IF ERRORLEVEL 1 (
   ECHO Could not restore directory.
   GOTO errors
 )

Index: Setup/bake_all.bat
==================================================================
--- Setup/bake_all.bat
+++ Setup/bake_all.bat
@@ -10,10 +10,11 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -23,18 +24,18 @@
 
 %_VECHO% Tools = '%TOOLS%'
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% CALL "%TOOLS%\vsSp.bat"
+%__ECHO3% CALL "%TOOLS%\vsSp.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not detect Visual Studio.
   GOTO errors
 )
 
-%__ECHO% CALL "%TOOLS%\set_common.bat"
+%__ECHO3% CALL "%TOOLS%\set_common.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not set common variables.
   GOTO errors
 )
@@ -58,18 +59,18 @@
 %_VECHO% Years = '%YEARS%'
 
 FOR %%C IN (%BAKE_CONFIGURATIONS%) DO (
   FOR %%P IN (%PROCESSORS%) DO (
     FOR %%Y IN (%YEARS%) DO (
-      %__ECHO% CALL "%TOOLS%\set_%%C_%%P_%%Y.bat"
+      %__ECHO3% CALL "%TOOLS%\set_%%C_%%P_%%Y.bat"
 
       IF ERRORLEVEL 1 (
         ECHO Could not set variables for %%C/%%P/%%Y.
         GOTO errors
       )
 
-      %__ECHO% CALL "%TOOLS%\bake.bat"
+      %__ECHO3% CALL "%TOOLS%\bake.bat"
 
       IF ERRORLEVEL 1 (
         ECHO Could not bake setup for %%C/%%P/%%Y.
         GOTO errors
       )

Index: Setup/build.bat
==================================================================
--- Setup/build.bat
+++ Setup/build.bat
@@ -10,10 +10,12 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO2=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -52,11 +54,11 @@
 
 IF EXIST "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" (
   CALL :fn_ResetErrorLevel
 
   %_AECHO% Running "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat"...
-  %__ECHO% CALL "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat"
+  %__ECHO3% CALL "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat"
 
   IF ERRORLEVEL 1 (
     ECHO File "%TOOLS%\set_%CONFIGURATION%_%PLATFORM%.bat" failed.
     GOTO errors
   )
@@ -128,11 +130,11 @@
 %_VECHO% Year = '%YEAR%'
 %_VECHO% FrameworkDir = '%FRAMEWORKDIR%'
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% PUSHD "%ROOT%"
+%__ECHO2% PUSHD "%ROOT%"
 
 IF ERRORLEVEL 1 (
   ECHO Could not change directory to "%ROOT%".
   GOTO errors
 )
@@ -198,11 +200,11 @@
 IF ERRORLEVEL 1 (
   ECHO Build failed.
   GOTO errors
 )
 
-%__ECHO% POPD
+%__ECHO2% POPD
 
 IF ERRORLEVEL 1 (
   ECHO Could not restore directory.
   GOTO errors
 )

Index: Setup/build_all.bat
==================================================================
--- Setup/build_all.bat
+++ Setup/build_all.bat
@@ -10,10 +10,11 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -23,18 +24,18 @@
 
 %_VECHO% Tools = '%TOOLS%'
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% CALL "%TOOLS%\vsSp.bat"
+%__ECHO3% CALL "%TOOLS%\vsSp.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not detect Visual Studio.
   GOTO errors
 )
 
-%__ECHO% CALL "%TOOLS%\set_common.bat"
+%__ECHO3% CALL "%TOOLS%\set_common.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not set common variables.
   GOTO errors
 )
@@ -58,18 +59,18 @@
 %_VECHO% Years = '%YEARS%'
 
 FOR %%C IN (%BUILD_CONFIGURATIONS%) DO (
   FOR %%P IN (%PLATFORMS%) DO (
     FOR %%Y IN (%YEARS%) DO (
-      %__ECHO% CALL "%TOOLS%\set_%%Y.bat"
+      %__ECHO3% CALL "%TOOLS%\set_%%Y.bat"
 
       IF ERRORLEVEL 1 (
         ECHO Could not set variables for %%Y.
         GOTO errors
       )
 
-      %__ECHO% CALL "%TOOLS%\build.bat" %%C %%P
+      %__ECHO3% CALL "%TOOLS%\build.bat" %%C %%P
 
       IF ERRORLEVEL 1 (
         ECHO Could not build binaries for %%C/%%P/%%Y.
         GOTO errors
       )

Index: Setup/build_ce.bat
==================================================================
--- Setup/build_ce.bat
+++ Setup/build_ce.bat
@@ -10,10 +10,11 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -30,11 +31,11 @@
 SET YEARS=2008
 SET BASE_PLATFORM=PocketPC
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% CALL "%TOOLS%\build_all.bat"
+%__ECHO3% CALL "%TOOLS%\build_all.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Failed to build PocketPC binaries.
   GOTO errors
 )

Index: Setup/release.bat
==================================================================
--- Setup/release.bat
+++ Setup/release.bat
@@ -10,10 +10,12 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO2=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -80,11 +82,11 @@
 
 %_VECHO% Type = '%TYPE%'
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% CALL "%TOOLS%\set_common.bat"
+%__ECHO3% CALL "%TOOLS%\set_common.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not set common variables.
   GOTO errors
 )
@@ -108,11 +110,11 @@
 %_VECHO% Root = '%ROOT%'
 %_VECHO% Tools = '%TOOLS%'
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% PUSHD "%ROOT%"
+%__ECHO2% PUSHD "%ROOT%"
 
 IF ERRORLEVEL 1 (
   ECHO Could not change directory to "%ROOT%".
   GOTO errors
 )
@@ -179,11 +181,11 @@
 IF ERRORLEVEL 1 (
   ECHO Failed to archive binary files.
   GOTO errors
 )
 
-%__ECHO% POPD
+%__ECHO2% POPD
 
 IF ERRORLEVEL 1 (
   ECHO Could not restore directory.
   GOTO errors
 )

Index: Setup/release_all.bat
==================================================================
--- Setup/release_all.bat
+++ Setup/release_all.bat
@@ -10,10 +10,11 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -23,18 +24,18 @@
 
 %_VECHO% Tools = '%TOOLS%'
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% CALL "%TOOLS%\vsSp.bat"
+%__ECHO3% CALL "%TOOLS%\vsSp.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not detect Visual Studio.
   GOTO errors
 )
 
-%__ECHO% CALL "%TOOLS%\set_common.bat"
+%__ECHO3% CALL "%TOOLS%\set_common.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not set common variables.
   GOTO errors
 )
@@ -58,11 +59,11 @@
 %_VECHO% Years = '%YEARS%'
 
 FOR %%C IN (%RELEASE_CONFIGURATIONS%) DO (
   FOR %%P IN (%PLATFORMS%) DO (
     FOR %%Y IN (%YEARS%) DO (
-      %__ECHO% CALL "%TOOLS%\release.bat" %%C %%P %%Y
+      %__ECHO3% CALL "%TOOLS%\release.bat" %%C %%P %%Y
 
       IF ERRORLEVEL 1 (
         ECHO Could not build release archive for %%C/%%P/%%Y.
         GOTO errors
       )

Index: Setup/release_ce.bat
==================================================================
--- Setup/release_ce.bat
+++ Setup/release_ce.bat
@@ -10,10 +10,11 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -31,11 +32,11 @@
 SET BASE_PLATFORM=PocketPC
 SET TYPE=binary
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% CALL "%TOOLS%\release_all.bat"
+%__ECHO3% CALL "%TOOLS%\release_all.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Failed to build PocketPC release files.
   GOTO errors
 )

Index: Setup/release_static.bat
==================================================================
--- Setup/release_static.bat
+++ Setup/release_static.bat
@@ -10,10 +10,11 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -26,11 +27,11 @@
 SET CONFIGURATIONSUFFIX=Static
 SET TYPE_PREFIX=static-
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% CALL "%TOOLS%\release_all.bat"
+%__ECHO3% CALL "%TOOLS%\release_all.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Failed to build static release files.
   GOTO errors
 )

Index: Setup/test_all.bat
==================================================================
--- Setup/test_all.bat
+++ Setup/test_all.bat
@@ -10,10 +10,12 @@
 ::
 
 SETLOCAL
 
 REM SET __ECHO=ECHO
+REM SET __ECHO2=ECHO
+REM SET __ECHO3=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
 %_AECHO% Running %0 %*
@@ -42,18 +44,18 @@
 
 %_VECHO% Tools = '%TOOLS%'
 
 CALL :fn_ResetErrorLevel
 
-%__ECHO% CALL "%TOOLS%\vsSp.bat"
+%__ECHO3% CALL "%TOOLS%\vsSp.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not detect Visual Studio.
   GOTO errors
 )
 
-%__ECHO% CALL "%TOOLS%\set_common.bat"
+%__ECHO3% CALL "%TOOLS%\set_common.bat"
 
 IF ERRORLEVEL 1 (
   ECHO Could not set common variables.
   GOTO errors
 )
@@ -77,11 +79,11 @@
   GOTO errors
 )
 
 %_VECHO% Platform = '%PLATFORM%'
 
-%__ECHO% PUSHD "%ROOT%"
+%__ECHO2% PUSHD "%ROOT%"
 
 IF ERRORLEVEL 1 (
   ECHO Could not change directory to "%ROOT%".
   GOTO errors
 )
@@ -148,11 +150,11 @@
       GOTO errors
     )
   )
 )
 
-%__ECHO% POPD
+%__ECHO2% POPD
 
 IF ERRORLEVEL 1 (
   ECHO Could not restore directory.
   GOTO errors
 )