From 3b365065e4500708b8184cca9d2909aee4a71f44 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 13 Dec 2023 16:10:21 +0100 Subject: [PATCH] Clean the output of .bat files (#20913) This prevents echoing out "set MYDIR=foo" and "goto FOUND_MYDIR" by prepending the lines with a "@". --- bootstrap.bat | 4 ++-- em++.bat | 4 ++-- em-config.bat | 4 ++-- emar.bat | 4 ++-- embuilder.bat | 4 ++-- emcc.bat | 4 ++-- emcmake.bat | 4 ++-- emconfigure.bat | 4 ++-- emdump.bat | 4 ++-- emdwp.bat | 4 ++-- emmake.bat | 4 ++-- emnm.bat | 4 ++-- emprofile.bat | 4 ++-- emranlib.bat | 4 ++-- emrun.bat | 4 ++-- emscons.bat | 4 ++-- emsize.bat | 4 ++-- emstrip.bat | 4 ++-- emsymbolizer.bat | 4 ++-- system/bin/sdl-config.bat | 4 ++-- system/bin/sdl2-config.bat | 4 ++-- test/runner.bat | 4 ++-- tools/file_packager.bat | 4 ++-- tools/maint/run_python.bat | 4 ++-- tools/maint/run_python_compiler.bat | 4 ++-- tools/webidl_binder.bat | 4 ++-- 26 files changed, 52 insertions(+), 52 deletions(-) diff --git a/bootstrap.bat b/bootstrap.bat index b574e98809e73..000dff7313ae1 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/em++.bat b/em++.bat index 86ae9bb841f35..60ea5f8c3621b 100644 --- a/em++.bat +++ b/em++.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/em-config.bat b/em-config.bat index b574e98809e73..000dff7313ae1 100644 --- a/em-config.bat +++ b/em-config.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emar.bat b/emar.bat index b574e98809e73..000dff7313ae1 100644 --- a/emar.bat +++ b/emar.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/embuilder.bat b/embuilder.bat index b574e98809e73..000dff7313ae1 100644 --- a/embuilder.bat +++ b/embuilder.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emcc.bat b/emcc.bat index 86ae9bb841f35..60ea5f8c3621b 100644 --- a/emcc.bat +++ b/emcc.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emcmake.bat b/emcmake.bat index b574e98809e73..000dff7313ae1 100644 --- a/emcmake.bat +++ b/emcmake.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emconfigure.bat b/emconfigure.bat index b574e98809e73..000dff7313ae1 100644 --- a/emconfigure.bat +++ b/emconfigure.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emdump.bat b/emdump.bat index f9fb29c0fbf08..02aba0b01bea3 100644 --- a/emdump.bat +++ b/emdump.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (tools\emdump.bat) do ( @if exist %%~$PATH:I ( diff --git a/emdwp.bat b/emdwp.bat index 23d1e45dfea9f..e095139bcb448 100644 --- a/emdwp.bat +++ b/emdwp.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (tools\emdwp.bat) do ( @if exist %%~$PATH:I ( diff --git a/emmake.bat b/emmake.bat index b574e98809e73..000dff7313ae1 100644 --- a/emmake.bat +++ b/emmake.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emnm.bat b/emnm.bat index e3b5824748a65..b5cef80bdaa67 100644 --- a/emnm.bat +++ b/emnm.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (tools\emnm.bat) do ( @if exist %%~$PATH:I ( diff --git a/emprofile.bat b/emprofile.bat index c28cf0878c659..e7d3c6d23ae53 100644 --- a/emprofile.bat +++ b/emprofile.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (tools\emprofile.bat) do ( @if exist %%~$PATH:I ( diff --git a/emranlib.bat b/emranlib.bat index b574e98809e73..000dff7313ae1 100644 --- a/emranlib.bat +++ b/emranlib.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emrun.bat b/emrun.bat index b574e98809e73..000dff7313ae1 100644 --- a/emrun.bat +++ b/emrun.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emscons.bat b/emscons.bat index b574e98809e73..000dff7313ae1 100644 --- a/emscons.bat +++ b/emscons.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emsize.bat b/emsize.bat index b574e98809e73..000dff7313ae1 100644 --- a/emsize.bat +++ b/emsize.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emstrip.bat b/emstrip.bat index b574e98809e73..000dff7313ae1 100644 --- a/emstrip.bat +++ b/emstrip.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/emsymbolizer.bat b/emsymbolizer.bat index b574e98809e73..000dff7313ae1 100644 --- a/emsymbolizer.bat +++ b/emsymbolizer.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/system/bin/sdl-config.bat b/system/bin/sdl-config.bat index b574e98809e73..000dff7313ae1 100644 --- a/system/bin/sdl-config.bat +++ b/system/bin/sdl-config.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/system/bin/sdl2-config.bat b/system/bin/sdl2-config.bat index b574e98809e73..000dff7313ae1 100644 --- a/system/bin/sdl2-config.bat +++ b/system/bin/sdl2-config.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/test/runner.bat b/test/runner.bat index b574e98809e73..000dff7313ae1 100644 --- a/test/runner.bat +++ b/test/runner.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/tools/file_packager.bat b/tools/file_packager.bat index b574e98809e73..000dff7313ae1 100644 --- a/tools/file_packager.bat +++ b/tools/file_packager.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/tools/maint/run_python.bat b/tools/maint/run_python.bat index b574e98809e73..000dff7313ae1 100644 --- a/tools/maint/run_python.bat +++ b/tools/maint/run_python.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/tools/maint/run_python_compiler.bat b/tools/maint/run_python_compiler.bat index 86ae9bb841f35..60ea5f8c3621b 100644 --- a/tools/maint/run_python_compiler.bat +++ b/tools/maint/run_python_compiler.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I ( diff --git a/tools/webidl_binder.bat b/tools/webidl_binder.bat index b574e98809e73..000dff7313ae1 100644 --- a/tools/webidl_binder.bat +++ b/tools/webidl_binder.bat @@ -23,8 +23,8 @@ :: %~dp0 expansions will not work. :: So first try if %~dp0 might work, and if not, manually look up this script from PATH. @if exist %~f0 ( - set MYDIR=%~dp0 - goto FOUND_MYDIR + @set MYDIR=%~dp0 + @goto FOUND_MYDIR ) @for %%I in (%~n0.bat) do ( @if exist %%~$PATH:I (