mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

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

Browse source 
Using LF can a script to fail if it tries to use a label that is
split across 512 byte blocks.  Who knows why.
This commit is contained in:
Zachary Ware 2015-04-13 11:59:54 -05:00
parent f3b990e48c
commit 4c9c848159
23 changed files with 574 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.hgeol
View file

@ -40,6 +40,9 @@ Lib/venv/scripts/nt/* = BIN
Lib/test/coding20731.py = BIN Lib/test/coding20731.py = BIN
# Windows batch files work best with CRLF, there can be subtle problems with LF
**.bat = CRLF
# All other files (which presumably are human-editable) are "native". # All other files (which presumably are human-editable) are "native".
# This must be the last rule! # This must be the last rule!

248
Doc/make.bat
View file

@ -1,124 +1,124 @@
@echo off @echo off
setlocal setlocal
pushd %~dp0 pushd %~dp0
set this=%~n0 set this=%~n0
if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build
if "%PYTHON%" EQU "" set PYTHON=py if "%PYTHON%" EQU "" set PYTHON=py
if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)% if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)%
if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles% if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles%
if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe
if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v
if "%BUILDDIR%" EQU "" set BUILDDIR=build if "%BUILDDIR%" EQU "" set BUILDDIR=build
rem Targets that don't require sphinx-build rem Targets that don't require sphinx-build
if "%1" EQU "" goto help if "%1" EQU "" goto help
if "%1" EQU "help" goto help if "%1" EQU "help" goto help
if "%1" EQU "check" goto check if "%1" EQU "check" goto check
if "%1" EQU "serve" goto serve if "%1" EQU "serve" goto serve
if "%1" == "clean" ( if "%1" == "clean" (
rmdir /q /s %BUILDDIR% rmdir /q /s %BUILDDIR%
goto end goto end
) )
%SPHINXBUILD% 2> nul %SPHINXBUILD% 2> nul
if errorlevel 9009 ( if errorlevel 9009 (
echo. echo.
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.installed, then set the SPHINXBUILD environment variable to point echo.installed, then set the SPHINXBUILD environment variable to point
echo.to the full path of the 'sphinx-build' executable. Alternatively you echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.may add the Sphinx directory to PATH. echo.may add the Sphinx directory to PATH.
echo. echo.
echo.If you don't have Sphinx installed, grab it from echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/ echo.http://sphinx-doc.org/
goto end goto end
) )
rem Targets that do require sphinx-build and have their own label rem Targets that do require sphinx-build and have their own label
if "%1" EQU "htmlview" goto htmlview if "%1" EQU "htmlview" goto htmlview
rem Everything else rem Everything else
goto build goto build
:help :help
echo.usage: %this% BUILDER [filename ...] echo.usage: %this% BUILDER [filename ...]
echo. echo.
echo.Call %this% with the desired Sphinx builder as the first argument, e.g. echo.Call %this% with the desired Sphinx builder as the first argument, e.g.
echo.``%this% html`` or ``%this% doctest``. Interesting targets that are echo.``%this% html`` or ``%this% doctest``. Interesting targets that are
echo.always available include: echo.always available include:
echo. echo.
echo. Provided by Sphinx: echo. Provided by Sphinx:
echo. html, htmlhelp, latex, text echo. html, htmlhelp, latex, text
echo. suspicious, linkcheck, changes, doctest echo. suspicious, linkcheck, changes, doctest
echo. Provided by this script: echo. Provided by this script:
echo. clean, check, serve, htmlview echo. clean, check, serve, htmlview
echo. echo.
echo.All arguments past the first one are passed through to sphinx-build as echo.All arguments past the first one are passed through to sphinx-build as
echo.filenames to build or are ignored. See README.txt in this directory or echo.filenames to build or are ignored. See README.txt in this directory or
echo.the documentation for your version of Sphinx for more exhaustive lists echo.the documentation for your version of Sphinx for more exhaustive lists
echo.of available targets and descriptions of each. echo.of available targets and descriptions of each.
echo. echo.
echo.This script assumes that the SPHINXBUILD environment variable contains echo.This script assumes that the SPHINXBUILD environment variable contains
echo.a legitimate command for calling sphinx-build, or that sphinx-build is echo.a legitimate command for calling sphinx-build, or that sphinx-build is
echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can
echo.be passed by setting the SPHINXOPTS environment variable. echo.be passed by setting the SPHINXOPTS environment variable.
goto end goto end
:build :build
if NOT "%PAPER%" == "" ( if NOT "%PAPER%" == "" (
set SPHINXOPTS=-D latex_paper_size=%PAPER% %SPHINXOPTS% set SPHINXOPTS=-D latex_paper_size=%PAPER% %SPHINXOPTS%
) )
cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%* cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*
if "%1" EQU "htmlhelp" ( if "%1" EQU "htmlhelp" (
if not exist "%HTMLHELP%" ( if not exist "%HTMLHELP%" (
echo. echo.
echo.The HTML Help Workshop was not found. Set the HTMLHELP variable echo.The HTML Help Workshop was not found. Set the HTMLHELP variable
echo.to the path to hhc.exe or download and install it from echo.to the path to hhc.exe or download and install it from
echo.http://msdn.microsoft.com/en-us/library/ms669985 echo.http://msdn.microsoft.com/en-us/library/ms669985
rem Set errorlevel to 1 and exit rem Set errorlevel to 1 and exit
cmd /C exit /b 1 cmd /C exit /b 1
goto end goto end
) )
cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2 rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2
if not errorlevel 2 cmd /C exit /b 0 if not errorlevel 2 cmd /C exit /b 0
) )
echo. echo.
if errorlevel 1 ( if errorlevel 1 (
echo.Build failed (exit code %ERRORLEVEL%^), check for error messages echo.Build failed (exit code %ERRORLEVEL%^), check for error messages
echo.above. Any output will be found in %BUILDDIR%\%1 echo.above. Any output will be found in %BUILDDIR%\%1
) else ( ) else (
echo.Build succeeded. All output should be in %BUILDDIR%\%1 echo.Build succeeded. All output should be in %BUILDDIR%\%1
) )
goto end goto end
:htmlview :htmlview
if NOT "%2" EQU "" ( if NOT "%2" EQU "" (
echo.Can't specify filenames to build with htmlview target, ignoring. echo.Can't specify filenames to build with htmlview target, ignoring.
) )
cmd /C %this% html cmd /C %this% html
if EXIST %BUILDDIR%\html\index.html ( if EXIST %BUILDDIR%\html\index.html (
echo.Opening %BUILDDIR%\html\index.html in the default web browser... echo.Opening %BUILDDIR%\html\index.html in the default web browser...
start %BUILDDIR%\html\index.html start %BUILDDIR%\html\index.html
) )
goto end goto end
:check :check
cmd /C %PYTHON% tools\rstlint.py -i tools cmd /C %PYTHON% tools\rstlint.py -i tools
goto end goto end
:serve :serve
cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html
goto end goto end
:end :end
popd popd

2
Lib/ctypes/macholib/fetch_macholib.bat
View file

@ -1 +1 @@
svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ . svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ .

8
Lib/idlelib/idle.bat
View file

@ -1,4 +1,4 @@
@echo off @echo off
rem Start IDLE using the appropriate Python interpreter rem Start IDLE using the appropriate Python interpreter
set CURRDIR=%~dp0 set CURRDIR=%~dp0
start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9 start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9

222
Modules/_decimal/tests/runall.bat
View file

@ -1,111 +1,111 @@
@ECHO OFF @ECHO OFF
rem Test all machine configurations, pydebug, refleaks, release build. rem Test all machine configurations, pydebug, refleaks, release build.
cd ..\..\..\ cd ..\..\..\
echo. echo.
echo # ====================================================================== echo # ======================================================================
echo # Building Python echo # Building Python
echo # ====================================================================== echo # ======================================================================
echo. echo.
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x64 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
msbuild /noconsolelogger /target:clean PCbuild\pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x64 msbuild /noconsolelogger /target:clean PCbuild\pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x64
msbuild /noconsolelogger /target:clean PCbuild\pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x64 msbuild /noconsolelogger /target:clean PCbuild\pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x64
msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=x64 msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=x64
msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64 msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32 msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32
msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32 msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32
echo. echo.
echo. echo.
echo. echo.
echo # ====================================================================== echo # ======================================================================
echo # test_decimal: platform=x64 echo # test_decimal: platform=x64
echo # ====================================================================== echo # ======================================================================
echo. echo.
cd PCbuild\amd64 cd PCbuild\amd64
echo # ==================== refleak tests ======================= echo # ==================== refleak tests =======================
echo. echo.
python_d.exe -m test -uall -R 2:2 test_decimal python_d.exe -m test -uall -R 2:2 test_decimal
echo. echo.
echo. echo.
echo # ==================== regular tests ======================= echo # ==================== regular tests =======================
echo. echo.
python.exe -m test -uall test_decimal python.exe -m test -uall test_decimal
echo. echo.
echo. echo.
cd .. cd ..
echo. echo.
echo # ====================================================================== echo # ======================================================================
echo # test_decimal: platform=x86 echo # test_decimal: platform=x86
echo # ====================================================================== echo # ======================================================================
echo. echo.
echo # ==================== refleak tests ======================= echo # ==================== refleak tests =======================
echo. echo.
python_d.exe -m test -uall -R 2:2 test_decimal python_d.exe -m test -uall -R 2:2 test_decimal
echo. echo.
echo. echo.
echo # ==================== regular tests ======================= echo # ==================== regular tests =======================
echo. echo.
python.exe -m test -uall test_decimal python.exe -m test -uall test_decimal
echo. echo.
echo. echo.
cd amd64 cd amd64
echo. echo.
echo # ====================================================================== echo # ======================================================================
echo # deccheck: platform=x64 echo # deccheck: platform=x64
echo # ====================================================================== echo # ======================================================================
echo. echo.
echo # ==================== debug build ======================= echo # ==================== debug build =======================
echo. echo.
python_d.exe ..\..\Modules\_decimal\tests\deccheck.py python_d.exe ..\..\Modules\_decimal\tests\deccheck.py
echo. echo.
echo. echo.
echo # =================== release build ====================== echo # =================== release build ======================
echo. echo.
python.exe ..\..\Modules\_decimal\tests\deccheck.py python.exe ..\..\Modules\_decimal\tests\deccheck.py
echo. echo.
echo. echo.
cd .. cd ..
echo. echo.
echo # ====================================================================== echo # ======================================================================
echo # deccheck: platform=x86 echo # deccheck: platform=x86
echo # ====================================================================== echo # ======================================================================
echo. echo.
echo. echo.
echo # ==================== debug build ======================= echo # ==================== debug build =======================
echo. echo.
python_d.exe ..\Modules\_decimal\tests\deccheck.py python_d.exe ..\Modules\_decimal\tests\deccheck.py
echo. echo.
echo. echo.
echo # =================== release build ====================== echo # =================== release build ======================
echo. echo.
python.exe ..\Modules\_decimal\tests\deccheck.py python.exe ..\Modules\_decimal\tests\deccheck.py
echo. echo.
echo. echo.
cd ..\Modules\_decimal\tests cd ..\Modules\_decimal\tests

38
PCbuild/build.bat
View file

@ -1,19 +1,19 @@
@echo off @echo off
rem A batch program to build or rebuild a particular configuration. rem A batch program to build or rebuild a particular configuration.
rem just for convenience. rem just for convenience.
setlocal setlocal
set platf=Win32 set platf=Win32
set conf=Release set conf=Release
set target=build set target=build
set dir=%~dp0 set dir=%~dp0
:CheckOpts :CheckOpts
if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
if "%1"=="-r" (set target=rebuild) & shift & goto CheckOpts if "%1"=="-r" (set target=rebuild) & shift & goto CheckOpts
if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts
set cmd=msbuild /p:useenv=true %dir%pcbuild.sln /t:%target% /p:Configuration=%conf% /p:Platform=%platf% set cmd=msbuild /p:useenv=true %dir%pcbuild.sln /t:%target% /p:Configuration=%conf% /p:Platform=%platf%
echo %cmd% echo %cmd%
%cmd% %cmd%

2
PCbuild/build_env.bat
View file

@ -1 +1 @@
@%comspec% /k env.bat %* @%comspec% /k env.bat %*

82
PCbuild/build_pgo.bat
View file

@ -1,41 +1,41 @@
@echo off @echo off
rem A batch program to build PGO (Profile guided optimization) by first rem A batch program to build PGO (Profile guided optimization) by first
rem building instrumented binaries, then running the testsuite, and rem building instrumented binaries, then running the testsuite, and
rem finally building the optimized code. rem finally building the optimized code.
rem Note, after the first instrumented run, one can just keep on rem Note, after the first instrumented run, one can just keep on
rem building the PGUpdate configuration while developing. rem building the PGUpdate configuration while developing.
setlocal setlocal
set platf=Win32 set platf=Win32
rem use the performance testsuite. This is quick and simple rem use the performance testsuite. This is quick and simple
set job1=..\tools\pybench\pybench.py -n 1 -C 1 --with-gc set job1=..\tools\pybench\pybench.py -n 1 -C 1 --with-gc
set path1=..\tools\pybench set path1=..\tools\pybench
rem or the whole testsuite for more thorough testing rem or the whole testsuite for more thorough testing
set job2=..\lib\test\regrtest.py set job2=..\lib\test\regrtest.py
set path2=..\lib set path2=..\lib
set job=%job1% set job=%job1%
set clrpath=%path1% set clrpath=%path1%
:CheckOpts :CheckOpts
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
set PGI=%platf%-pgi set PGI=%platf%-pgi
set PGO=%platf%-pgo set PGO=%platf%-pgo
@echo on @echo on
rem build the instrumented version rem build the instrumented version
call build -p %platf% -c PGInstrument call build -p %platf% -c PGInstrument
rem remove .pyc files, .pgc files and execute the job rem remove .pyc files, .pgc files and execute the job
%PGI%\python.exe rmpyc.py %clrpath% %PGI%\python.exe rmpyc.py %clrpath%
del %PGI%\*.pgc del %PGI%\*.pgc
%PGI%\python.exe %job% %PGI%\python.exe %job%
rem finally build the optimized version rem finally build the optimized version
if exist %PGO% del /s /q %PGO% if exist %PGO% del /s /q %PGO%
call build -p %platf% -c PGUpdate call build -p %platf% -c PGUpdate

24
PCbuild/build_ssl.bat
View file

@ -1,12 +1,12 @@
@echo off @echo off
if not defined HOST_PYTHON ( if not defined HOST_PYTHON (
if %1 EQU Debug ( if %1 EQU Debug (
set HOST_PYTHON=python_d.exe set HOST_PYTHON=python_d.exe
if not exist python34_d.dll exit 1 if not exist python34_d.dll exit 1
) ELSE ( ) ELSE (
set HOST_PYTHON=python.exe set HOST_PYTHON=python.exe
if not exist python34.dll exit 1 if not exist python34.dll exit 1
) )
) )
%HOST_PYTHON% build_ssl.py %1 %2 %3 %HOST_PYTHON% build_ssl.py %1 %2 %3

18
PCbuild/env.bat
View file

@ -1,9 +1,9 @@
@echo off @echo off
set VS10=%ProgramFiles(x86)%\Microsoft Visual Studio 10.0 set VS10=%ProgramFiles(x86)%\Microsoft Visual Studio 10.0
IF EXIST "%VS10%" GOTO ok IF EXIST "%VS10%" GOTO ok
set VS10=%ProgramFiles%\Microsoft Visual Studio 10.0 set VS10=%ProgramFiles%\Microsoft Visual Studio 10.0
:ok :ok
echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64 echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
echo. echo.
call "%VS10%\VC\vcvarsall.bat" %1 call "%VS10%\VC\vcvarsall.bat" %1

30
PCbuild/idle.bat
View file

@ -1,15 +1,15 @@
@echo off @echo off
rem start idle rem start idle
rem Usage: idle [-d] rem Usage: idle [-d]
rem -d Run Debug build (python_d.exe). Else release build. rem -d Run Debug build (python_d.exe). Else release build.
setlocal setlocal
set exe=python set exe=python
PATH %PATH%;..\..\tcltk\bin PATH %PATH%;..\..\tcltk\bin
if "%1"=="-d" (set exe=python_d) & shift if "%1"=="-d" (set exe=python_d) & shift
set cmd=%exe% ../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9 set cmd=%exe% ../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9
echo on echo on
%cmd% %cmd%

116
PCbuild/rt.bat
View file

@ -1,58 +1,58 @@
@echo off @echo off
rem Run Tests. Run the regression test suite. rem Run Tests. Run the regression test suite.
rem Usage: rt [-d] [-O] [-q] [-x64] regrtest_args rem Usage: rt [-d] [-O] [-q] [-x64] regrtest_args
rem -d Run Debug build (python_d.exe). Else release build. rem -d Run Debug build (python_d.exe). Else release build.
rem -O Run python.exe or python_d.exe (see -d) with -O. rem -O Run python.exe or python_d.exe (see -d) with -O.
rem -q "quick" -- normally the tests are run twice, the first time rem -q "quick" -- normally the tests are run twice, the first time
rem after deleting all the .py[co] files reachable from Lib/. rem after deleting all the .py[co] files reachable from Lib/.
rem -q runs the tests just once, and without deleting .py[co] files. rem -q runs the tests just once, and without deleting .py[co] files.
rem -x64 Run the 64-bit build of python (or python_d if -d was specified) rem -x64 Run the 64-bit build of python (or python_d if -d was specified)
rem from the 'amd64' dir instead of the 32-bit build in this dir. rem from the 'amd64' dir instead of the 32-bit build in this dir.
rem All leading instances of these switches are shifted off, and rem All leading instances of these switches are shifted off, and
rem whatever remains is passed to regrtest.py. For example, rem whatever remains is passed to regrtest.py. For example,
rem rt -O -d -x test_thread rem rt -O -d -x test_thread
rem runs rem runs
rem python_d -O ../lib/test/regrtest.py -x test_thread rem python_d -O ../lib/test/regrtest.py -x test_thread
rem twice, and rem twice, and
rem rt -q -g test_binascii rem rt -q -g test_binascii
rem runs rem runs
rem python_d ../lib/test/regrtest.py -g test_binascii rem python_d ../lib/test/regrtest.py -g test_binascii
rem to generate the expected-output file for binascii quickly. rem to generate the expected-output file for binascii quickly.
rem rem
rem Confusing: if you want to pass a comma-separated list, like rem Confusing: if you want to pass a comma-separated list, like
rem -u network,largefile rem -u network,largefile
rem then you have to quote it on the rt line, like rem then you have to quote it on the rt line, like
rem rt -u "network,largefile" rem rt -u "network,largefile"
setlocal setlocal
set prefix=.\ set prefix=.\
set suffix= set suffix=
set qmode= set qmode=
set dashO= set dashO=
set tcltk=tcltk set tcltk=tcltk
:CheckOpts :CheckOpts
if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts
if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts
PATH %PATH%;%~dp0..\externals\%tcltk%\bin PATH %PATH%;%~dp0..\externals\%tcltk%\bin
set exe=%prefix%\python%suffix% set exe=%prefix%\python%suffix%
set cmd=%exe% %dashO% -Wd -E -bb ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 set cmd=%exe% %dashO% -Wd -E -bb ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
if defined qmode goto Qmode if defined qmode goto Qmode
echo Deleting .pyc/.pyo files ... echo Deleting .pyc/.pyo files ...
%exe% rmpyc.py %exe% rmpyc.py
echo on echo on
%cmd% %cmd%
@echo off @echo off
echo About to run again without deleting .pyc/.pyo first: echo About to run again without deleting .pyc/.pyo first:
pause pause
:Qmode :Qmode
echo on echo on
%cmd% %cmd%

12
Tools/buildbot/build-amd64.bat
View file

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

14
Tools/buildbot/build.bat
View file

@ -1,7 +1,7 @@
@rem Used by the buildbot "compile" step. @rem Used by the buildbot "compile" step.
cmd /c Tools\buildbot\external.bat cmd /c Tools\buildbot\external.bat
call "%VS100COMNTOOLS%vsvars32.bat" call "%VS100COMNTOOLS%vsvars32.bat"
cmd /c Tools\buildbot\clean.bat cmd /c Tools\buildbot\clean.bat
msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32 msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32

42
Tools/buildbot/buildmsi.bat
View file

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

20
Tools/buildbot/clean-amd64.bat
View file

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

16
Tools/buildbot/clean.bat
View file

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

56
Tools/buildbot/external-amd64.bat
View file

@ -1,28 +1,28 @@
@rem Fetches (and builds if necessary) external dependencies @rem Fetches (and builds if necessary) external dependencies
@rem Assume we start inside the Python source directory @rem Assume we start inside the Python source directory
call "Tools\buildbot\external-common.bat" call "Tools\buildbot\external-common.bat"
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
if not exist tcltk64\bin\tcl86tg.dll ( if not exist tcltk64\bin\tcl86tg.dll (
cd tcl-8.6.1.0\win 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 clean core shell dlls
nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install-binaries install-libraries nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install-binaries install-libraries
cd ..\.. cd ..\..
) )
if not exist tcltk64\bin\tk86tg.dll ( if not exist tcltk64\bin\tk86tg.dll (
cd tk-8.6.1.0\win 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 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 all
nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries
cd ..\.. cd ..\..
) )
if not exist tcltk64\lib\tix8.4.3\tix84g.dll ( if not exist tcltk64\lib\tix8.4.3\tix84g.dll (
cd tix-8.4.3.4\win 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 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 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 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 ..\.. cd ..\..
) )

108
Tools/buildbot/external-common.bat
View file

@ -1,54 +1,54 @@
@rem Common file shared between external.bat and external-amd64.bat. Responsible for @rem Common file shared between external.bat and external-amd64.bat. Responsible for
@rem fetching external components into the root\.. buildbot directories. @rem fetching external components into the root\.. buildbot directories.
if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/ if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/
if not exist externals mkdir externals if not exist externals mkdir externals
cd externals cd externals
@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment @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 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 bzip2-1.0.6 rd /s/q bzip2-1.0.6
@rem if exist tcltk rd /s/q tcltk @rem if exist tcltk rd /s/q tcltk
@rem if exist tcltk64 rd /s/q tcltk64 @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 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 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 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 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 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 if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
@rem bzip @rem bzip
if not exist bzip2-1.0.6 ( if not exist bzip2-1.0.6 (
rd /s/q bzip2-1.0.5 rd /s/q bzip2-1.0.5
svn export %SVNROOT%bzip2-1.0.6 svn export %SVNROOT%bzip2-1.0.6
) )
@rem NASM, for OpenSSL build @rem NASM, for OpenSSL build
@rem if exist nasm-2.11.06 rd /s/q nasm-2.11.06 @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 if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06
@rem OpenSSL @rem OpenSSL
if not exist openssl-1.0.2a ( if not exist openssl-1.0.2a (
rd /s/q openssl-1.0.1l rd /s/q openssl-1.0.1l
svn export %SVNROOT%openssl-1.0.2a svn export %SVNROOT%openssl-1.0.2a
) )
@rem tcl/tk @rem tcl/tk
if not exist tcl-8.6.1.0 ( if not exist tcl-8.6.1.0 (
rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0 rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0
svn export %SVNROOT%tcl-8.6.1.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 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 if not exist tix-8.4.3.4 svn export %SVNROOT%tix-8.4.3.4
@rem sqlite3 @rem sqlite3
if not exist sqlite-3.8.3.1 ( if not exist sqlite-3.8.3.1 (
rd /s/q sqlite-source-3.8.1 rd /s/q sqlite-source-3.8.1
svn export %SVNROOT%sqlite-3.8.3.1 svn export %SVNROOT%sqlite-3.8.3.1
) )
@rem lzma @rem lzma
if not exist xz-5.0.5 ( if not exist xz-5.0.5 (
rd /s/q xz-5.0.3 rd /s/q xz-5.0.3
svn export %SVNROOT%xz-5.0.5 svn export %SVNROOT%xz-5.0.5
) )

58
Tools/buildbot/external.bat
View file

@ -1,29 +1,29 @@
@rem Fetches (and builds if necessary) external dependencies @rem Fetches (and builds if necessary) external dependencies
@rem Assume we start inside the Python source directory @rem Assume we start inside the Python source directory
call "Tools\buildbot\external-common.bat" call "Tools\buildbot\external-common.bat"
call "%VS100COMNTOOLS%\vsvars32.bat" call "%VS100COMNTOOLS%\vsvars32.bat"
if not exist tcltk\bin\tcl86tg.dll ( if not exist tcltk\bin\tcl86tg.dll (
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
cd tcl-8.6.1.0\win 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 clean core shell dlls
nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk install-binaries install-libraries nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk install-binaries install-libraries
cd ..\.. cd ..\..
) )
if not exist tcltk\bin\tk86tg.dll ( if not exist tcltk\bin\tk86tg.dll (
cd tk-8.6.1.0\win 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 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 all
nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries
cd ..\.. cd ..\..
) )
if not exist tcltk\lib\tix8.4.3\tix84g.dll ( if not exist tcltk\lib\tix8.4.3\tix84g.dll (
cd tix-8.4.3.4\win 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 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 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 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 ..\.. cd ..\..
) )

6
Tools/buildbot/test-amd64.bat
View file

@ -1,3 +1,3 @@
@rem Used by the buildbot "test" step. @rem Used by the buildbot "test" step.
cd PCbuild cd PCbuild
call rt.bat -d -q -x64 -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9 call rt.bat -d -q -x64 -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9

6
Tools/buildbot/test.bat
View file

@ -1,3 +1,3 @@
@rem Used by the buildbot "test" step. @rem Used by the buildbot "test" step.
cd PCbuild cd PCbuild
call rt.bat -d -q -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9 call rt.bat -d -q -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9

14
Tools/unicode/genwincodecs.bat
View file

@ -1,7 +1,7 @@
@rem Recreate some python charmap codecs from the Windows function @rem Recreate some python charmap codecs from the Windows function
@rem MultiByteToWideChar. @rem MultiByteToWideChar.
@cd /d %~dp0 @cd /d %~dp0
@mkdir build @mkdir build
@rem Arabic DOS code page @rem Arabic DOS code page
c:\python30\python genwincodec.py 720 > build/cp720.py c:\python30\python genwincodec.py 720 > build/cp720.py