From 864e8fb029b10bfe2af14d679600d22e33d7ea35 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 10 Oct 2025 07:37:27 +0900 Subject: win32: Enable extensions explicitly --- win32/configure.bat | 2 +- win32/ifchange.bat | 2 ++ win32/install-buildtools.cmd | 2 +- win32/lastrev.bat | 3 ++- win32/makedirs.bat | 2 +- win32/rm.bat | 2 +- win32/rmdirs.bat | 2 +- win32/rtname.cmd | 1 + win32/vssetup.cmd | 2 +- 9 files changed, 11 insertions(+), 7 deletions(-) diff --git a/win32/configure.bat b/win32/configure.bat index 79384a8759..8f767ede73 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -1,5 +1,5 @@ @echo off -@setlocal disabledelayedexpansion +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 set PROMPT=$E[94m+$E[m$S set witharg= diff --git a/win32/ifchange.bat b/win32/ifchange.bat index c7a57fad35..f3fc9ea37c 100755 --- a/win32/ifchange.bat +++ b/win32/ifchange.bat @@ -1,6 +1,8 @@ @echo off :: usage: ifchange target temporary +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 + :: @set PROMPT=$T:$S for %%I in (%0) do set progname=%%~nI set timestamp= diff --git a/win32/install-buildtools.cmd b/win32/install-buildtools.cmd index 6ec1475280..fbbe051f71 100755 --- a/win32/install-buildtools.cmd +++ b/win32/install-buildtools.cmd @@ -1,5 +1,5 @@ @echo off -setlocal +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 set components=VC.Tools.x86.x64 VC.Redist.14.Latest CoreBuildTools set components=%components% Windows11SDK.26100 diff --git a/win32/lastrev.bat b/win32/lastrev.bat index f1c799f897..c4ce61e34a 100755 --- a/win32/lastrev.bat +++ b/win32/lastrev.bat @@ -1,5 +1,6 @@ -@setlocal @echo off +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 + if "%1" == "" (set gitdir=.) else (set gitdir=%1) set TZ=UTC for /f "usebackq tokens=1-3" %%I in ( diff --git a/win32/makedirs.bat b/win32/makedirs.bat index 13740d8778..8c06d94041 100755 --- a/win32/makedirs.bat +++ b/win32/makedirs.bat @@ -1,3 +1,3 @@ @echo off -setlocal EnableExtensions +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 for %%I in (%*) do if not exist "%%~I/." mkdir "%%~I" diff --git a/win32/rm.bat b/win32/rm.bat index fefc030545..500a4abe2e 100755 --- a/win32/rm.bat +++ b/win32/rm.bat @@ -1,5 +1,5 @@ @echo off -setlocal +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 set recursive= :optloop if "%1" == "-f" shift diff --git a/win32/rmdirs.bat b/win32/rmdirs.bat index 308b648322..c3d7b637b3 100755 --- a/win32/rmdirs.bat +++ b/win32/rmdirs.bat @@ -1,5 +1,5 @@ -::-*- batch -*- @echo off +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 if "%1" == "-p" shift :begin if "%1" == "" goto :end diff --git a/win32/rtname.cmd b/win32/rtname.cmd index 775e81681a..1ac008ebf0 100755 --- a/win32/rtname.cmd +++ b/win32/rtname.cmd @@ -1,4 +1,5 @@ @echo off +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 set rt= set rtver= set osver= diff --git a/win32/vssetup.cmd b/win32/vssetup.cmd index c67bb0ad7c..2bbfbf1384 100755 --- a/win32/vssetup.cmd +++ b/win32/vssetup.cmd @@ -1,4 +1,4 @@ -@setlocal ENABLEEXTENSIONS +@setlocal EnableExtensions DisableDelayedExpansion || exit /b -1 ::- do not `echo off` that affects the called batch files ::- check for vswhere -- cgit v1.2.3