Issue #17202: Add .bat to .hgeol to force them to CRLF.

Using LF can a script to fail if it tries to use a label that is
split across 512 byte blocks.  Who knows why.

10 files changed, 169 insertions, 169 deletions

diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 493e74d..a4cde1b 100644
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -1,6 +1,6 @@
-@rem Used by the buildbot "compile" step.
-cmd /c Tools\buildbot\external-amd64.bat
-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-cmd /c Tools\buildbot\clean-amd64.bat
-
-msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64
+@rem Used by the buildbot "compile" step.

+cmd /c Tools\buildbot\external-amd64.bat

+call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64

+cmd /c Tools\buildbot\clean-amd64.bat

+

+msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index be79b10..82eeef4 100644
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -1,7 +1,7 @@
-@rem Used by the buildbot "compile" step.
-cmd /c Tools\buildbot\external.bat
-call "%VS100COMNTOOLS%vsvars32.bat"
-cmd /c Tools\buildbot\clean.bat
-
-msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32
-
+@rem Used by the buildbot "compile" step.

+cmd /c Tools\buildbot\external.bat

+call "%VS100COMNTOOLS%vsvars32.bat"

+cmd /c Tools\buildbot\clean.bat

+

+msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32

+

diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
index ae93e67..4ca5604 100644
--- a/Tools/buildbot/buildmsi.bat
+++ b/Tools/buildbot/buildmsi.bat
@@ -1,21 +1,21 @@
-@rem Used by the buildbot "buildmsi" step.
-
-cmd /c Tools\buildbot\external.bat
-@rem build release versions of things
-call "%VS100COMNTOOLS%vsvars32.bat"
-
-@rem build Python
-msbuild /p:useenv=true PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32
-
-@rem build the documentation
-bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
-"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp
-
-@rem build the MSI file
-cd PC
-nmake /f icons.mak
-cd ..\Tools\msi
-del *.msi
-nmake /f msisupport.mak
-%HOST_PYTHON% msi.py
-
+@rem Used by the buildbot "buildmsi" step.

+

+cmd /c Tools\buildbot\external.bat

+@rem build release versions of things

+call "%VS100COMNTOOLS%vsvars32.bat"

+

+@rem build Python

+msbuild /p:useenv=true PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32

+

+@rem build the documentation

+bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'

+"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp

+

+@rem build the MSI file

+cd PC

+nmake /f icons.mak

+cd ..\Tools\msi

+del *.msi

+nmake /f msisupport.mak

+%HOST_PYTHON% msi.py

+

diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
index 24660af..54d1fcf 100644
--- a/Tools/buildbot/clean-amd64.bat
+++ b/Tools/buildbot/clean-amd64.bat
@@ -1,10 +1,10 @@
-@rem Used by the buildbot "clean" step.
-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-@echo Deleting .pyc/.pyo files ...
-del /s Lib\*.pyc Lib\*.pyo
-@echo Deleting test leftovers ...
-rmdir /s /q build
-cd PCbuild
-msbuild /target:clean pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x64
-msbuild /target:clean pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x64
-cd ..
+@rem Used by the buildbot "clean" step.

+call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64

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

+del /s Lib\*.pyc Lib\*.pyo

+@echo Deleting test leftovers ...

+rmdir /s /q build

+cd PCbuild

+msbuild /target:clean pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x64

+msbuild /target:clean pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x64

+cd ..

diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 218facc..c69bf56 100644
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -1,8 +1,8 @@
-@rem Used by the buildbot "clean" step.
-call "%VS100COMNTOOLS%vsvars32.bat"
-@echo Deleting test leftovers ...
-rmdir /s /q build
-cd PCbuild
-msbuild /target:clean pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x86
-msbuild /target:clean pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x86
-cd ..
+@rem Used by the buildbot "clean" step.

+call "%VS100COMNTOOLS%vsvars32.bat"

+@echo Deleting test leftovers ...

+rmdir /s /q build

+cd PCbuild

+msbuild /target:clean pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x86

+msbuild /target:clean pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x86

+cd ..

diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index acd454e..0ea56b8 100644
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -1,28 +1,28 @@
-@rem Fetches (and builds if necessary) external dependencies
-
-@rem Assume we start inside the Python source directory
-call "Tools\buildbot\external-common.bat"
-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-
-if not exist tcltk64\bin\tcl86tg.dll (
-    cd tcl-8.6.1.0\win
-    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean core shell dlls
-    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install-binaries install-libraries
-    cd ..\..
-)
-
-if not exist tcltk64\bin\tk86tg.dll (
-    cd tk-8.6.1.0\win
-    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 clean
-    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 all
-    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries
-    cd ..\..
-)
-
-if not exist tcltk64\lib\tix8.4.3\tix84g.dll (
-    cd tix-8.4.3.4\win
-    nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 clean
-    nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 all
-    nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 install
-    cd ..\..
-)
+@rem Fetches (and builds if necessary) external dependencies

+

+@rem Assume we start inside the Python source directory

+call "Tools\buildbot\external-common.bat"

+call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64

+

+if not exist tcltk64\bin\tcl86tg.dll (

+    cd tcl-8.6.1.0\win

+    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean core shell dlls

+    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install-binaries install-libraries

+    cd ..\..

+)

+

+if not exist tcltk64\bin\tk86tg.dll (

+    cd tk-8.6.1.0\win

+    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 clean

+    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 all

+    nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries

+    cd ..\..

+)

+

+if not exist tcltk64\lib\tix8.4.3\tix84g.dll (

+    cd tix-8.4.3.4\win

+    nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 clean

+    nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 all

+    nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 install

+    cd ..\..

+)

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 4b902d5..8ecf6fa 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -1,54 +1,54 @@
-@rem Common file shared between external.bat and external-amd64.bat.  Responsible for
-@rem fetching external components into the root\.. buildbot directories.
-
-if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/
-
-if not exist externals mkdir externals
-cd externals
-@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
-@rem the following, check it in, then check it out, comment it out, then check it back in.
-@rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6
-@rem if exist tcltk rd /s/q tcltk
-@rem if exist tcltk64 rd /s/q tcltk64
-@rem if exist tcl-8.6.1.0 rd /s/q tcl-8.6.1.0
-@rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0
-@rem if exist tix-8.4.3.4 rd /s/q tix-8.4.3.4
-@rem if exist db-4.4.20 rd /s/q db-4.4.20
-@rem if exist openssl-1.0.2a rd /s/q openssl-1.0.2a
-@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
-
-@rem bzip
-if not exist bzip2-1.0.6 (
-   rd /s/q bzip2-1.0.5
-  svn export %SVNROOT%bzip2-1.0.6
-)
-
-@rem NASM, for OpenSSL build
-@rem if exist nasm-2.11.06 rd /s/q nasm-2.11.06
-if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06
-
-@rem OpenSSL
-if not exist openssl-1.0.2a (
-    rd /s/q openssl-1.0.1l
-    svn export %SVNROOT%openssl-1.0.2a
-)
-
-@rem tcl/tk
-if not exist tcl-8.6.1.0 (
-   rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0
-   svn export %SVNROOT%tcl-8.6.1.0
-)
-if not exist tk-8.6.1.0 svn export %SVNROOT%tk-8.6.1.0
-if not exist tix-8.4.3.4 svn export %SVNROOT%tix-8.4.3.4
-
-@rem sqlite3
-if not exist sqlite-3.8.3.1 (
-  rd /s/q sqlite-source-3.8.1
-  svn export %SVNROOT%sqlite-3.8.3.1
-)
-
-@rem lzma
-if not exist xz-5.0.5 (
-  rd /s/q xz-5.0.3
-  svn export %SVNROOT%xz-5.0.5
-)
+@rem Common file shared between external.bat and external-amd64.bat.  Responsible for

+@rem fetching external components into the root\.. buildbot directories.

+

+if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/

+

+if not exist externals mkdir externals

+cd externals

+@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment

+@rem the following, check it in, then check it out, comment it out, then check it back in.

+@rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6

+@rem if exist tcltk rd /s/q tcltk

+@rem if exist tcltk64 rd /s/q tcltk64

