Closes #17202: Merge with 3.4

9 files changed, 79 insertions, 79 deletions

diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 115e111..8b93bb0 100644
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -1,2 +1,2 @@
-@rem Used by the buildbot "compile" step.
-call "%~dp0build.bat" -p x64 %*
+@rem Used by the buildbot "compile" step.

+call "%~dp0build.bat" -p x64 %*

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index 83a5dfd..1debfc1 100644
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -1,20 +1,20 @@
-@rem Used by the buildbot "compile" step.
-
-@rem Clean up
-set PLAT=
-if '%1' EQU '-p' if '%2' EQU 'x64' (set PLAT=-amd64)
-
-call "%~dp0clean%PLAT%.bat"
-
-@rem If you need the buildbots to start fresh (such as when upgrading to
-@rem a new version of an external library, especially Tcl/Tk):
-@rem 1) uncomment the following line:
-
-@rem    call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only
-
-@rem 2) commit and push
-@rem 3) wait for all Windows bots to start a build with that changeset
-@rem 4) re-comment, commit and push again
-
-@rem Do the build
-call "%~dp0..\..\PCbuild\build.bat" -e -d -v %*
+@rem Used by the buildbot "compile" step.

+

+@rem Clean up

+set PLAT=

+if '%1' EQU '-p' if '%2' EQU 'x64' (set PLAT=-amd64)

+

+call "%~dp0clean%PLAT%.bat"

+

+@rem If you need the buildbots to start fresh (such as when upgrading to

+@rem a new version of an external library, especially Tcl/Tk):

+@rem 1) uncomment the following line:

+

+@rem    call "%~dp0..\..\PCbuild\get_externals.bat" --clean-only

+

+@rem 2) commit and push

+@rem 3) wait for all Windows bots to start a build with that changeset

+@rem 4) re-comment, commit and push again

+

+@rem Do the build

+call "%~dp0..\..\PCbuild\build.bat" -e -d -v %*

diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
index 6804d79..e3c2dbd 100644
--- a/Tools/buildbot/buildmsi.bat
+++ b/Tools/buildbot/buildmsi.bat
@@ -1,9 +1,9 @@
-@rem Used by the buildbot "buildmsi" step.
-setlocal
-
-pushd
-
-@rem build both snapshot MSIs
-call "%~dp0..\msi\build.bat" -x86 -x64
-
+@rem Used by the buildbot "buildmsi" step.

+setlocal

+

+pushd

+

+@rem build both snapshot MSIs

+call "%~dp0..\msi\build.bat" -x86 -x64

+

 popd
\ No newline at end of file
diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
index b4882c2..5e68e30 100644
--- a/Tools/buildbot/clean-amd64.bat
+++ b/Tools/buildbot/clean-amd64.bat
@@ -1,2 +1,2 @@
-@rem Used by the buildbot "clean" step.
-@call "%~dp0clean.bat" x64
+@rem Used by the buildbot "clean" step.

+@call "%~dp0clean.bat" x64

diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 09328bc..6890453 100644
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -1,29 +1,29 @@
-@echo off
-rem Used by the buildbot "clean" step.
-
-setlocal
-set root=%~dp0..\..
-set pcbuild=%root%\PCbuild
-
-if "%1" == "x64" (
-    set vcvars_target=x86_amd64
-    set platform=x64
-) else (
-    set vcvars_target=x86
-    set platform=Win32
-)
-
-call "%pcbuild%\env.bat" %vcvars_target%
-
-echo.Attempting to kill Pythons...
-msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform% /p:KillPython=true
-
-echo Deleting .pyc/.pyo files ...
-del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"
-
-echo Deleting test leftovers ...
-rmdir /s /q "%root%\build"
-
-echo Deleting build
-msbuild /v:m /nologo /target:clean "%pcbuild%\pcbuild.proj" /p:Configuration=Release /p:Platform=%platform%
-msbuild /v:m /nologo /target:clean "%pcbuild%\pcbuild.proj" /p:Configuration=Debug /p:Platform=%platform%
+@echo off

+rem Used by the buildbot "clean" step.

+

+setlocal

+set root=%~dp0..\..

+set pcbuild=%root%\PCbuild

+

+if "%1" == "x64" (

+    set vcvars_target=x86_amd64

+    set platform=x64

+) else (

+    set vcvars_target=x86

+    set platform=Win32

+)

+

+call "%pcbuild%\env.bat" %vcvars_target%

+

+echo.Attempting to kill Pythons...

+msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform% /p:KillPython=true

+

+echo Deleting .pyc/.pyo files ...

+del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"

+

+echo Deleting test leftovers ...

+rmdir /s /q "%root%\build"

+

+echo Deleting build

+msbuild /v:m /nologo /target:clean "%pcbuild%\pcbuild.proj" /p:Configuration=Release /p:Platform=%platform%

+msbuild /v:m /nologo /target:clean "%pcbuild%\pcbuild.proj" /p:Configuration=Debug /p:Platform=%platform%

diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index 7a570d9..13056c7 100644
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -1,2 +1,2 @@
-@echo Please use PCbuild\get_externals.bat instead.
-@"%~dp0..\..\PCbuild\get_externals.bat" %*
+@echo Please use PCbuild\get_externals.bat instead.

+@"%~dp0..\..\PCbuild\get_externals.bat" %*

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 7a570d9..13056c7 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -1,2 +1,2 @@
-@echo Please use PCbuild\get_externals.bat instead.
-@"%~dp0..\..\PCbuild\get_externals.bat" %*
+@echo Please use PCbuild\get_externals.bat instead.

+@"%~dp0..\..\PCbuild\get_externals.bat" %*

diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
index 7a241f5..044026f 100644
--- a/Tools/buildbot/test-amd64.bat
+++ b/Tools/buildbot/test-amd64.bat
@@ -1,7 +1,7 @@
-@rem Used by the buildbot "test" step.
-
-setlocal
-rem The following line should be removed before #20035 is closed
-set TCL_LIBRARY=%~dp0..\..\externals\tcltk64\lib\tcl8.6
-
-call "%~dp0..\..\PCbuild\rt.bat" -d -q -x64 -uall -rwW -n --timeout=3600 %*
+@rem Used by the buildbot "test" step.

+

+setlocal

+rem The following line should be removed before #20035 is closed

+set TCL_LIBRARY=%~dp0..\..\externals\tcltk64\lib\tcl8.6

+

+call "%~dp0..\..\PCbuild\rt.bat" -d -q -x64 -uall -rwW -n --timeout=3600 %*

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 6a6448c..427957b 100644
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,7 +1,7 @@
-@rem Used by the buildbot "test" step.
-
-setlocal
-rem The following line should be removed before #20035 is closed
-set TCL_LIBRARY=%~dp0..\..\externals\tcltk\lib\tcl8.6
-
-call "%~dp0..\..\PCbuild\rt.bat" -d -q -uall -rwW -n --timeout=3600 %*
+@rem Used by the buildbot "test" step.

+

+setlocal

+rem The following line should be removed before #20035 is closed

+set TCL_LIBRARY=%~dp0..\..\externals\tcltk\lib\tcl8.6

+

+call "%~dp0..\..\PCbuild\rt.bat" -d -q -uall -rwW -n --timeout=3600 %*