Lib/test/decimaltestdata/*.decTest = BIN
Lib/test/sndhdrdata/sndhdr.* = 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".
# This must be the last rule!
-@echo off
-setlocal
-
-pushd %~dp0
-
-set this=%~n0
-
-if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build
-if "%PYTHON%" EQU "" set PYTHON=py
-
-if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)%
-if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles%
-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 "%BUILDDIR%" EQU "" set BUILDDIR=build
-
-rem Targets that don't require sphinx-build
-if "%1" EQU "" goto help
-if "%1" EQU "help" goto help
-if "%1" EQU "check" goto check
-if "%1" EQU "serve" goto serve
-if "%1" == "clean" (
- rmdir /q /s %BUILDDIR%
- goto end
-)
-
-%SPHINXBUILD% 2> nul
-if errorlevel 9009 (
- echo.
- echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
- echo.installed, then set the SPHINXBUILD environment variable to point
- echo.to the full path of the 'sphinx-build' executable. Alternatively you
- echo.may add the Sphinx directory to PATH.
- echo.
- echo.If you don't have Sphinx installed, grab it from
- echo.http://sphinx-doc.org/
- goto end
-)
-
-rem Targets that do require sphinx-build and have their own label
-if "%1" EQU "htmlview" goto htmlview
-
-rem Everything else
-goto build
-
-:help
-echo.usage: %this% BUILDER [filename ...]
-echo.
-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.always available include:
-echo.
-echo. Provided by Sphinx:
-echo. html, htmlhelp, latex, text
-echo. suspicious, linkcheck, changes, doctest
-echo. Provided by this script:
-echo. clean, check, serve, htmlview
-echo.
-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.the documentation for your version of Sphinx for more exhaustive lists
-echo.of available targets and descriptions of each.
-echo.
-echo.This script assumes that the SPHINXBUILD environment variable contains
-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.be passed by setting the SPHINXOPTS environment variable.
-goto end
-
-:build
-if NOT "%PAPER%" == "" (
- set SPHINXOPTS=-D latex_paper_size=%PAPER% %SPHINXOPTS%
-)
-cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*
-
-if "%1" EQU "htmlhelp" (
- if not exist "%HTMLHELP%" (
- echo.
- 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.http://msdn.microsoft.com/en-us/library/ms669985
- rem Set errorlevel to 1 and exit
- cmd /C exit /b 1
- goto end
- )
- 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
- if not errorlevel 2 cmd /C exit /b 0
-)
-
-echo.
-if errorlevel 1 (
- echo.Build failed (exit code %ERRORLEVEL%^), check for error messages
- echo.above. Any output will be found in %BUILDDIR%\%1
-) else (
- echo.Build succeeded. All output should be in %BUILDDIR%\%1
-)
-goto end
-
-:htmlview
-if NOT "%2" EQU "" (
- echo.Can't specify filenames to build with htmlview target, ignoring.
-)
-cmd /C %this% html
-
-if EXIST %BUILDDIR%\html\index.html (
- echo.Opening %BUILDDIR%\html\index.html in the default web browser...
- start %BUILDDIR%\html\index.html
-)
-
-goto end
-
-:check
-cmd /C %PYTHON% tools\rstlint.py -i tools
-goto end
-
-:serve
-cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html
-goto end
-
-:end
-popd
+@echo off\r
+setlocal\r
+\r
+pushd %~dp0\r
+\r
+set this=%~n0\r
+\r
+if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build\r
+if "%PYTHON%" EQU "" set PYTHON=py\r
+\r
+if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)%\r
+if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles%\r
+if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe\r
+\r
+if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v\r
+\r
+if "%BUILDDIR%" EQU "" set BUILDDIR=build\r
+\r
+rem Targets that don't require sphinx-build\r
+if "%1" EQU "" goto help\r
+if "%1" EQU "help" goto help\r
+if "%1" EQU "check" goto check\r
+if "%1" EQU "serve" goto serve\r
+if "%1" == "clean" (\r
+ rmdir /q /s %BUILDDIR%\r
+ goto end\r
+)\r
+\r
+%SPHINXBUILD% 2> nul\r
+if errorlevel 9009 (\r
+ echo.\r
+ echo.The 'sphinx-build' command was not found. Make sure you have Sphinx\r
+ echo.installed, then set the SPHINXBUILD environment variable to point\r
+ echo.to the full path of the 'sphinx-build' executable. Alternatively you\r
+ echo.may add the Sphinx directory to PATH.\r
+ echo.\r
+ echo.If you don't have Sphinx installed, grab it from\r
+ echo.http://sphinx-doc.org/\r
+ goto end\r
+)\r
+\r
+rem Targets that do require sphinx-build and have their own label\r
+if "%1" EQU "htmlview" goto htmlview\r
+\r
+rem Everything else\r
+goto build\r
+\r
+:help\r
+echo.usage: %this% BUILDER [filename ...]\r
+echo.\r
+echo.Call %this% with the desired Sphinx builder as the first argument, e.g.\r
+echo.``%this% html`` or ``%this% doctest``. Interesting targets that are\r
+echo.always available include:\r
+echo.\r
+echo. Provided by Sphinx:\r
+echo. html, htmlhelp, latex, text\r
+echo. suspicious, linkcheck, changes, doctest\r
+echo. Provided by this script:\r
+echo. clean, check, serve, htmlview\r
+echo.\r
+echo.All arguments past the first one are passed through to sphinx-build as\r
+echo.filenames to build or are ignored. See README.txt in this directory or\r
+echo.the documentation for your version of Sphinx for more exhaustive lists\r
+echo.of available targets and descriptions of each.\r
+echo.\r
+echo.This script assumes that the SPHINXBUILD environment variable contains\r
+echo.a legitimate command for calling sphinx-build, or that sphinx-build is\r
+echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can\r
+echo.be passed by setting the SPHINXOPTS environment variable.\r
+goto end\r
+\r
+:build\r
+if NOT "%PAPER%" == "" (\r
+ set SPHINXOPTS=-D latex_paper_size=%PAPER% %SPHINXOPTS%\r
+)\r
+cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*\r
+\r
+if "%1" EQU "htmlhelp" (\r
+ if not exist "%HTMLHELP%" (\r
+ echo.\r
+ echo.The HTML Help Workshop was not found. Set the HTMLHELP variable\r
+ echo.to the path to hhc.exe or download and install it from\r
+ echo.http://msdn.microsoft.com/en-us/library/ms669985\r
+ rem Set errorlevel to 1 and exit\r
+ cmd /C exit /b 1\r
+ goto end\r
+ )\r
+ cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp\r
+ rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2\r
+ if not errorlevel 2 cmd /C exit /b 0\r
+)\r
+\r
+echo.\r
+if errorlevel 1 (\r
+ echo.Build failed (exit code %ERRORLEVEL%^), check for error messages\r
+ echo.above. Any output will be found in %BUILDDIR%\%1\r
+) else (\r
+ echo.Build succeeded. All output should be in %BUILDDIR%\%1\r
+)\r
+goto end\r
+\r
+:htmlview\r
+if NOT "%2" EQU "" (\r
+ echo.Can't specify filenames to build with htmlview target, ignoring.\r
+)\r
+cmd /C %this% html\r
+\r
+if EXIST %BUILDDIR%\html\index.html (\r
+ echo.Opening %BUILDDIR%\html\index.html in the default web browser...\r
+ start %BUILDDIR%\html\index.html\r
+)\r
+\r
+goto end\r
+\r
+:check\r
+cmd /C %PYTHON% tools\rstlint.py -i tools\r
+goto end\r
+\r
+:serve\r
+cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html\r
+goto end\r
+\r
+:end\r
+popd\r
-svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ .
+svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ .\r
-@echo off
-rem Start IDLE using the appropriate Python interpreter
-set CURRDIR=%~dp0
-start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@echo off\r
+rem Start IDLE using the appropriate Python interpreter\r
+set CURRDIR=%~dp0\r
+start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9\r
-@rem Run Tests. Run the regression test suite.
-@rem Usage: rt [-d] [-O] [-q] regrtest_args
-@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 -q "quick" -- normally the tests are run twice, the first time
-@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 All leading instances of these switches are shifted off, and
-@rem whatever remains is passed to regrtest.py. For example,
-@rem rt -O -d -x test_thread
-@rem runs
-@rem python_d -O ../../lib/test/regrtest.py -x test_thread
-@rem twice, and
-@rem rt -q -g test_binascii
-@rem runs
-@rem python_d ../../lib/test/regrtest.py -g test_binascii
-@rem to generate the expected-output file for binascii quickly.
-@set _exe=python
-@set _qmode=no
-@set _dashO=
-@goto CheckOpts
-:Again
-@shift
-:CheckOpts
-@if "%1"=="-O" set _dashO=-O
-@if "%1"=="-O" goto Again
-@if "%1"=="-q" set _qmode=yes
-@if "%1"=="-q" goto Again
-@if "%1"=="-d" set _exe=python_d
-@if "%1"=="-d" goto Again
-@if "%_qmode%"=="yes" goto Qmode
-@echo Deleting .pyc/.pyo files ...
-@%_exe% rmpyc.py
-%_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
-@echo About to run again without deleting .pyc/.pyo first:
-@pause
-:Qmode
-%_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
-@set _exe=
-@set _qmode=
-@set _dashO=
+@rem Run Tests. Run the regression test suite.\r
+@rem Usage: rt [-d] [-O] [-q] regrtest_args\r
+@rem -d Run Debug build (python_d.exe). Else release build.\r
+@rem -O Run python.exe or python_d.exe (see -d) with -O.\r
+@rem -q "quick" -- normally the tests are run twice, the first time\r
+@rem after deleting all the .py[co] files reachable from Lib/.\r
+@rem -q runs the tests just once, and without deleting .py[co] files.\r
+@rem All leading instances of these switches are shifted off, and\r
+@rem whatever remains is passed to regrtest.py. For example,\r
+@rem rt -O -d -x test_thread\r
+@rem runs\r
+@rem python_d -O ../../lib/test/regrtest.py -x test_thread\r
+@rem twice, and\r
+@rem rt -q -g test_binascii\r
+@rem runs\r
+@rem python_d ../../lib/test/regrtest.py -g test_binascii\r
+@rem to generate the expected-output file for binascii quickly.\r
+@set _exe=python\r
+@set _qmode=no\r
+@set _dashO=\r
+@goto CheckOpts\r
+:Again\r
+@shift\r
+:CheckOpts\r
+@if "%1"=="-O" set _dashO=-O\r
+@if "%1"=="-O" goto Again\r
+@if "%1"=="-q" set _qmode=yes\r
+@if "%1"=="-q" goto Again\r
+@if "%1"=="-d" set _exe=python_d\r
+@if "%1"=="-d" goto Again\r
+@if "%_qmode%"=="yes" goto Qmode\r
+@echo Deleting .pyc/.pyo files ...\r
+@%_exe% rmpyc.py\r
+%_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+@echo About to run again without deleting .pyc/.pyo first:\r
+@pause\r
+:Qmode\r
+%_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+@set _exe=\r
+@set _qmode=\r
+@set _dashO=\r
-@echo off
-rem Try to find the AMD64 assembler and call it with the supplied arguments.
-
-set MLEXE=Microsoft Platform SDK\Bin\Win64\x86\AMD64\ml64.EXE
-
-rem For the environment variables see also
-rem http://msdn.microsoft.com/library/en-us/win64/win64/wow64_implementation_details.asp
-
-if exist "%ProgramFiles%\%MLEXE%" (
- set ML64="%ProgramFiles%\%MLEXE%"
-) else if exist "%ProgramW6432%\%MLEXE%" (
- set ML64="%ProgramW6432%\%MLEXE%"
-) else (
- set ML64=ml64.exe
-)
-
-%ML64% %*
+@echo off\r
+rem Try to find the AMD64 assembler and call it with the supplied arguments.\r
+\r
+set MLEXE=Microsoft Platform SDK\Bin\Win64\x86\AMD64\ml64.EXE\r
+\r
+rem For the environment variables see also\r
+rem http://msdn.microsoft.com/library/en-us/win64/win64/wow64_implementation_details.asp\r
+\r
+if exist "%ProgramFiles%\%MLEXE%" (\r
+ set ML64="%ProgramFiles%\%MLEXE%"\r
+) else if exist "%ProgramW6432%\%MLEXE%" (\r
+ set ML64="%ProgramW6432%\%MLEXE%"\r
+) else (\r
+ set ML64=ml64.exe\r
+)\r
+\r
+%ML64% %*\r
-if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
-
-@echo off
-if not defined HOST_PYTHON (
- if %1 EQU Debug (
- set HOST_PYTHON=python_d.exe
- ) ELSE (
- set HOST_PYTHON=python.exe
- )
-)
-%HOST_PYTHON% build_ssl.py %1 %2
-
+if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL\r
+\r
+@echo off\r
+if not defined HOST_PYTHON (\r
+ if %1 EQU Debug (\r
+ set HOST_PYTHON=python_d.exe\r
+ ) ELSE (\r
+ set HOST_PYTHON=python.exe\r
+ )\r
+)\r
+%HOST_PYTHON% build_ssl.py %1 %2\r
+\r
-@echo off
-rem Run Tests. Run the regression test suite.
-rem Usage: rt [-d] [-O] [-q] regrtest_args
-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 -q "quick" -- normally the tests are run twice, the first time
-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 All leading instances of these switches are shifted off, and
-rem whatever remains is passed to regrtest.py. For example,
-rem rt -O -d -x test_thread
-rem runs
-rem python_d -O ../../lib/test/regrtest.py -x test_thread
-rem twice, and
-rem rt -q -g test_binascii
-rem runs
-rem python_d ../../lib/test/regrtest.py -g test_binascii
-rem to generate the expected-output file for binascii quickly.
-rem
-rem Confusing: if you want to pass a comma-separated list, like
-rem -u network,largefile
-rem then you have to quote it on the rt line, like
-rem rt -u "network,largefile"
-
-setlocal
-
-set exe=python
-set qmode=
-set dashO=
-PATH %PATH%;..\..\..\tcltk\bin
-
-:CheckOpts
-if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
-if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
-if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts
-
-set cmd=%exe% %dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
-if defined qmode goto Qmode
-
-echo Deleting .pyc/.pyo files ...
-%exe% rmpyc.py
-
-echo on
-%cmd%
-@echo off
-
-echo About to run again without deleting .pyc/.pyo first:
-pause
-
-:Qmode
-echo on
-%cmd%
+@echo off\r
+rem Run Tests. Run the regression test suite.\r
+rem Usage: rt [-d] [-O] [-q] regrtest_args\r
+rem -d Run Debug build (python_d.exe). Else release build.\r
+rem -O Run python.exe or python_d.exe (see -d) with -O.\r
+rem -q "quick" -- normally the tests are run twice, the first time\r
+rem after deleting all the .py[co] files reachable from Lib/.\r
+rem -q runs the tests just once, and without deleting .py[co] files.\r
+rem All leading instances of these switches are shifted off, and\r
+rem whatever remains is passed to regrtest.py. For example,\r
+rem rt -O -d -x test_thread\r
+rem runs\r
+rem python_d -O ../../lib/test/regrtest.py -x test_thread\r
+rem twice, and\r
+rem rt -q -g test_binascii\r
+rem runs\r
+rem python_d ../../lib/test/regrtest.py -g test_binascii\r
+rem to generate the expected-output file for binascii quickly.\r
+rem\r
+rem Confusing: if you want to pass a comma-separated list, like\r
+rem -u network,largefile\r
+rem then you have to quote it on the rt line, like\r
+rem rt -u "network,largefile"\r
+\r
+setlocal\r
+\r
+set exe=python\r
+set qmode=\r
+set dashO=\r
+PATH %PATH%;..\..\..\tcltk\bin\r
+\r
+:CheckOpts\r
+if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts\r
+if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts\r
+if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts\r
+\r
+set cmd=%exe% %dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+if defined qmode goto Qmode\r
+\r
+echo Deleting .pyc/.pyo files ...\r
+%exe% rmpyc.py\r
+\r
+echo on\r
+%cmd%\r
+@echo off\r
+\r
+echo About to run again without deleting .pyc/.pyo first:\r
+pause\r
+\r
+:Qmode\r
+echo on\r
+%cmd%\r
-@echo off
-rem A batch program to build or rebuild a particular configuration.
-rem just for convenience.
-
-setlocal
-set platf=Win32
-set conf=Release
-set build=/build
-
-:CheckOpts
-if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
-if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
-if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
-
-set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"
-echo %cmd%
-%cmd%
+@echo off\r
+rem A batch program to build or rebuild a particular configuration.\r
+rem just for convenience.\r
+\r
+setlocal\r
+set platf=Win32\r
+set conf=Release\r
+set build=/build\r
+\r
+:CheckOpts\r
+if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts\r
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
+if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts\r
+\r
+set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"\r
+echo %cmd%\r
+%cmd%\r
-@%comspec% /k env.bat %*
+@%comspec% /k env.bat %*\r
-@echo off
-rem A batch program to build PGO (Profile guided optimization) by first
-rem building instrumented binaries, then running the testsuite, and
-rem finally building the optimized code.
-rem Note, after the first instrumented run, one can just keep on
-rem building the PGUpdate configuration while developing.
-
-setlocal
-set platf=Win32
-
-rem use the performance testsuite. This is quick and simple
-set job1=..\..\tools\pybench\pybench.py -n 1 -C 1 --with-gc
-set path1=..\..\tools\pybench
-
-rem or the whole testsuite for more thorough testing
-set job2=..\..\lib\test\regrtest.py
-set path2=..\..\lib
-
-set job=%job1%
-set clrpath=%path1%
-
-:CheckOpts
-if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
-if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
-
-set PGI=%platf%-pgi
-set PGO=%platf%-pgo
-
-@echo on
-rem build the instrumented version
-call build -p %platf% -c PGInstrument
-
-rem remove .pyc files, .pgc files and execute the job
-%PGI%\python.exe rmpyc.py %clrpath%
-del %PGI%\*.pgc
-%PGI%\python.exe %job%
-
-rem finally build the optimized version
-if exist %PGO% del /s /q %PGO%
-call build -p %platf% -c PGUpdate
-
+@echo off\r
+rem A batch program to build PGO (Profile guided optimization) by first\r
+rem building instrumented binaries, then running the testsuite, and\r
+rem finally building the optimized code.\r
+rem Note, after the first instrumented run, one can just keep on\r
+rem building the PGUpdate configuration while developing.\r
+\r
+setlocal\r
+set platf=Win32\r
+\r
+rem use the performance testsuite. This is quick and simple\r
+set job1=..\..\tools\pybench\pybench.py -n 1 -C 1 --with-gc\r
+set path1=..\..\tools\pybench\r
+\r
+rem or the whole testsuite for more thorough testing\r
+set job2=..\..\lib\test\regrtest.py\r
+set path2=..\..\lib\r
+\r
+set job=%job1%\r
+set clrpath=%path1%\r
+\r
+:CheckOpts\r
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
+if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts\r
+\r
+set PGI=%platf%-pgi\r
+set PGO=%platf%-pgo\r
+\r
+@echo on\r
+rem build the instrumented version\r
+call build -p %platf% -c PGInstrument\r
+\r
+rem remove .pyc files, .pgc files and execute the job\r
+%PGI%\python.exe rmpyc.py %clrpath%\r
+del %PGI%\*.pgc\r
+%PGI%\python.exe %job%\r
+\r
+rem finally build the optimized version\r
+if exist %PGO% del /s /q %PGO%\r
+call build -p %platf% -c PGUpdate\r
+\r
-@echo off
-if not defined HOST_PYTHON (
- if %1 EQU Debug (
- set HOST_PYTHON=python_d.exe
- if not exist python27_d.dll exit 1
- ) ELSE (
- set HOST_PYTHON=python.exe
- if not exist python27.dll exit 1
- )
-)
-%HOST_PYTHON% build_ssl.py %1 %2 %3
-
+@echo off\r
+if not defined HOST_PYTHON (\r
+ if %1 EQU Debug (\r
+ set HOST_PYTHON=python_d.exe\r
+ if not exist python27_d.dll exit 1\r
+ ) ELSE (\r
+ set HOST_PYTHON=python.exe\r
+ if not exist python27.dll exit 1\r
+ )\r
+)\r
+%HOST_PYTHON% build_ssl.py %1 %2 %3\r
+\r
-@echo off
-set VS8=%ProgramFiles%\Microsoft Visual Studio 8
-echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
-echo.
-call "%VS8%\VC\vcvarsall.bat" %1
+@echo off\r
+set VS8=%ProgramFiles%\Microsoft Visual Studio 8\r
+echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64\r
+echo.\r
+call "%VS8%\VC\vcvarsall.bat" %1\r
-@echo off
-rem start idle
-rem Usage: idle [-d]
-rem -d Run Debug build (python_d.exe). Else release build.
-
-setlocal
-set exe=python
-PATH %PATH%;..\..\..\tcltk\bin
-
-if "%1"=="-d" (set exe=python_d) & shift
-
-set cmd=%exe% ../../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-echo on
-%cmd%
+@echo off\r
+rem start idle\r
+rem Usage: idle [-d]\r
+rem -d Run Debug build (python_d.exe). Else release build.\r
+\r
+setlocal\r
+set exe=python\r
+PATH %PATH%;..\..\..\tcltk\bin\r
+\r
+if "%1"=="-d" (set exe=python_d) & shift\r
+\r
+set cmd=%exe% ../../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+\r
+echo on\r
+%cmd%\r
-@echo off
-rem Run Tests. Run the regression test suite.
-rem Usage: rt [-d] [-O] [-q] regrtest_args
-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 -q "quick" -- normally the tests are run twice, the first time
-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 All leading instances of these switches are shifted off, and
-rem whatever remains is passed to regrtest.py. For example,
-rem rt -O -d -x test_thread
-rem runs
-rem python_d -O ../lib/test/regrtest.py -x test_thread
-rem twice, and
-rem rt -q -g test_binascii
-rem runs
-rem python_d ../lib/test/regrtest.py -g test_binascii
-rem to generate the expected-output file for binascii quickly.
-rem
-rem Confusing: if you want to pass a comma-separated list, like
-rem -u network,largefile
-rem then you have to quote it on the rt line, like
-rem rt -u "network,largefile"
-
-setlocal
-
-set exe=python
-set qmode=
-set dashO=
-PATH %PATH%;..\..\..\tcltk\bin
-
-:CheckOpts
-if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
-if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
-if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts
-
-set cmd=%exe% %dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
-if defined qmode goto Qmode
-
-echo Deleting .pyc/.pyo files ...
-%exe% rmpyc.py
-
-echo on
-%cmd%
-@echo off
-
-echo About to run again without deleting .pyc/.pyo first:
-pause
-
-:Qmode
-echo on
-%cmd%
+@echo off\r
+rem Run Tests. Run the regression test suite.\r
+rem Usage: rt [-d] [-O] [-q] regrtest_args\r
+rem -d Run Debug build (python_d.exe). Else release build.\r
+rem -O Run python.exe or python_d.exe (see -d) with -O.\r
+rem -q "quick" -- normally the tests are run twice, the first time\r
+rem after deleting all the .py[co] files reachable from Lib/.\r
+rem -q runs the tests just once, and without deleting .py[co] files.\r
+rem All leading instances of these switches are shifted off, and\r
+rem whatever remains is passed to regrtest.py. For example,\r
+rem rt -O -d -x test_thread\r
+rem runs\r
+rem python_d -O ../lib/test/regrtest.py -x test_thread\r
+rem twice, and\r
+rem rt -q -g test_binascii\r
+rem runs\r
+rem python_d ../lib/test/regrtest.py -g test_binascii\r
+rem to generate the expected-output file for binascii quickly.\r
+rem\r
+rem Confusing: if you want to pass a comma-separated list, like\r
+rem -u network,largefile\r
+rem then you have to quote it on the rt line, like\r
+rem rt -u "network,largefile"\r
+\r
+setlocal\r
+\r
+set exe=python\r
+set qmode=\r
+set dashO=\r
+PATH %PATH%;..\..\..\tcltk\bin\r
+\r
+:CheckOpts\r
+if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts\r
+if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts\r
+if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts\r
+\r
+set cmd=%exe% %dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+if defined qmode goto Qmode\r
+\r
+echo Deleting .pyc/.pyo files ...\r
+%exe% rmpyc.py\r
+\r
+echo on\r
+%cmd%\r
+@echo off\r
+\r
+echo About to run again without deleting .pyc/.pyo first:\r
+pause\r
+\r
+:Qmode\r
+echo on\r
+%cmd%\r
-@echo off
-rem A batch program to build or rebuild a particular configuration.
-rem just for convenience.
-
-setlocal
-set platf=Win32
-set conf=Release
-set build=
-
-:CheckOpts
-if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
-if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
-if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
-if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts
-
-set cmd=vcbuild /useenv pcbuild.sln %build% "%conf%|%platf%"
-echo %cmd%
-%cmd%
+@echo off\r
+rem A batch program to build or rebuild a particular configuration.\r
+rem just for convenience.\r
+\r
+setlocal\r
+set platf=Win32\r
+set conf=Release\r
+set build=\r
+\r
+:CheckOpts\r
+if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts\r
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
+if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts\r
+if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts\r
+\r
+set cmd=vcbuild /useenv pcbuild.sln %build% "%conf%|%platf%"\r
+echo %cmd%\r
+%cmd%\r
-@%comspec% /k env.bat %*
+@%comspec% /k env.bat %*\r
-@echo off
-rem A batch program to build PGO (Profile guided optimization) by first
-rem building instrumented binaries, then running the testsuite, and
-rem finally building the optimized code.
-rem Note, after the first instrumented run, one can just keep on
-rem building the PGUpdate configuration while developing.
-
-setlocal
-set platf=Win32
-
-rem use the performance testsuite. This is quick and simple
-set job1=..\tools\pybench\pybench.py -n 1 -C 1 --with-gc
-set path1=..\tools\pybench
-
-rem or the whole testsuite for more thorough testing
-set job2=..\lib\test\regrtest.py
-set path2=..\lib
-
-set job=%job1%
-set clrpath=%path1%
-
-:CheckOpts
-if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
-if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
-
-set PGI=%platf%-pgi
-set PGO=%platf%-pgo
-
-@echo on
-rem build the instrumented version
-call build -p %platf% -c PGInstrument
-
-rem remove .pyc files, .pgc files and execute the job
-%PGI%\python.exe rmpyc.py %clrpath%
-del %PGI%\*.pgc
-%PGI%\python.exe %job%
-
-rem finally build the optimized version
-if exist %PGO% del /s /q %PGO%
-call build -p %platf% -c PGUpdate
-
+@echo off\r
+rem A batch program to build PGO (Profile guided optimization) by first\r
+rem building instrumented binaries, then running the testsuite, and\r
+rem finally building the optimized code.\r
+rem Note, after the first instrumented run, one can just keep on\r
+rem building the PGUpdate configuration while developing.\r
+\r
+setlocal\r
+set platf=Win32\r
+\r
+rem use the performance testsuite. This is quick and simple\r
+set job1=..\tools\pybench\pybench.py -n 1 -C 1 --with-gc\r
+set path1=..\tools\pybench\r
+\r
+rem or the whole testsuite for more thorough testing\r
+set job2=..\lib\test\regrtest.py\r
+set path2=..\lib\r
+\r
+set job=%job1%\r
+set clrpath=%path1%\r
+\r
+:CheckOpts\r
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
+if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts\r
+\r
+set PGI=%platf%-pgi\r
+set PGO=%platf%-pgo\r
+\r
+@echo on\r
+rem build the instrumented version\r
+call build -p %platf% -c PGInstrument\r
+\r
+rem remove .pyc files, .pgc files and execute the job\r
+%PGI%\python.exe rmpyc.py %clrpath%\r
+del %PGI%\*.pgc\r
+%PGI%\python.exe %job%\r
+\r
+rem finally build the optimized version\r
+if exist %PGO% del /s /q %PGO%\r
+call build -p %platf% -c PGUpdate\r
+\r
-@echo off
-if not defined HOST_PYTHON (
- if %1 EQU Debug (
- set HOST_PYTHON=python_d.exe
- if not exist python27_d.dll exit 1
- ) ELSE (
- set HOST_PYTHON=python.exe
- if not exist python27.dll exit 1
- )
-)
-%HOST_PYTHON% build_ssl.py %1 %2 %3
-
+@echo off\r
+if not defined HOST_PYTHON (\r
+ if %1 EQU Debug (\r
+ set HOST_PYTHON=python_d.exe\r
+ if not exist python27_d.dll exit 1\r
+ ) ELSE (\r
+ set HOST_PYTHON=python.exe\r
+ if not exist python27.dll exit 1\r
+ )\r
+)\r
+%HOST_PYTHON% build_ssl.py %1 %2 %3\r
+\r
-@echo off
-set VS9=%ProgramFiles%\Microsoft Visual Studio 9.0
-echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
-echo.
-call "%VS9%\VC\vcvarsall.bat" %1
+@echo off\r
+set VS9=%ProgramFiles%\Microsoft Visual Studio 9.0\r
+echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64\r
+echo.\r
+call "%VS9%\VC\vcvarsall.bat" %1\r
-@echo off
-rem start idle
-rem Usage: idle [-d]
-rem -d Run Debug build (python_d.exe). Else release build.
-
-setlocal
-set exe=python
-PATH %PATH%;..\..\tcltk\bin
-
-if "%1"=="-d" (set exe=python_d) & shift
-
-set cmd=%exe% ../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-echo on
-%cmd%
+@echo off\r
+rem start idle\r
+rem Usage: idle [-d]\r
+rem -d Run Debug build (python_d.exe). Else release build.\r
+\r
+setlocal\r
+set exe=python\r
+PATH %PATH%;..\..\tcltk\bin\r
+\r
+if "%1"=="-d" (set exe=python_d) & shift\r
+\r
+set cmd=%exe% ../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+\r
+echo on\r
+%cmd%\r
-@echo off
-rem Run Tests. Run the regression test suite.
-rem Usage: rt [-d] [-O] [-q] [-x64] regrtest_args
-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 -q "quick" -- normally the tests are run twice, the first time
-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 -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 All leading instances of these switches are shifted off, and
-rem whatever remains is passed to regrtest.py. For example,
-rem rt -O -d -x test_thread
-rem runs
-rem python_d -O ../lib/test/regrtest.py -x test_thread
-rem twice, and
-rem rt -q -g test_binascii
-rem runs
-rem python_d ../lib/test/regrtest.py -g test_binascii
-rem to generate the expected-output file for binascii quickly.
-rem
-rem Confusing: if you want to pass a comma-separated list, like
-rem -u network,largefile
-rem then you have to quote it on the rt line, like
-rem rt -u "network,largefile"
-
-setlocal
-
-set prefix=.\
-set suffix=
-set qmode=
-set dashO=
-set tcltk=tcltk
-
-:CheckOpts
-if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
-if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
-if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts
-if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts
-
-PATH %PATH%;%~dp0..\externals\%tcltk%\bin
-set exe=%prefix%\python%suffix%
-set cmd=%exe% %dashO% -Wd -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
-if defined qmode goto Qmode
-
-echo Deleting .pyc/.pyo files ...
-%exe% rmpyc.py
-
-echo on
-%cmd%
-@echo off
-
-echo About to run again without deleting .pyc/.pyo first:
-pause
-
-:Qmode
-echo on
-%cmd%
+@echo off\r
+rem Run Tests. Run the regression test suite.\r
+rem Usage: rt [-d] [-O] [-q] [-x64] regrtest_args\r
+rem -d Run Debug build (python_d.exe). Else release build.\r
+rem -O Run python.exe or python_d.exe (see -d) with -O.\r
+rem -q "quick" -- normally the tests are run twice, the first time\r
+rem after deleting all the .py[co] files reachable from Lib/.\r
+rem -q runs the tests just once, and without deleting .py[co] files.\r
+rem -x64 Run the 64-bit build of python (or python_d if -d was specified)\r
+rem from the 'amd64' dir instead of the 32-bit build in this dir.\r
+rem All leading instances of these switches are shifted off, and\r
+rem whatever remains is passed to regrtest.py. For example,\r
+rem rt -O -d -x test_thread\r
+rem runs\r
+rem python_d -O ../lib/test/regrtest.py -x test_thread\r
+rem twice, and\r
+rem rt -q -g test_binascii\r
+rem runs\r
+rem python_d ../lib/test/regrtest.py -g test_binascii\r
+rem to generate the expected-output file for binascii quickly.\r
+rem\r
+rem Confusing: if you want to pass a comma-separated list, like\r
+rem -u network,largefile\r
+rem then you have to quote it on the rt line, like\r
+rem rt -u "network,largefile"\r
+\r
+setlocal\r
+\r
+set prefix=.\\r
+set suffix=\r
+set qmode=\r
+set dashO=\r
+set tcltk=tcltk\r
+\r
+:CheckOpts\r
+if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts\r
+if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts\r
+if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts\r
+if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts\r
+\r
+PATH %PATH%;%~dp0..\externals\%tcltk%\bin\r
+set exe=%prefix%\python%suffix%\r
+set cmd=%exe% %dashO% -Wd -3 -E -tt ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+if defined qmode goto Qmode\r
+\r
+echo Deleting .pyc/.pyo files ...\r
+%exe% rmpyc.py\r
+\r
+echo on\r
+%cmd%\r
+@echo off\r
+\r
+echo About to run again without deleting .pyc/.pyo first:\r
+pause\r
+\r
+:Qmode\r
+echo on\r
+%cmd%\r
-@rem Used by the buildbot "compile" step.
-set HOST_PYTHON="%CD%\PCbuild\amd64\python_d.exe"
-cmd /c Tools\buildbot\external-amd64.bat
-call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-cmd /c Tools\buildbot\clean-amd64.bat
-vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe
-vcbuild PCbuild\pcbuild.sln "Debug|x64"
+@rem Used by the buildbot "compile" step.\r
+set HOST_PYTHON="%CD%\PCbuild\amd64\python_d.exe"\r
+cmd /c Tools\buildbot\external-amd64.bat\r
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
+cmd /c Tools\buildbot\clean-amd64.bat\r
+vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe\r
+vcbuild PCbuild\pcbuild.sln "Debug|x64"\r
-@rem Used by the buildbot "compile" step.
-cmd /c Tools\buildbot\external.bat
-call "%VS90COMNTOOLS%vsvars32.bat"
-cmd /c Tools\buildbot\clean.bat
-vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe
-vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
-
+@rem Used by the buildbot "compile" step.\r
+cmd /c Tools\buildbot\external.bat\r
+call "%VS90COMNTOOLS%vsvars32.bat"\r
+cmd /c Tools\buildbot\clean.bat\r
+vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe\r
+vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"\r
+\r
-@rem Used by the buildbot "buildmsi" step.
-
-cmd /c Tools\buildbot\external.bat
-@rem build release versions of things
-call "%VS90COMNTOOLS%vsvars32.bat"
-
-@rem build Python
-vcbuild /useenv PCbuild\pcbuild.sln "Release|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.\r
+\r
+cmd /c Tools\buildbot\external.bat\r
+@rem build release versions of things\r
+call "%VS90COMNTOOLS%vsvars32.bat"\r
+\r
+@rem build Python\r
+vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"\r
+\r
+@rem build the documentation\r
+bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'\r
+"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp\r
+\r
+@rem build the MSI file\r
+cd PC\r
+nmake /f icons.mak\r
+cd ..\Tools\msi\r
+del *.msi\r
+nmake /f msisupport.mak\r
+%HOST_PYTHON% msi.py\r
-@rem Used by the buildbot "clean" step.
-call "%VS90COMNTOOLS%\..\..\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
-vcbuild /clean pcbuild.sln "Release|x64"
-vcbuild /clean pcbuild.sln "Debug|x64"
-cd ..
+@rem Used by the buildbot "clean" step.\r
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
+@echo Deleting .pyc/.pyo files ...\r
+del /s Lib\*.pyc Lib\*.pyo\r
+@echo Deleting test leftovers ...\r
+rmdir /s /q build\r
+cd PCbuild\r
+vcbuild /clean pcbuild.sln "Release|x64"\r
+vcbuild /clean pcbuild.sln "Debug|x64"\r
+cd ..\r
-@rem Used by the buildbot "clean" step.
-call "%VS90COMNTOOLS%vsvars32.bat"
-@echo Deleting .pyc/.pyo files ...
-del /s Lib\*.pyc Lib\*.pyo
-@echo Deleting test leftovers ...
-rmdir /s /q build
-cd PCbuild
-vcbuild /clean pcbuild.sln "Release|Win32"
-vcbuild /clean pcbuild.sln "Debug|Win32"
-cd ..
+@rem Used by the buildbot "clean" step.\r
+call "%VS90COMNTOOLS%vsvars32.bat"\r
+@echo Deleting .pyc/.pyo files ...\r
+del /s Lib\*.pyc Lib\*.pyo\r
+@echo Deleting test leftovers ...\r
+rmdir /s /q build\r
+cd PCbuild\r
+vcbuild /clean pcbuild.sln "Release|Win32"\r
+vcbuild /clean pcbuild.sln "Debug|Win32"\r
+cd ..\r
-@rem Fetches (and builds if necessary) external dependencies
-
-@rem Assume we start inside the Python source directory
-call "Tools\buildbot\external-common.bat"
-call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
-
-if not exist tcltk64\bin\tcl85g.dll (
- cd tcl-8.5.15.0\win
- nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
- nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
- cd ..\..
-)
-
-if not exist tcltk64\bin\tk85g.dll (
- cd tk-8.5.15.0\win
- nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 clean
- nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 all
- nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 install
- cd ..\..
-)
-
-if not exist tcltk64\lib\tix8.4.3\tix84g.dll (
- cd tix-8.4.3.5\win
- nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 clean
- nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 all
- nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 install
- cd ..\..
-)
+@rem Fetches (and builds if necessary) external dependencies\r
+\r
+@rem Assume we start inside the Python source directory\r
+call "Tools\buildbot\external-common.bat"\r
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
+\r
+if not exist tcltk64\bin\tcl85g.dll (\r
+ cd tcl-8.5.15.0\win\r
+ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all\r
+ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install\r
+ cd ..\..\r
+)\r
+\r
+if not exist tcltk64\bin\tk85g.dll (\r
+ cd tk-8.5.15.0\win\r
+ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 clean\r
+ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 all\r
+ nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 install\r
+ cd ..\..\r
+)\r
+\r
+if not exist tcltk64\lib\tix8.4.3\tix84g.dll (\r
+ cd tix-8.4.3.5\win\r
+ nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 clean\r
+ nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 all\r
+ nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk64 install\r
+ cd ..\..\r
+)\r
-@rem Common file shared between external.bat and external-amd64.bat. Responsible for
-@rem fetching external components into the root\externals directory.
-
-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 tcl8.4.12 rd /s/q tcl8.4.12
-@rem if exist tcl8.4.16 rd /s/q tcl8.4.16
-@rem if exist tcl-8.4.18.1 rd /s/q tcl-8.4.18.1
-@rem if exist tcl-8.5.2.1 rd /s/q tcl-8.5.2.1
-@rem if exist tcl-8.5.15.0 rd /s/q tcl-8.5.15.0
-@rem if exist tk8.4.12 rd /s/q tk8.4.12
-@rem if exist tk8.4.16 rd /s/q tk8.4.16
-@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
-@rem if exist tk-8.5.2.0 rd /s/q tk-8.5.2.0
-@rem if exist tk-8.5.15.0 rd /s/q tk-8.5.15.0
-@rem if exist tix-8.4.3.5 rd /s/q tix-8.4.3.5
-@rem if exist db-4.4.20 rd /s/q db-4.4.20
-@rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
-@rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y
-@rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
-@rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
-@rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
-@rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j
-@rem if exist openssl-1.0.1l rd /s/q openssl-1.0.1l
-@rem if exist openssl-1.0.2a rd /s/q openssl-1.0.2a
-@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
-
-@rem bzip
-if not exist bzip2-1.0.6 (
- rd /s/q bzip2-1.0.5
- svn export %SVNROOT%bzip2-1.0.6
-)
-
-@rem Berkeley DB
-if exist db-4.4.20 rd /s/q db-4.4.20
-if not exist db-4.7.25.0 svn export %SVNROOT%db-4.7.25.0
-
-@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 exist openssl-1.0.1l rd /s/q openssl-1.0.1l
-if not exist openssl-1.0.2a svn export %SVNROOT%openssl-1.0.2a
-
-@rem tcl/tk
-if not exist tcl-8.5.15.0 (
- rd /s/q tcltk tcltk64 tcl-8.5.2.1 tk-8.5.2.0
- svn export %SVNROOT%tcl-8.5.15.0
-)
-if not exist tk-8.5.15.0 svn export %SVNROOT%tk-8.5.15.0
-if not exist tix-8.4.3.5 svn export %SVNROOT%tix-8.4.3.5
-
-@rem sqlite3
-if not exist sqlite-3.6.21 (
- rd /s/q sqlite-source-3.3.4
- svn export %SVNROOT%sqlite-3.6.21
-)
+@rem Common file shared between external.bat and external-amd64.bat. Responsible for\r
+@rem fetching external components into the root\externals directory.\r
+\r
+if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/\r
+\r
+if not exist externals mkdir externals\r
+cd externals\r
+@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment\r
+@rem the following, check it in, then check it out, comment it out, then check it back in.\r
+@rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6\r
+@rem if exist tcltk rd /s/q tcltk\r
+@rem if exist tcltk64 rd /s/q tcltk64\r
+@rem if exist tcl8.4.12 rd /s/q tcl8.4.12\r
+@rem if exist tcl8.4.16 rd /s/q tcl8.4.16\r
+@rem if exist tcl-8.4.18.1 rd /s/q tcl-8.4.18.1\r
+@rem if exist tcl-8.5.2.1 rd /s/q tcl-8.5.2.1\r
+@rem if exist tcl-8.5.15.0 rd /s/q tcl-8.5.15.0\r
+@rem if exist tk8.4.12 rd /s/q tk8.4.12\r
+@rem if exist tk8.4.16 rd /s/q tk8.4.16\r
+@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1\r
+@rem if exist tk-8.5.2.0 rd /s/q tk-8.5.2.0\r
+@rem if exist tk-8.5.15.0 rd /s/q tk-8.5.15.0\r
+@rem if exist tix-8.4.3.5 rd /s/q tix-8.4.3.5\r
+@rem if exist db-4.4.20 rd /s/q db-4.4.20\r
+@rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0\r
+@rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y\r
+@rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g\r
+@rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h\r
+@rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i\r
+@rem if exist openssl-1.0.1j rd /s/q openssl-1.0.1j\r
+@rem if exist openssl-1.0.1l rd /s/q openssl-1.0.1l\r
+@rem if exist openssl-1.0.2a rd /s/q openssl-1.0.2a\r
+@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21\r
+\r
+@rem bzip\r
+if not exist bzip2-1.0.6 (\r
+ rd /s/q bzip2-1.0.5\r
+ svn export %SVNROOT%bzip2-1.0.6\r
+)\r
+\r
+@rem Berkeley DB\r
+if exist db-4.4.20 rd /s/q db-4.4.20\r
+if not exist db-4.7.25.0 svn export %SVNROOT%db-4.7.25.0\r
+\r
+@rem NASM, for OpenSSL build\r
+@rem if exist nasm-2.11.06 rd /s/q nasm-2.11.06\r
+if not exist nasm-2.11.06 svn export %SVNROOT%nasm-2.11.06\r
+\r
+@rem OpenSSL\r
+if exist openssl-1.0.1l rd /s/q openssl-1.0.1l\r
+if not exist openssl-1.0.2a svn export %SVNROOT%openssl-1.0.2a\r
+\r
+@rem tcl/tk\r
+if not exist tcl-8.5.15.0 (\r
+ rd /s/q tcltk tcltk64 tcl-8.5.2.1 tk-8.5.2.0\r
+ svn export %SVNROOT%tcl-8.5.15.0\r
+)\r
+if not exist tk-8.5.15.0 svn export %SVNROOT%tk-8.5.15.0\r
+if not exist tix-8.4.3.5 svn export %SVNROOT%tix-8.4.3.5\r
+\r
+@rem sqlite3\r
+if not exist sqlite-3.6.21 (\r
+ rd /s/q sqlite-source-3.3.4\r
+ svn export %SVNROOT%sqlite-3.6.21\r
+)\r
-@rem Fetches (and builds if necessary) external dependencies
-
-@rem Assume we start inside the Python source directory
-call "Tools\buildbot\external-common.bat"
-call "%VS90COMNTOOLS%\vsvars32.bat"
-
-if not exist tcltk\bin\tcl85g.dll (
- @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
- cd tcl-8.5.15.0\win
- nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk clean all
- nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
- cd ..\..
-)
-
-if not exist tcltk\bin\tk85g.dll (
- cd tk-8.5.15.0\win
- nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 clean
- nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 all
- nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 install
- cd ..\..
-)
-
-if not exist tcltk\lib\tix8.4.3\tix84g.dll (
- cd tix-8.4.3.5\win
- nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk clean
- nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk all
- nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk install
- cd ..\..
-)
+@rem Fetches (and builds if necessary) external dependencies\r
+\r
+@rem Assume we start inside the Python source directory\r
+call "Tools\buildbot\external-common.bat"\r
+call "%VS90COMNTOOLS%\vsvars32.bat"\r
+\r
+if not exist tcltk\bin\tcl85g.dll (\r
+ @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install\r
+ cd tcl-8.5.15.0\win\r
+ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk clean all\r
+ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install\r
+ cd ..\..\r
+)\r
+\r
+if not exist tcltk\bin\tk85g.dll (\r
+ cd tk-8.5.15.0\win\r
+ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 clean\r
+ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 all\r
+ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 install\r
+ cd ..\..\r
+)\r
+\r
+if not exist tcltk\lib\tix8.4.3\tix84g.dll (\r
+ cd tix-8.4.3.5\win\r
+ nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk clean\r
+ nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk all\r
+ nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.5.15.0 TK_DIR=..\..\tk-8.5.15.0 INSTALL_DIR=..\..\tcltk install\r
+ cd ..\..\r
+)\r
-@rem Used by the buildbot "test" step.
-cd PCbuild
-call rt.bat -d -q -x64 -uall -rwW %1 %2 %3 %4 %5 %6 %7 %8 %9
+@rem Used by the buildbot "test" step.\r
+cd PCbuild\r
+call rt.bat -d -q -x64 -uall -rwW %1 %2 %3 %4 %5 %6 %7 %8 %9\r
-@rem Used by the buildbot "test" step.
-cd PCbuild
-call rt.bat -d -q -uall -rwW %1 %2 %3 %4 %5 %6 %7 %8 %9
+@rem Used by the buildbot "test" step.\r
+cd PCbuild\r
+call rt.bat -d -q -uall -rwW %1 %2 %3 %4 %5 %6 %7 %8 %9\r
-@rem Recreate some python charmap codecs from the Windows function
-@rem MultiByteToWideChar.
-
-@cd /d %~dp0
-@mkdir build
-@rem Arabic DOS code page
-c:\python26\python genwincodec.py 720 > build/cp720.py
+@rem Recreate some python charmap codecs from the Windows function\r
+@rem MultiByteToWideChar.\r
+\r
+@cd /d %~dp0\r
+@mkdir build\r
+@rem Arabic DOS code page\r
+c:\python26\python genwincodec.py 720 > build/cp720.py\r