+@rem if exist tcl-8.6.1.0 rd /s/q tcl-8.6.1.0

+@rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0

+@rem if exist tix-8.4.3.4 rd /s/q tix-8.4.3.4

+@rem if exist db-4.4.20 rd /s/q db-4.4.20

+@rem if exist openssl-1.0.2a rd /s/q openssl-1.0.2a

+@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12

+

+@rem bzip

+if not exist bzip2-1.0.6 (

+   rd /s/q bzip2-1.0.5

+  svn export %SVNROOT%bzip2-1.0.6

+)

+

+@rem NASM, for OpenSSL build

+@rem if exist nasm-2.11.06 rd /s/q nasm-2.11.06

+if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06

+

+@rem OpenSSL

+if not exist openssl-1.0.2a (

+    rd /s/q openssl-1.0.1l

+    svn export %SVNROOT%openssl-1.0.2a

+)

+

+@rem tcl/tk

+if not exist tcl-8.6.1.0 (

+   rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0

+   svn export %SVNROOT%tcl-8.6.1.0

+)

+if not exist tk-8.6.1.0 svn export %SVNROOT%tk-8.6.1.0

+if not exist tix-8.4.3.4 svn export %SVNROOT%tix-8.4.3.4

+

+@rem sqlite3

+if not exist sqlite-3.8.3.1 (

+  rd /s/q sqlite-source-3.8.1

+  svn export %SVNROOT%sqlite-3.8.3.1

+)

+

+@rem lzma

+if not exist xz-5.0.5 (

+  rd /s/q xz-5.0.3

+  svn export %SVNROOT%xz-5.0.5

+)

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 3877d8d..7ee91c7 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -1,29 +1,29 @@
-@rem Fetches (and builds if necessary) external dependencies
-
-@rem Assume we start inside the Python source directory
-call "Tools\buildbot\external-common.bat"
-call "%VS100COMNTOOLS%\vsvars32.bat"
-
-if not exist tcltk\bin\tcl86tg.dll (
-    @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
-    cd tcl-8.6.1.0\win
-    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk clean core shell dlls
-    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk install-binaries install-libraries
-    cd ..\..
-)
-
-if not exist tcltk\bin\tk86tg.dll (
-    cd tk-8.6.1.0\win
-    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 clean
-    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 all
-    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries
-    cd ..\..
-)
-
-if not exist tcltk\lib\tix8.4.3\tix84g.dll (
-    cd tix-8.4.3.4\win
-    nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk clean
-    nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk all
-    nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk install
-    cd ..\..
-)
+@rem Fetches (and builds if necessary) external dependencies

+

+@rem Assume we start inside the Python source directory

+call "Tools\buildbot\external-common.bat"

+call "%VS100COMNTOOLS%\vsvars32.bat"

+

+if not exist tcltk\bin\tcl86tg.dll (

+    @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install

+    cd tcl-8.6.1.0\win

+    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk clean core shell dlls

+    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk install-binaries install-libraries

+    cd ..\..

+)

+

+if not exist tcltk\bin\tk86tg.dll (

+    cd tk-8.6.1.0\win

+    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 clean

+    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 all

+    nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries

+    cd ..\..

+)

+

+if not exist tcltk\lib\tix8.4.3\tix84g.dll (

+    cd tix-8.4.3.4\win

+    nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk clean

+    nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk all

+    nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk install

+    cd ..\..

+)

diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
index de64f25..9d4d67d 100644
--- a/Tools/buildbot/test-amd64.bat
+++ b/Tools/buildbot/test-amd64.bat
@@ -1,3 +1,3 @@
-@rem Used by the buildbot "test" step.
-cd PCbuild
-call rt.bat -d -q -x64 -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9
+@rem Used by the buildbot "test" step.

+cd PCbuild

+call rt.bat -d -q -x64 -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 4e4db10..da90a55 100644
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,3 +1,3 @@
-@rem Used by the buildbot "test" step.
-cd PCbuild
-call rt.bat -d -q -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9
+@rem Used by the buildbot "test" step.

+cd PCbuild

+call rt.bat -d -q -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9