diff options
| -rw-r--r-- | build-packages.cmd | 2 | ||||
| -rw-r--r-- | build-test.cmd | 6 | ||||
| -rw-r--r-- | build.cmd | 10 | ||||
| -rw-r--r-- | clean.cmd | 2 | ||||
| -rw-r--r-- | init-tools.cmd | 2 | ||||
| -rw-r--r-- | publish-packages.cmd | 2 | ||||
| -rw-r--r-- | run.cmd | 2 | ||||
| -rw-r--r-- | sync.cmd | 2 | ||||
| -rw-r--r-- | tests/runtest.cmd | 2 | ||||
| -rwxr-xr-x | tests/setup-runtime-dependencies.cmd | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/build-packages.cmd b/build-packages.cmd index 3297bfc214..7f92c1b0ad 100644 --- a/build-packages.cmd +++ b/build-packages.cmd @@ -1,4 +1,4 @@ -@if "%_echo%" neq "on" echo off +@if not defined _echo @echo off setlocal EnableDelayedExpansion set "__ProjectDir=%~dp0" diff --git a/build-test.cmd b/build-test.cmd index d22b489bd4..d6e96cb6a9 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -1,4 +1,4 @@ -@if not defined __echo @echo off +@if not defined _echo @echo off setlocal EnableDelayedExpansion :: Set the default arguments for build @@ -129,7 +129,7 @@ if defined __ToolsetDir ( :: Set the environment for the native build echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" %__VCBuildArch% call "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" %__VCBuildArch% -@if defined __echo @echo on +@if defined _echo @echo on if not defined VSINSTALLDIR ( echo %__MsgPrefix%Error: VSINSTALLDIR variable not defined. @@ -141,7 +141,7 @@ if not exist "%VSINSTALLDIR%DIA SDK" goto NoDIA pushd "%__NativeTestIntermediatesDir%" call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" ""%__ProjectFilesDir%"" %__VSVersion% %__BuildArch% -@if defined __echo @echo on +@if defined _echo @echo on popd if not exist "%__NativeTestIntermediatesDir%\install.vcxproj" ( @@ -1,4 +1,4 @@ -@if not defined __echo @echo off +@if not defined _echo @echo off setlocal EnableDelayedExpansion EnableExtensions set __ThisScriptFull="%~f0" @@ -224,7 +224,7 @@ if %__BuildNative% EQU 1 ( if /i "%__BuildArch%" == "arm" (set __VCBuildArch=x86_arm) echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" !__VCBuildArch! call "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" !__VCBuildArch! - @if defined __echo @echo on + @if defined _echo @echo on if not defined VSINSTALLDIR ( echo %__MsgPrefix%Error: VSINSTALLDIR variable not defined. @@ -239,7 +239,7 @@ if %__BuildNative% EQU 1 ( pushd "%__IntermediatesDir%" set __ExtraCmakeArgs="-DCLR_CMAKE_TARGET_OS=%__BuildOs%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__BuildArch% %__BuildJit32% !__ExtraCmakeArgs! - @if defined __echo @echo on + @if defined _echo @echo on popd :SkipConfigure if defined __ConfigureOnly goto SkipNativeBuild @@ -283,7 +283,7 @@ if /i "%__DoCrossArchBuild%"=="1" ( set __VCBuildArch=x86_amd64 if /i "%__CrossArch%" == "x86" ( set __VCBuildArch=x86 ) @call "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" !__VCBuildArch! - @if defined __echo @echo on + @if defined _echo @echo on if not exist "%__CrossCompIntermediatesDir%" md "%__CrossCompIntermediatesDir%" if defined __SkipConfigure goto SkipConfigureCrossBuild @@ -293,7 +293,7 @@ if /i "%__DoCrossArchBuild%"=="1" ( set "__CMakeBinDir=!__CMakeBinDir:\=/!" set __ExtraCmakeArgs="-DCLR_CROSS_COMPONENTS_BUILD=1" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%" "-DCLR_CMAKE_TARGET_OS=%__BuildOs%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__CrossArch% !__ExtraCmakeArgs! - @if defined __echo @echo on + @if defined _echo @echo on popd :SkipConfigureCrossBuild if not exist "%__CrossCompIntermediatesDir%\install.vcxproj" ( @@ -1,4 +1,4 @@ -@if not defined __echo @echo off +@if not defined _echo @echo off setlocal EnableDelayedExpansion echo Running clean.cmd diff --git a/init-tools.cmd b/init-tools.cmd index 33404f995b..85c136ce34 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -1,4 +1,4 @@ -@echo off +@if not defined _echo @echo off setlocal set INIT_TOOLS_LOG=%~dp0init-tools.log diff --git a/publish-packages.cmd b/publish-packages.cmd index 5831d29cc2..82f659d825 100644 --- a/publish-packages.cmd +++ b/publish-packages.cmd @@ -1,4 +1,4 @@ -@if "%_echo%" neq "on" echo off +@if not defined _echo @echo off setlocal EnableDelayedExpansion if /I [%1] == [-?] goto Usage @@ -1,4 +1,4 @@ -@if "%_echo%" neq "on" echo off +@if not defined _echo @echo off setlocal if not defined VisualStudioVersion ( @@ -1,4 +1,4 @@ -@if "%_echo%" neq "on" echo off +@if not defined _echo @echo off setlocal EnableDelayedExpansion if /I [%1] == [-?] goto Usage diff --git a/tests/runtest.cmd b/tests/runtest.cmd index 00d9caca50..ad839355ce 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -1,4 +1,4 @@ -@if not defined __echo @echo off +@if not defined _echo @echo off setlocal EnableDelayedExpansion :: Set the default arguments diff --git a/tests/setup-runtime-dependencies.cmd b/tests/setup-runtime-dependencies.cmd index 6369457af8..0079d42f60 100755 --- a/tests/setup-runtime-dependencies.cmd +++ b/tests/setup-runtime-dependencies.cmd @@ -1,4 +1,4 @@ -@if not defined __echo @echo off +@if not defined _echo @echo off setlocal set __ThisScriptShort=%0 |