traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

This commit is contained in:
Antoine Pitrou 2015-04-13 19:49:04 +02:00
parent cb46f0ecb0 50ebf0316a
commit 0f164c606a
30 changed files with 1384 additions and 1378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.hgeol
View File

@ -40,6 +40,12 @@ 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
# The Windows readme is likely to be read in Notepad, so make it readable
PCbuild/readme.txt = 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!

266
Doc/make.bat
View File

@ -1,133 +1,133 @@
@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 "%1" NEQ "htmlhelp" goto :skiphhcsearch if "%1" NEQ "htmlhelp" goto :skiphhcsearch
if exist "%HTMLHELP%" goto :skiphhcsearch if exist "%HTMLHELP%" goto :skiphhcsearch
rem Search for HHC in likely places rem Search for HHC in likely places
set HTMLHELP= set HTMLHELP=
where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch where hhc /q && set HTMLHELP=hhc && goto :skiphhcsearch
where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" where /R ..\externals hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"
if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles(x86)%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"
if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc" if not exist "%HTMLHELP%" where /R "%ProgramFiles%" hhc > "%TEMP%\hhc.loc" 2> nul && set /P HTMLHELP= < "%TEMP%\hhc.loc" & del "%TEMP%\hhc.loc"
if not exist "%HTMLHELP%" echo Cannot find HHC on PATH or in externals & exit /B 1 if not exist "%HTMLHELP%" echo Cannot find HHC on PATH or in externals & exit /B 1
:skiphhcsearch :skiphhcsearch
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/
popd popd
exit /B 1 exit /B 1
) )
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

44
PC/bdist_wininst/build.bat
View File

@ -1,22 +1,22 @@
@echo off @echo off
setlocal setlocal
set D=%~dp0 set D=%~dp0
set PCBUILD=%~dp0..\..\PCBuild\ set PCBUILD=%~dp0..\..\PCBuild\
echo Building Lib\distutils\command\wininst-xx.0.exe echo Building Lib\distutils\command\wininst-xx.0.exe
call "%PCBUILD%env.bat" x86 call "%PCBUILD%env.bat" x86
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=Win32 msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=Win32
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
echo Building Lib\distutils\command\wininst-xx.0-amd64.exe echo Building Lib\distutils\command\wininst-xx.0-amd64.exe
call "%PCBUILD%env.bat" x86_amd64 call "%PCBUILD%env.bat" x86_amd64
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=x64 msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=x64

86
PCbuild/build.bat
View File

@ -1,43 +1,43 @@
@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.
rem Arguments: rem Arguments:
rem -c Set the configuration (default: Release) rem -c Set the configuration (default: Release)
rem -p Set the platform (x64 or Win32, default: Win32) rem -p Set the platform (x64 or Win32, default: Win32)
rem -r Target Rebuild instead of Build rem -r Target Rebuild instead of Build
rem -t Set the target manually (Build, Rebuild, Clean, or CleanAll) rem -t Set the target manually (Build, Rebuild, Clean, or CleanAll)
rem -d Set the configuration to Debug rem -d Set the configuration to Debug
rem -e Pull in external libraries using get_externals.bat rem -e Pull in external libraries using get_externals.bat
rem -M Disable parallel build rem -M Disable parallel build
rem -v Increased output messages rem -v Increased output messages
setlocal setlocal
set platf=Win32 set platf=Win32
set vs_platf=x86 set vs_platf=x86
set conf=Release set conf=Release
set target=Build set target=Build
set dir=%~dp0 set dir=%~dp0
set parallel=/m set parallel=/m
set verbose=/nologo /v:m set verbose=/nologo /v:m
: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'=='-t' (set target=%2) & shift & shift & goto CheckOpts if '%1'=='-t' (set target=%2) & shift & shift & goto CheckOpts
if '%1'=='-d' (set conf=Debug) & shift & goto CheckOpts if '%1'=='-d' (set conf=Debug) & shift & goto CheckOpts
if '%1'=='-e' call "%dir%get_externals.bat" & shift & goto CheckOpts if '%1'=='-e' call "%dir%get_externals.bat" & shift & goto CheckOpts
if '%1'=='-M' (set parallel=) & shift & goto CheckOpts if '%1'=='-M' (set parallel=) & shift & goto CheckOpts
if '%1'=='-v' (set verbose=/v:n) & shift & goto CheckOpts if '%1'=='-v' (set verbose=/v:n) & shift & goto CheckOpts
if '%platf%'=='x64' (set vs_platf=x86_amd64) if '%platf%'=='x64' (set vs_platf=x86_amd64)
rem Setup the environment rem Setup the environment
call "%dir%env.bat" %vs_platf% >nul call "%dir%env.bat" %vs_platf% >nul
rem Call on MSBuild to do the work, echo the command. rem Call on MSBuild to do the work, echo the command.
rem Passing %1-9 is not the preferred option, but argument parsing in rem Passing %1-9 is not the preferred option, but argument parsing in
rem batch is, shall we say, "lackluster" rem batch is, shall we say, "lackluster"
echo on echo on
msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose% /p:Configuration=%conf% /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9 msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose% /p:Configuration=%conf% /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9

2
PCbuild/build_env.bat
View File

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

96
PCbuild/build_pgo.bat
View File

@ -1,48 +1,48 @@
@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
set parallel=/m set parallel=/m
set dir=%~dp0 set dir=%~dp0
rem use the performance testsuite. This is quick and simple rem use the performance testsuite. This is quick and simple
set job1="%dir%..\tools\pybench\pybench.py" -n 1 -C 1 --with-gc set job1="%dir%..\tools\pybench\pybench.py" -n 1 -C 1 --with-gc
set path1="%dir%..\tools\pybench" set path1="%dir%..\tools\pybench"
rem or the whole testsuite for more thorough testing rem or the whole testsuite for more thorough testing
set job2="%dir%..\lib\test\regrtest.py" set job2="%dir%..\lib\test\regrtest.py"
set path2="%dir%..\lib" set path2="%dir%..\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
if "%1"=="-M" (set parallel=) & shift & goto CheckOpts if "%1"=="-M" (set parallel=) & shift & goto CheckOpts
rem We cannot cross compile PGO builds, as the optimization needs to be run natively rem We cannot cross compile PGO builds, as the optimization needs to be run natively
set vs_platf=x86 set vs_platf=x86
set PGO=%dir%win32-pgo set PGO=%dir%win32-pgo
if "%platf%"=="x64" (set vs_platf=amd64) & (set PGO=%dir%amd64-pgo) if "%platf%"=="x64" (set vs_platf=amd64) & (set PGO=%dir%amd64-pgo)
rem Setup the environment rem Setup the environment
call "%dir%env.bat" %vs_platf% call "%dir%env.bat" %vs_platf%
rem build the instrumented version rem build the instrumented version
msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGInstrument /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9 msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGInstrument /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9
rem remove .pyc files, .pgc files and execute the job rem remove .pyc files, .pgc files and execute the job
"%PGO%\python.exe" "%dir%rmpyc.py" %clrpath% "%PGO%\python.exe" "%dir%rmpyc.py" %clrpath%
del "%PGO%\*.pgc" del "%PGO%\*.pgc"
"%PGO%\python.exe" %job% "%PGO%\python.exe" %job%
rem build optimized version rem build optimized version
msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGUpdate /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9 msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGUpdate /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9

10
PCbuild/clean.bat
View File

@ -1,5 +1,5 @@
@echo off @echo off
rem A batch program to clean a particular configuration, rem A batch program to clean a particular configuration,
rem just for convenience. rem just for convenience.
call %~dp0build.bat -t Clean %* call %~dp0build.bat -t Clean %*

32
PCbuild/env.bat
View File

@ -1,16 +1,16 @@
@echo off @echo off
rem This script adds the latest available tools to the path for the current rem This script adds the latest available tools to the path for the current
rem command window. However, most builds of Python will ignore the version rem command window. However, most builds of Python will ignore the version
rem of the tools on PATH and use PlatformToolset instead. Ideally, both sets of rem of the tools on PATH and use PlatformToolset instead. Ideally, both sets of
rem tools should be the same version to avoid potential conflicts. rem tools should be the same version to avoid potential conflicts.
rem rem
rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v100" (or rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v100" (or
rem 'v110', 'v120' or 'v140') to the build script. rem 'v110', 'v120' or 'v140') to the build script.
echo Build environments: x86, amd64, x86_amd64 echo Build environments: x86, amd64, x86_amd64
echo. echo.
set VSTOOLS=%VS140COMNTOOLS% set VSTOOLS=%VS140COMNTOOLS%
if "%VSTOOLS%"=="" set VSTOOLS=%VS120COMNTOOLS% if "%VSTOOLS%"=="" set VSTOOLS=%VS120COMNTOOLS%
if "%VSTOOLS%"=="" set VSTOOLS=%VS110COMNTOOLS% if "%VSTOOLS%"=="" set VSTOOLS=%VS110COMNTOOLS%
if "%VSTOOLS%"=="" set VSTOOLS=%VS100COMNTOOLS% if "%VSTOOLS%"=="" set VSTOOLS=%VS100COMNTOOLS%
call "%VSTOOLS%..\..\VC\vcvarsall.bat" %* call "%VSTOOLS%..\..\VC\vcvarsall.bat" %*

206
PCbuild/get_externals.bat
View File

@ -1,103 +1,103 @@
@echo off @echo off
setlocal setlocal
rem Simple script to fetch source for external libraries rem Simple script to fetch source for external libraries
if not exist "%~dp0..\externals" mkdir "%~dp0..\externals" if not exist "%~dp0..\externals" mkdir "%~dp0..\externals"
pushd "%~dp0..\externals" pushd "%~dp0..\externals"
if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/ if "%SVNROOT%"=="" set SVNROOT=http://svn.python.org/projects/external/
rem Optionally clean up first. Be warned that this can be very destructive! rem Optionally clean up first. Be warned that this can be very destructive!
if not "%1"=="" ( if not "%1"=="" (
for %%c in (-c --clean --clean-only) do ( for %%c in (-c --clean --clean-only) do (
if "%1"=="%%c" goto clean if "%1"=="%%c" goto clean
) )
goto usage goto usage
) )
goto fetch goto fetch
:clean :clean
echo.Cleaning up external libraries. echo.Cleaning up external libraries.
for /D %%d in ( for /D %%d in (
bzip2-* bzip2-*
db-* db-*
nasm-* nasm-*
openssl-* openssl-*
tcl-* tcl-*
tcltk* tcltk*
tk-* tk-*
tix-* tix-*
sqlite-* sqlite-*
xz-* xz-*
) do ( ) do (
echo.Removing %%d echo.Removing %%d
rmdir /s /q %%d rmdir /s /q %%d
) )
if "%1"=="--clean-only" ( if "%1"=="--clean-only" (
goto end goto end
) )
:fetch :fetch
rem Fetch current versions rem Fetch current versions
svn --version > nul 2>&1 svn --version > nul 2>&1
if ERRORLEVEL 9009 ( if ERRORLEVEL 9009 (
echo.svn.exe must be on your PATH. echo.svn.exe must be on your PATH.
echo.Try TortoiseSVN (http://tortoisesvn.net/^) and be sure to check the echo.Try TortoiseSVN (http://tortoisesvn.net/^) and be sure to check the
echo.command line tools option. echo.command line tools option.
popd popd
exit /b 1 exit /b 1
) )
echo.Fetching external libraries... echo.Fetching external libraries...
for %%e in ( for %%e in (
bzip2-1.0.6 bzip2-1.0.6
nasm-2.11.06 nasm-2.11.06
openssl-1.0.2a openssl-1.0.2a
tcl-core-8.6.3.1 tcl-core-8.6.3.1
tk-8.6.3.1 tk-8.6.3.1
tix-8.4.3.4 tix-8.4.3.4
sqlite-3.8.3.1 sqlite-3.8.3.1
xz-5.0.5 xz-5.0.5
) do ( ) do (
if exist %%e ( if exist %%e (
echo.%%e already exists, skipping. echo.%%e already exists, skipping.
) else ( ) else (
echo.Fetching %%e... echo.Fetching %%e...
svn export %SVNROOT%%%e svn export %SVNROOT%%%e
) )
) )
goto end goto end
:usage :usage
echo.invalid argument: %1 echo.invalid argument: %1
echo.usage: %~n0 [[ -c ^| --clean ] ^| --clean-only ] echo.usage: %~n0 [[ -c ^| --clean ] ^| --clean-only ]
echo. echo.
echo.Pull all sources necessary for compiling optional extension modules echo.Pull all sources necessary for compiling optional extension modules
echo.that rely on external libraries. Requires svn.exe to be on your PATH echo.that rely on external libraries. Requires svn.exe to be on your PATH
echo.and pulls sources from %SVNROOT%. echo.and pulls sources from %SVNROOT%.
echo. echo.
echo.Use the -c or --clean option to clean up all external library sources echo.Use the -c or --clean option to clean up all external library sources
echo.before pulling in the current versions. echo.before pulling in the current versions.
echo. echo.
echo.Use the --clean-only option to do the same cleaning, without pulling in echo.Use the --clean-only option to do the same cleaning, without pulling in
echo.anything new. echo.anything new.
echo. echo.
echo.Only the first argument is checked, all others are ignored. echo.Only the first argument is checked, all others are ignored.
echo. echo.
echo.**WARNING**: the cleaning options unconditionally remove any directory echo.**WARNING**: the cleaning options unconditionally remove any directory
echo.that is a child of echo.that is a child of
echo. %CD% echo. %CD%
echo.and matches wildcard patterns beginning with bzip2-, db-, nasm-, openssl-, echo.and matches wildcard patterns beginning with bzip2-, db-, nasm-, openssl-,
echo.tcl-, tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential echo.tcl-, tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential
echo.to be very destructive if you are not aware of what it is doing. Use with echo.to be very destructive if you are not aware of what it is doing. Use with
echo.caution! echo.caution!
popd popd
exit /b -1 exit /b -1
:end :end
echo Finished. echo Finished.
popd popd

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=win32\python set exe=win32\python
PATH %PATH%;..\externals\tcltk\bin PATH %PATH%;..\externals\tcltk\bin
if "%1"=="-d" (set exe=%exe%_d) & shift if "%1"=="-d" (set exe=%exe%_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%

24
PCbuild/prepare_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 (
shift shift
set HOST_PYTHON=python_d.exe set HOST_PYTHON=python_d.exe
if not exist python35_d.dll exit 1 if not exist python35_d.dll exit 1
) ELSE ( ) ELSE (
set HOST_PYTHON=python.exe set HOST_PYTHON=python.exe
if not exist python35.dll exit 1 if not exist python35.dll exit 1
) )
) )
%HOST_PYTHON% prepare_ssl.py %1 %HOST_PYTHON% prepare_ssl.py %1

682
PCbuild/readme.txt
View File

@ -1,341 +1,341 @@
Quick Start Guide Quick Start Guide
----------------- -----------------
1. Install Microsoft Visual Studio 2015, any edition. 1. Install Microsoft Visual Studio 2015, any edition.
2. Install Subversion, and make sure 'svn.exe' is on your PATH. 2. Install Subversion, and make sure 'svn.exe' is on your PATH.
3. Run "build.bat -e" to build Python in 32-bit Release configuration. 3. Run "build.bat -e" to build Python in 32-bit Release configuration.
4. (Optional, but recommended) Run the test suite with "rt.bat -q". 4. (Optional, but recommended) Run the test suite with "rt.bat -q".
Building Python using Microsoft Visual C++ Building Python using Microsoft Visual C++
------------------------------------------ ------------------------------------------
This directory is used to build CPython for Microsoft Windows NT version This directory is used to build CPython for Microsoft Windows NT version
6.0 or higher (Windows Vista, Windows Server 2008, or later) on 32 and 64 6.0 or higher (Windows Vista, Windows Server 2008, or later) on 32 and 64
bit platforms. Using this directory requires an installation of bit platforms. Using this directory requires an installation of
Microsoft Visual C++ 2015 (MSVC 14.0) of any edition. The specific Microsoft Visual C++ 2015 (MSVC 14.0) of any edition. The specific
requirements are as follows: requirements are as follows:
Visual Studio Express 2015 for Desktop Visual Studio Express 2015 for Desktop
Visual Studio Professional 2015 Visual Studio Professional 2015
Either edition is sufficient for building all configurations except Either edition is sufficient for building all configurations except
for Profile Guided Optimization. for Profile Guided Optimization.
The Python build solution pcbuild.sln makes use of Solution Folders, The Python build solution pcbuild.sln makes use of Solution Folders,
which this edition does not support. Any time pcbuild.sln is opened which this edition does not support. Any time pcbuild.sln is opened
or reloaded by Visual Studio, a warning about Solution Folders will or reloaded by Visual Studio, a warning about Solution Folders will
be displayed, which can be safely dismissed with no impact on your be displayed, which can be safely dismissed with no impact on your
ability to build Python. ability to build Python.
Required for building 64-bit Debug and Release configuration builds Required for building 64-bit Debug and Release configuration builds
Visual Studio Premium 2015 Visual Studio Premium 2015
Required for building Release configuration builds that make use of Required for building Release configuration builds that make use of
Profile Guided Optimization (PGO), on either platform. Profile Guided Optimization (PGO), on either platform.
All you need to do to build is open the solution "pcbuild.sln" in Visual All you need to do to build is open the solution "pcbuild.sln" in Visual
Studio, select the desired combination of configuration and platform, Studio, select the desired combination of configuration and platform,
then build with "Build Solution". You can also build from the command then build with "Build Solution". You can also build from the command
line using the "build.bat" script in this directory; see below for line using the "build.bat" script in this directory; see below for
details. The solution is configured to build the projects in the correct details. The solution is configured to build the projects in the correct
order. order.
The solution currently supports two platforms. The Win32 platform is The solution currently supports two platforms. The Win32 platform is
used to build standard x86-compatible 32-bit binaries, output into the used to build standard x86-compatible 32-bit binaries, output into the
win32 sub-directory. The x64 platform is used for building 64-bit AMD64 win32 sub-directory. The x64 platform is used for building 64-bit AMD64
(aka x86_64 or EM64T) binaries, output into the amd64 sub-directory. (aka x86_64 or EM64T) binaries, output into the amd64 sub-directory.
The Itanium (IA-64) platform is no longer supported. See the "Building The Itanium (IA-64) platform is no longer supported. See the "Building
for AMD64" section below for more information about 64-bit builds. for AMD64" section below for more information about 64-bit builds.
Four configuration options are supported by the solution: Four configuration options are supported by the solution:
Debug Debug
Used to build Python with extra debugging capabilities, equivalent Used to build Python with extra debugging capabilities, equivalent
to using ./configure --with-pydebug on UNIX. All binaries built to using ./configure --with-pydebug on UNIX. All binaries built
using this configuration have "_d" added to their name: using this configuration have "_d" added to their name:
python35_d.dll, python_d.exe, parser_d.pyd, and so on. Both the python35_d.dll, python_d.exe, parser_d.pyd, and so on. Both the
build and rt (run test) batch files in this directory accept a -d build and rt (run test) batch files in this directory accept a -d
option for debug builds. If you are building Python to help with option for debug builds. If you are building Python to help with
development of CPython, you will most likely use this configuration. development of CPython, you will most likely use this configuration.
PGInstrument, PGUpdate PGInstrument, PGUpdate
Used to build Python in Release configuration using PGO, which Used to build Python in Release configuration using PGO, which
requires Premium Edition of Visual Studio. See the "Profile requires Premium Edition of Visual Studio. See the "Profile
Guided Optimization" section below for more information. Build Guided Optimization" section below for more information. Build
output from each of these configurations lands in its own output from each of these configurations lands in its own
sub-directory of this directory. The official Python releases may sub-directory of this directory. The official Python releases may
be built using these configurations. be built using these configurations.
Release Release
Used to build Python as it is meant to be used in production Used to build Python as it is meant to be used in production
settings, though without PGO. settings, though without PGO.
Building Python using the build.bat script Building Python using the build.bat script
---------------------------------------------- ----------------------------------------------
In this directory you can find build.bat, a script designed to make In this directory you can find build.bat, a script designed to make
building Python on Windows simpler. This script will use the env.bat building Python on Windows simpler. This script will use the env.bat
script to detect one of Visual Studio 2015, 2013, 2012, or 2010, any of script to detect one of Visual Studio 2015, 2013, 2012, or 2010, any of
which may be used to build Python, though only Visual Studio 2015 is which may be used to build Python, though only Visual Studio 2015 is
officially supported. officially supported.
By default, build.bat will build Python in Release configuration for By default, build.bat will build Python in Release configuration for
the 32-bit Win32 platform. It accepts several arguments to change the 32-bit Win32 platform. It accepts several arguments to change
this behavior: this behavior:
-c <configuration> Set the configuration (see above) -c <configuration> Set the configuration (see above)
-d Shortcut for "-c Debug" -d Shortcut for "-c Debug"
-p <platform> Set the platform to build for ("Win32" or "x64") -p <platform> Set the platform to build for ("Win32" or "x64")
-r Rebuild instead of just building -r Rebuild instead of just building
-t <target> Set the target (Build, Rebuild, Clean or CleanAll) -t <target> Set the target (Build, Rebuild, Clean or CleanAll)
-e Use get_externals.bat to fetch external sources -e Use get_externals.bat to fetch external sources
-M Don't build in parallel -M Don't build in parallel
-v Increased output messages -v Increased output messages
Up to 9 MSBuild switches can also be passed, though they must be passed Up to 9 MSBuild switches can also be passed, though they must be passed
after specifying any of the above switches. For example, use: after specifying any of the above switches. For example, use:
build.bat -e -d /fl build.bat -e -d /fl
to do a debug build with externals fetched as needed and write detailed to do a debug build with externals fetched as needed and write detailed
build logs to a file. If the MSBuild switch requires an equal sign build logs to a file. If the MSBuild switch requires an equal sign
("="), the entire switch must be quoted: ("="), the entire switch must be quoted:
build.bat -e -d "/p:ExternalsDir=P:\cpython-externals" build.bat -e -d "/p:ExternalsDir=P:\cpython-externals"
There may also be other situations where quotes are necessary. There may also be other situations where quotes are necessary.
C Runtime C Runtime
--------- ---------
Visual Studio 2015 uses version 14 of the C runtime (MSVCRT14). The Visual Studio 2015 uses version 14 of the C runtime (MSVCRT14). The
executables no longer use the "Side by Side" assemblies used in previous executables no longer use the "Side by Side" assemblies used in previous
versions of the compiler. This simplifies distribution of applications. versions of the compiler. This simplifies distribution of applications.
The run time libraries are available under the VC/Redist folder of your The run time libraries are available under the VC/Redist folder of your
Visual Studio distribution. For more info, see the Readme in the Visual Studio distribution. For more info, see the Readme in the
VC/Redist folder. VC/Redist folder.
Sub-Projects Sub-Projects
------------ ------------
The CPython project is split up into several smaller sub-projects which The CPython project is split up into several smaller sub-projects which
are managed by the pcbuild.sln solution file. Each sub-project is are managed by the pcbuild.sln solution file. Each sub-project is
represented by a .vcxproj and a .vcxproj.filters file starting with the represented by a .vcxproj and a .vcxproj.filters file starting with the
name of the sub-project. These sub-projects fall into a few general name of the sub-project. These sub-projects fall into a few general
categories: categories:
The following sub-projects represent the bare minimum required to build The following sub-projects represent the bare minimum required to build
a functioning CPython interpreter. If nothing else builds but these, a functioning CPython interpreter. If nothing else builds but these,
you'll have a very limited but usable python.exe: you'll have a very limited but usable python.exe:
pythoncore pythoncore
.dll and .lib .dll and .lib
python python
.exe .exe
make_buildinfo, make_versioninfo make_buildinfo, make_versioninfo
helpers to provide necessary information to the build process helpers to provide necessary information to the build process
These sub-projects provide extra executables that are useful for running These sub-projects provide extra executables that are useful for running
CPython in different ways: CPython in different ways:
pythonw pythonw
pythonw.exe, a variant of python.exe that doesn't open a Command pythonw.exe, a variant of python.exe that doesn't open a Command
Prompt window Prompt window
pylauncher pylauncher
py.exe, the Python Launcher for Windows, see py.exe, the Python Launcher for Windows, see
http://docs.python.org/3/using/windows.html#launcher http://docs.python.org/3/using/windows.html#launcher
pywlauncher pywlauncher
pyw.exe, a variant of py.exe that doesn't open a Command Prompt pyw.exe, a variant of py.exe that doesn't open a Command Prompt
window window
_testembed _testembed
_testembed.exe, a small program that embeds Python for testing _testembed.exe, a small program that embeds Python for testing
purposes, used by test_capi.py purposes, used by test_capi.py
These are miscellaneous sub-projects that don't really fit the other These are miscellaneous sub-projects that don't really fit the other
categories: categories:
_freeze_importlib _freeze_importlib
_freeze_importlib.exe, used to regenerate Python\importlib.h after _freeze_importlib.exe, used to regenerate Python\importlib.h after
changes have been made to Lib\importlib\_bootstrap.py changes have been made to Lib\importlib\_bootstrap.py
bdist_wininst bdist_wininst
..\Lib\distutils\command\wininst-14.0[-amd64].exe, the base ..\Lib\distutils\command\wininst-14.0[-amd64].exe, the base
executable used by the distutils bdist_wininst command executable used by the distutils bdist_wininst command
python3dll python3dll
python3.dll, the PEP 384 Stable ABI dll python3.dll, the PEP 384 Stable ABI dll
xxlimited xxlimited
builds an example module that makes use of the PEP 384 Stable ABI, builds an example module that makes use of the PEP 384 Stable ABI,
see Modules\xxlimited.c see Modules\xxlimited.c
The following sub-projects are for individual modules of the standard The following sub-projects are for individual modules of the standard
library which are implemented in C; each one builds a DLL (renamed to library which are implemented in C; each one builds a DLL (renamed to
.pyd) of the same name as the project: .pyd) of the same name as the project:
_ctypes _ctypes
_ctypes_test _ctypes_test
_decimal _decimal
_elementtree _elementtree
_hashlib _hashlib
_msi _msi
_multiprocessing _multiprocessing
_overlapped _overlapped
_socket _socket
_testcapi _testcapi
_testbuffer _testbuffer
_testimportmultiple _testimportmultiple
pyexpat pyexpat
select select
unicodedata unicodedata
winsound winsound
The following Python-controlled sub-projects wrap external projects. The following Python-controlled sub-projects wrap external projects.
Note that these external libraries are not necessary for a working Note that these external libraries are not necessary for a working
interpreter, but they do implement several major features. See the interpreter, but they do implement several major features. See the
"Getting External Sources" section below for additional information "Getting External Sources" section below for additional information
about getting the source for building these libraries. The sub-projects about getting the source for building these libraries. The sub-projects
are: are:
_bz2 _bz2
Python wrapper for version 1.0.6 of the libbzip2 compression library Python wrapper for version 1.0.6 of the libbzip2 compression library
Homepage: Homepage:
http://www.bzip.org/ http://www.bzip.org/
_lzma _lzma
Python wrapper for the liblzma compression library, using pre-built Python wrapper for the liblzma compression library, using pre-built
binaries of XZ Utils version 5.0.5 binaries of XZ Utils version 5.0.5
Homepage: Homepage:
http://tukaani.org/xz/ http://tukaani.org/xz/
_ssl _ssl
Python wrapper for version 1.0.1j of the OpenSSL secure sockets Python wrapper for version 1.0.1j of the OpenSSL secure sockets
library, which is built by ssl.vcxproj library, which is built by ssl.vcxproj
Homepage: Homepage:
http://www.openssl.org/ http://www.openssl.org/
Building OpenSSL requires nasm.exe (the Netwide Assembler), version Building OpenSSL requires nasm.exe (the Netwide Assembler), version
2.10 or newer from 2.10 or newer from
http://www.nasm.us/ http://www.nasm.us/
to be somewhere on your PATH. More recent versions of OpenSSL may to be somewhere on your PATH. More recent versions of OpenSSL may
need a later version of NASM. If OpenSSL's self tests don't pass, need a later version of NASM. If OpenSSL's self tests don't pass,
you should first try to update NASM and do a full rebuild of you should first try to update NASM and do a full rebuild of
OpenSSL. get_externals.py also downloads a snapshot of NASM, and the OpenSSL. get_externals.py also downloads a snapshot of NASM, and the
libeay and ssleay sub-projects use that version of nasm.exe. libeay and ssleay sub-projects use that version of nasm.exe.
The libeay/ssleay sub-projects expect your OpenSSL sources to have The libeay/ssleay sub-projects expect your OpenSSL sources to have
already been configured and be ready to build. If you get your sources already been configured and be ready to build. If you get your sources
from svn.python.org as suggested in the "Getting External Sources" from svn.python.org as suggested in the "Getting External Sources"
section below, the OpenSSL source will already be ready to go. If section below, the OpenSSL source will already be ready to go. If
you want to build a different version, you will need to run you want to build a different version, you will need to run
PCbuild\prepare_ssl.py path\to\openssl-source-dir PCbuild\prepare_ssl.py path\to\openssl-source-dir
That script will prepare your OpenSSL sources in the same way that That script will prepare your OpenSSL sources in the same way that
those available on svn.python.org have been prepared. Note that those available on svn.python.org have been prepared. Note that
Perl must be installed and available on your PATH to configure Perl must be installed and available on your PATH to configure
OpenSSL. ActivePerl is recommended and is available from OpenSSL. ActivePerl is recommended and is available from
http://www.activestate.com/activeperl/ http://www.activestate.com/activeperl/
The libeay and ssleay sub-projects will build the modules of OpenSSL The libeay and ssleay sub-projects will build the modules of OpenSSL
required by _ssl and _hashlib and may need to be manually updated when required by _ssl and _hashlib and may need to be manually updated when
upgrading to a newer version of OpenSSL or when adding new upgrading to a newer version of OpenSSL or when adding new
functionality to _ssl or _hashlib. They will not clean up their output functionality to _ssl or _hashlib. They will not clean up their output
with the normal Clean target; CleanAll should be used instead. with the normal Clean target; CleanAll should be used instead.
_sqlite3 _sqlite3
Wraps SQLite 3.8.3.1, which is itself built by sqlite3.vcxproj Wraps SQLite 3.8.3.1, which is itself built by sqlite3.vcxproj
Homepage: Homepage:
http://www.sqlite.org/ http://www.sqlite.org/
_tkinter _tkinter
Wraps version 8.6.1 of the Tk windowing system. Wraps version 8.6.1 of the Tk windowing system.
Homepage: Homepage:
http://www.tcl.tk/ http://www.tcl.tk/
Tkinter's dependencies are built by the tcl.vcxproj and tk.vcxproj Tkinter's dependencies are built by the tcl.vcxproj and tk.vcxproj
projects. The tix.vcxproj project also builds the Tix extended projects. The tix.vcxproj project also builds the Tix extended
widget set for use with Tkinter. widget set for use with Tkinter.
Those three projects install their respective components in a Those three projects install their respective components in a
directory alongside the source directories called "tcltk" on directory alongside the source directories called "tcltk" on
Win32 and "tcltk64" on x64. They also copy the Tcl and Tk DLLs Win32 and "tcltk64" on x64. They also copy the Tcl and Tk DLLs
into the current output directory, which should ensure that Tkinter into the current output directory, which should ensure that Tkinter
is able to load Tcl/Tk without having to change your PATH. is able to load Tcl/Tk without having to change your PATH.
The tcl, tk, and tix sub-projects do not clean their builds with The tcl, tk, and tix sub-projects do not clean their builds with
the normal Clean target; if you need to rebuild, you should use the the normal Clean target; if you need to rebuild, you should use the
CleanAll target or manually delete their builds. CleanAll target or manually delete their builds.
Getting External Sources Getting External Sources
------------------------ ------------------------
The last category of sub-projects listed above wrap external projects The last category of sub-projects listed above wrap external projects
Python doesn't control, and as such a little more work is required in Python doesn't control, and as such a little more work is required in
order to download the relevant source files for each project before they order to download the relevant source files for each project before they
can be built. However, a simple script is provided to make this as can be built. However, a simple script is provided to make this as
painless as possible, called "get_externals.bat" and located in this painless as possible, called "get_externals.bat" and located in this
directory. This script extracts all the external sub-projects from directory. This script extracts all the external sub-projects from
http://svn.python.org/projects/external http://svn.python.org/projects/external
via Subversion (so you'll need svn.exe on your PATH) and places them via Subversion (so you'll need svn.exe on your PATH) and places them
in ..\externals (relative to this directory). in ..\externals (relative to this directory).
It is also possible to download sources from each project's homepage, It is also possible to download sources from each project's homepage,
though you may have to change folder names or pass the names to MSBuild though you may have to change folder names or pass the names to MSBuild
as the values of certain properties in order for the build solution to as the values of certain properties in order for the build solution to
find them. This is an advanced topic and not necessarily fully find them. This is an advanced topic and not necessarily fully
supported. supported.
Building for AMD64 Building for AMD64
------------------ ------------------
The build process for AMD64 / x64 is very similar to standard builds, The build process for AMD64 / x64 is very similar to standard builds,
you just have to set x64 as platform. In addition, the HOST_PYTHON you just have to set x64 as platform. In addition, the HOST_PYTHON
environment variable must point to a Python interpreter (at least 2.4), environment variable must point to a Python interpreter (at least 2.4),
to support cross-compilation from Win32. to support cross-compilation from Win32.
Profile Guided Optimization Profile Guided Optimization
--------------------------- ---------------------------
The solution has two configurations for PGO. The PGInstrument The solution has two configurations for PGO. The PGInstrument
configuration must be built first. The PGInstrument binaries are linked configuration must be built first. The PGInstrument binaries are linked
against a profiling library and contain extra debug information. The against a profiling library and contain extra debug information. The
PGUpdate configuration takes the profiling data and generates optimized PGUpdate configuration takes the profiling data and generates optimized
binaries. binaries.
The build_pgo.bat script automates the creation of optimized binaries. The build_pgo.bat script automates the creation of optimized binaries.
It creates the PGI files, runs the unit test suite or PyBench with the It creates the PGI files, runs the unit test suite or PyBench with the
PGI python, and finally creates the optimized files. PGI python, and finally creates the optimized files.
See See
http://msdn.microsoft.com/en-us/library/e7k32f4k(VS.100).aspx http://msdn.microsoft.com/en-us/library/e7k32f4k(VS.100).aspx
for more on this topic. for more on this topic.
Static library Static library
-------------- --------------
The solution has no configuration for static libraries. However it is The solution has no configuration for static libraries. However it is
easy to build a static library instead of a DLL. You simply have to set easy to build a static library instead of a DLL. You simply have to set
the "Configuration Type" to "Static Library (.lib)" and alter the the "Configuration Type" to "Static Library (.lib)" and alter the
preprocessor macro "Py_ENABLE_SHARED" to "Py_NO_ENABLE_SHARED". You may preprocessor macro "Py_ENABLE_SHARED" to "Py_NO_ENABLE_SHARED". You may
also have to change the "Runtime Library" from "Multi-threaded DLL also have to change the "Runtime Library" from "Multi-threaded DLL
(/MD)" to "Multi-threaded (/MT)". (/MD)" to "Multi-threaded (/MT)".
Visual Studio properties Visual Studio properties
------------------------ ------------------------
The PCbuild solution makes use of Visual Studio property files (*.props) The PCbuild solution makes use of Visual Studio property files (*.props)
to simplify each project. The properties can be viewed in the Property to simplify each project. The properties can be viewed in the Property
Manager (View -> Other Windows -> Property Manager) but should be Manager (View -> Other Windows -> Property Manager) but should be
carefully modified by hand. carefully modified by hand.
The property files used are: The property files used are:
* python (versions, directories and build names) * python (versions, directories and build names)
* pyproject (base settings for all projects) * pyproject (base settings for all projects)
* openssl (used by libeay and ssleay projects) * openssl (used by libeay and ssleay projects)
* tcltk (used by _tkinter, tcl, tk and tix projects) * tcltk (used by _tkinter, tcl, tk and tix projects)
The pyproject property file defines all of the build settings for each The pyproject property file defines all of the build settings for each
project, with some projects overriding certain specific values. The GUI project, with some projects overriding certain specific values. The GUI
doesn't always reflect the correct settings and may confuse the user doesn't always reflect the correct settings and may confuse the user
with false information, especially for settings that automatically adapt with false information, especially for settings that automatically adapt
for diffirent configurations. for diffirent configurations.
Your Own Extension DLLs Your Own Extension DLLs
----------------------- -----------------------
If you want to create your own extension module DLL (.pyd), there's an If you want to create your own extension module DLL (.pyd), there's an
example with easy-to-follow instructions in ..\PC\example\; read the example with easy-to-follow instructions in ..\PC\example\; read the
file readme.txt there first. file readme.txt there first.

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 (up to 9 arguments) is passed to regrtest.py. rem whatever remains (up to 9 arguments) is passed to regrtest.py.
rem For example, rem 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 pcbuild=%~dp0 set pcbuild=%~dp0
set prefix=%pcbuild%win32\ set prefix=%pcbuild%win32\
set suffix= set suffix=
set qmode= set qmode=
set dashO= set dashO=
: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=%pcbuild%amd64\) & shift & goto CheckOpts if "%1"=="-x64" (set prefix=%pcbuild%amd64\) & shift & goto CheckOpts
set exe=%prefix%python%suffix%.exe set exe=%prefix%python%suffix%.exe
set cmd="%exe%" %dashO% -Wd -E -bb "%pcbuild%..\lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9 set cmd="%exe%" %dashO% -Wd -E -bb "%pcbuild%..\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%" "%pcbuild%rmpyc.py" "%exe%" "%pcbuild%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%

4
Tools/buildbot/build-amd64.bat
View File

@ -1,2 +1,2 @@
@rem Used by the buildbot "compile" step. @rem Used by the buildbot "compile" step.
call "%~dp0build.bat" -p x64 %* call "%~dp0build.bat" -p x64 %*

40
Tools/buildbot/build.bat
View File

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

16
Tools/buildbot/buildmsi.bat
View File

@ -1,9 +1,9 @@
@rem Used by the buildbot "buildmsi" step. @rem Used by the buildbot "buildmsi" step.
setlocal setlocal
pushd pushd
@rem build both snapshot MSIs @rem build both snapshot MSIs
call "%~dp0..\msi\build.bat" -x86 -x64 call "%~dp0..\msi\build.bat" -x86 -x64
popd popd

4
Tools/buildbot/clean-amd64.bat
View File

@ -1,2 +1,2 @@
@rem Used by the buildbot "clean" step. @rem Used by the buildbot "clean" step.
@call "%~dp0clean.bat" x64 @call "%~dp0clean.bat" x64

58
Tools/buildbot/clean.bat
View File

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

4
Tools/buildbot/external-amd64.bat
View File

@ -1,2 +1,2 @@
@echo Please use PCbuild\get_externals.bat instead. @echo Please use PCbuild\get_externals.bat instead.
@"%~dp0..\..\PCbuild\get_externals.bat" %* @"%~dp0..\..\PCbuild\get_externals.bat" %*

4
Tools/buildbot/external.bat
View File

@ -1,2 +1,2 @@
@echo Please use PCbuild\get_externals.bat instead. @echo Please use PCbuild\get_externals.bat instead.
@"%~dp0..\..\PCbuild\get_externals.bat" %* @"%~dp0..\..\PCbuild\get_externals.bat" %*

14
Tools/buildbot/test-amd64.bat
View File

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

14
Tools/buildbot/test.bat
View File

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

92
Tools/msi/build.bat
View File

@ -1,46 +1,46 @@
@echo off @echo off
setlocal setlocal
set D=%~dp0 set D=%~dp0
set PCBUILD=%D%..\..\PCBuild\ set PCBUILD=%D%..\..\PCBuild\
set BUILDX86= set BUILDX86=
set BUILDX64= set BUILDX64=
set BUILDDOC= set BUILDDOC=
:CheckOpts :CheckOpts
if '%1'=='-x86' (set BUILDX86=1) && shift && goto CheckOpts if '%1'=='-x86' (set BUILDX86=1) && shift && goto CheckOpts
if '%1'=='-x64' (set BUILDX64=1) && shift && goto CheckOpts if '%1'=='-x64' (set BUILDX64=1) && shift && goto CheckOpts
if '%1'=='--doc' (set BUILDDOC=1) && shift && goto CheckOpts if '%1'=='--doc' (set BUILDDOC=1) && shift && goto CheckOpts
if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)
call "%PCBUILD%env.bat" x86 call "%PCBUILD%env.bat" x86
if defined BUILDX86 ( if defined BUILDX86 (
call "%PCBUILD%build.bat" -d call "%PCBUILD%build.bat" -d
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
call "%PCBUILD%build.bat" call "%PCBUILD%build.bat"
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
) )
if defined BUILDX64 ( if defined BUILDX64 (
call "%PCBUILD%build.bat" -p x64 -d call "%PCBUILD%build.bat" -p x64 -d
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
call "%PCBUILD%build.bat" -p x64 call "%PCBUILD%build.bat" -p x64
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
) )
if defined BUILDDOC ( if defined BUILDDOC (
call "%PCBUILD%..\Doc\make.bat" htmlhelp call "%PCBUILD%..\Doc\make.bat" htmlhelp
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
) )
if defined BUILDX86 ( if defined BUILDX86 (
"%PCBUILD%win32\python.exe" "%D%get_wix.py" "%PCBUILD%win32\python.exe" "%D%get_wix.py"
msbuild "%D%bundle\snapshot.wixproj" msbuild "%D%bundle\snapshot.wixproj"
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
) )
if defined BUILDX64 ( if defined BUILDX64 (
"%PCBUILD%amd64\python.exe" "%D%get_wix.py" "%PCBUILD%amd64\python.exe" "%D%get_wix.py"
msbuild "%D%bundle\snapshot.wixproj" /p:Platform=x64 msbuild "%D%bundle\snapshot.wixproj" /p:Platform=x64
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
) )

326
Tools/msi/buildrelease.bat
View File

@ -1,164 +1,164 @@
@setlocal @setlocal
@echo off @echo off
rem This script is intended for building official releases of Python. rem This script is intended for building official releases of Python.
rem To use it to build alternative releases, you should clone this file rem To use it to build alternative releases, you should clone this file
rem and modify the following three URIs. rem and modify the following three URIs.
rem rem
rem The first two will ensure that your release can be installed rem The first two will ensure that your release can be installed
rem alongside an official Python release, while the second specifies rem alongside an official Python release, while the second specifies
rem the URL that will be used to download installation files. The rem the URL that will be used to download installation files. The
rem files available from this URL *will* conflict with your installer. rem files available from this URL *will* conflict with your installer.
rem Trust me, you don't want them, even if it seems like a good idea. rem Trust me, you don't want them, even if it seems like a good idea.
set RELEASE_URI_X86=http://www.python.org/win32 set RELEASE_URI_X86=http://www.python.org/win32
set RELEASE_URI_X64=http://www.python.org/amd64 set RELEASE_URI_X64=http://www.python.org/amd64
set DOWNLOAD_URL_BASE=https://www.python.org/ftp/python set DOWNLOAD_URL_BASE=https://www.python.org/ftp/python
set DOWNLOAD_URL= set DOWNLOAD_URL=
set D=%~dp0 set D=%~dp0
set PCBUILD=%D%..\..\PCBuild\ set PCBUILD=%D%..\..\PCBuild\
set BUILDX86= set BUILDX86=
set BUILDX64= set BUILDX64=
set TARGET=Rebuild set TARGET=Rebuild
set TESTTARGETDIR= set TESTTARGETDIR=
:CheckOpts :CheckOpts
if "%1" EQU "-h" goto Help if "%1" EQU "-h" goto Help
if "%1" EQU "-c" (set CERTNAME=%~2) && shift && shift && goto CheckOpts if "%1" EQU "-c" (set CERTNAME=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "--certificate" (set CERTNAME=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--certificate" (set CERTNAME=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "-o" (set OUTDIR=%~2) && shift && shift && goto CheckOpts if "%1" EQU "-o" (set OUTDIR=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "--out" (set OUTDIR=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--out" (set OUTDIR=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "-D" (set SKIPDOC=1) && shift && goto CheckOpts if "%1" EQU "-D" (set SKIPDOC=1) && shift && goto CheckOpts
if "%1" EQU "--skip-doc" (set SKIPDOC=1) && shift && goto CheckOpts if "%1" EQU "--skip-doc" (set SKIPDOC=1) && shift && goto CheckOpts
if "%1" EQU "-B" (set SKIPBUILD=1) && shift && goto CheckOpts if "%1" EQU "-B" (set SKIPBUILD=1) && shift && goto CheckOpts
if "%1" EQU "--skip-build" (set SKIPBUILD=1) && shift && goto CheckOpts if "%1" EQU "--skip-build" (set SKIPBUILD=1) && shift && goto CheckOpts
if "%1" EQU "--download" (set DOWNLOAD_URL=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--download" (set DOWNLOAD_URL=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "--test" (set TESTTARGETDIR=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--test" (set TESTTARGETDIR=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "-b" (set TARGET=Build) && shift && goto CheckOpts if "%1" EQU "-b" (set TARGET=Build) && shift && goto CheckOpts
if "%1" EQU "--build" (set TARGET=Build) && shift && goto CheckOpts if "%1" EQU "--build" (set TARGET=Build) && shift && goto CheckOpts
if "%1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts if "%1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts
if "%1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts if "%1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts
if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)
:builddoc :builddoc
if "%SKIPBUILD%" EQU "1" goto skipdoc if "%SKIPBUILD%" EQU "1" goto skipdoc
if "%SKIPDOC%" EQU "1" goto skipdoc if "%SKIPDOC%" EQU "1" goto skipdoc
if not defined PYTHON where py -q || echo Cannot find py on path and PYTHON is not set. && exit /B 1 if not defined PYTHON where py -q || echo Cannot find py on path and PYTHON is not set. && exit /B 1
if not defined SPHINXBUILD where sphinx-build -q || echo Cannot find sphinx-build on path and SPHINXBUILD is not set. && exit /B 1 if not defined SPHINXBUILD where sphinx-build -q || echo Cannot find sphinx-build on path and SPHINXBUILD is not set. && exit /B 1
call "%D%..\..\doc\make.bat" htmlhelp call "%D%..\..\doc\make.bat" htmlhelp
if errorlevel 1 goto :eof if errorlevel 1 goto :eof
:skipdoc :skipdoc
where hg /q || echo Cannot find Mercurial on PATH && exit /B 1 where hg /q || echo Cannot find Mercurial on PATH && exit /B 1
where dlltool /q && goto skipdlltoolsearch where dlltool /q && goto skipdlltoolsearch
set _DLLTOOL_PATH= set _DLLTOOL_PATH=
where /R "%D%..\..\externals" dlltool > "%TEMP%\dlltool.loc" 2> nul && set /P _DLLTOOL_PATH= < "%TEMP%\dlltool.loc" & del "%TEMP%\dlltool.loc" where /R "%D%..\..\externals" dlltool > "%TEMP%\dlltool.loc" 2> nul && set /P _DLLTOOL_PATH= < "%TEMP%\dlltool.loc" & del "%TEMP%\dlltool.loc"
if not exist "%_DLLTOOL_PATH%" echo Cannot find binutils on PATH or in external && exit /B 1 if not exist "%_DLLTOOL_PATH%" echo Cannot find binutils on PATH or in external && exit /B 1
for %%f in (%_DLLTOOL_PATH%) do set PATH=%PATH%;%%~dpf for %%f in (%_DLLTOOL_PATH%) do set PATH=%PATH%;%%~dpf
set _DLLTOOL_PATH= set _DLLTOOL_PATH=
:skipdlltoolsearch :skipdlltoolsearch
if defined BUILDX86 ( if defined BUILDX86 (
call :build x86 call :build x86
if errorlevel 1 exit /B if errorlevel 1 exit /B
) )
if defined BUILDX64 ( if defined BUILDX64 (
call :build x64 call :build x64
if errorlevel 1 exit /B if errorlevel 1 exit /B
) )
if defined TESTTARGETDIR ( if defined TESTTARGETDIR (
call "%D%testrelease.bat" -t "%TESTTARGETDIR%" call "%D%testrelease.bat" -t "%TESTTARGETDIR%"
) )
exit /B 0 exit /B 0
:build :build
@setlocal @setlocal
@echo off @echo off
if "%1" EQU "x86" ( if "%1" EQU "x86" (
call "%PCBUILD%env.bat" x86 call "%PCBUILD%env.bat" x86
set BUILD=%PCBUILD%win32\ set BUILD=%PCBUILD%win32\
set BUILD_PLAT=Win32 set BUILD_PLAT=Win32
set OUTDIR_PLAT=win32 set OUTDIR_PLAT=win32
set OBJDIR_PLAT=x86 set OBJDIR_PLAT=x86
set RELEASE_URI=%RELEASE_URI_X86% set RELEASE_URI=%RELEASE_URI_X86%
) ELSE ( ) ELSE (
call "%PCBUILD%env.bat" x86_amd64 call "%PCBUILD%env.bat" x86_amd64
set BUILD=%PCBUILD%amd64\ set BUILD=%PCBUILD%amd64\
set BUILD_PLAT=x64 set BUILD_PLAT=x64
set OUTDIR_PLAT=amd64 set OUTDIR_PLAT=amd64
set OBJDIR_PLAT=x64 set OBJDIR_PLAT=x64
set RELEASE_URI=%RELEASE_URI_X64% set RELEASE_URI=%RELEASE_URI_X64%
) )
if exist "%BUILD%en-us" ( if exist "%BUILD%en-us" (
echo Deleting %BUILD%en-us echo Deleting %BUILD%en-us
rmdir /q/s "%BUILD%en-us" rmdir /q/s "%BUILD%en-us"
if errorlevel 1 exit /B if errorlevel 1 exit /B
) )
if exist "%D%obj\Release_%OBJDIR_PLAT%" ( if exist "%D%obj\Release_%OBJDIR_PLAT%" (
echo Deleting "%D%obj\Release_%OBJDIR_PLAT%" echo Deleting "%D%obj\Release_%OBJDIR_PLAT%"
rmdir /q/s "%D%obj\Release_%OBJDIR_PLAT%" rmdir /q/s "%D%obj\Release_%OBJDIR_PLAT%"
if errorlevel 1 exit /B if errorlevel 1 exit /B
) )
if not "%CERTNAME%" EQU "" ( if not "%CERTNAME%" EQU "" (
set CERTOPTS="/p:SigningCertificate=%CERTNAME%" set CERTOPTS="/p:SigningCertificate=%CERTNAME%"
) else ( ) else (
set CERTOPTS= set CERTOPTS=
) )
if not "%SKIPBUILD%" EQU "1" ( if not "%SKIPBUILD%" EQU "1" (
call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -d -t %TARGET% %CERTOPTS% call "%PCBUILD%build.bat" -e -p %BUILD_PLAT% -d -t %TARGET% %CERTOPTS%
if errorlevel 1 exit /B if errorlevel 1 exit /B
call "%PCBUILD%build.bat" -p %BUILD_PLAT% -t %TARGET% %CERTOPTS% call "%PCBUILD%build.bat" -p %BUILD_PLAT% -t %TARGET% %CERTOPTS%
if errorlevel 1 exit /B if errorlevel 1 exit /B
@rem build.bat turns echo back on, so we disable it again @rem build.bat turns echo back on, so we disable it again
@echo off @echo off
) )
"%BUILD%python.exe" "%D%get_wix.py" "%BUILD%python.exe" "%D%get_wix.py"
set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI% set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%
msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true
if errorlevel 1 exit /B if errorlevel 1 exit /B
msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false
if errorlevel 1 exit /B if errorlevel 1 exit /B
if not "%OUTDIR%" EQU "" ( if not "%OUTDIR%" EQU "" (
mkdir "%OUTDIR%\%OUTDIR_PLAT%" mkdir "%OUTDIR%\%OUTDIR_PLAT%"
copy /Y "%BUILD%en-us\*.cab" "%OUTDIR%\%OUTDIR_PLAT%" copy /Y "%BUILD%en-us\*.cab" "%OUTDIR%\%OUTDIR_PLAT%"
copy /Y "%BUILD%en-us\*.exe" "%OUTDIR%\%OUTDIR_PLAT%" copy /Y "%BUILD%en-us\*.exe" "%OUTDIR%\%OUTDIR_PLAT%"
copy /Y "%BUILD%en-us\*.msi" "%OUTDIR%\%OUTDIR_PLAT%" copy /Y "%BUILD%en-us\*.msi" "%OUTDIR%\%OUTDIR_PLAT%"
copy /Y "%BUILD%en-us\*.msu" "%OUTDIR%\%OUTDIR_PLAT%" copy /Y "%BUILD%en-us\*.msu" "%OUTDIR%\%OUTDIR_PLAT%"
) )
exit /B 0 exit /B 0
:Help :Help
echo buildrelease.bat [--out DIR] [-x86] [-x64] [--certificate CERTNAME] [--build] [--skip-build] echo buildrelease.bat [--out DIR] [-x86] [-x64] [--certificate CERTNAME] [--build] [--skip-build]
echo [--skip-doc] [--download DOWNLOAD URL] [--test TARGETDIR] [-h] echo [--skip-doc] [--download DOWNLOAD URL] [--test TARGETDIR] [-h]
echo. echo.
echo --out (-o) Specify an additional output directory for installers echo --out (-o) Specify an additional output directory for installers
echo -x86 Build x86 installers echo -x86 Build x86 installers
echo -x64 Build x64 installers echo -x64 Build x64 installers
echo --build (-b) Incrementally build Python rather than rebuilding echo --build (-b) Incrementally build Python rather than rebuilding
echo --skip-build (-B) Do not build Python (just do the installers) echo --skip-build (-B) Do not build Python (just do the installers)
echo --skip-doc (-D) Do not build documentation echo --skip-doc (-D) Do not build documentation
echo --download Specify the full download URL for MSIs (should include {2}) echo --download Specify the full download URL for MSIs (should include {2})
echo --test Specify the test directory to run the installer tests echo --test Specify the test directory to run the installer tests
echo -h Display this help information echo -h Display this help information
echo. echo.
echo If no architecture is specified, all architectures will be built. echo If no architecture is specified, all architectures will be built.
echo If --test is not specified, the installer tests are not run. echo If --test is not specified, the installer tests are not run.
echo. echo.

228
Tools/msi/testrelease.bat
View File

@ -1,114 +1,114 @@
@setlocal @setlocal
@echo off @echo off
set D=%~dp0 set D=%~dp0
set PCBUILD=%D%..\..\PCBuild\ set PCBUILD=%D%..\..\PCBuild\
set TARGETDIR=%TEMP% set TARGETDIR=%TEMP%
set TESTX86= set TESTX86=
set TESTX64= set TESTX64=
set TESTALLUSER= set TESTALLUSER=
set TESTPERUSER= set TESTPERUSER=
:CheckOpts :CheckOpts
if "%1" EQU "-h" goto Help if "%1" EQU "-h" goto Help
if "%1" EQU "-x86" (set TESTX86=1) && shift && goto CheckOpts if "%1" EQU "-x86" (set TESTX86=1) && shift && goto CheckOpts
if "%1" EQU "-x64" (set TESTX64=1) && shift && goto CheckOpts if "%1" EQU "-x64" (set TESTX64=1) && shift && goto CheckOpts
if "%1" EQU "-t" (set TARGETDIR=%~2) && shift && shift && goto CheckOpts if "%1" EQU "-t" (set TARGETDIR=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "--target" (set TARGETDIR=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--target" (set TARGETDIR=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "-a" (set TESTALLUSER=1) && shift && goto CheckOpts if "%1" EQU "-a" (set TESTALLUSER=1) && shift && goto CheckOpts
if "%1" EQU "--alluser" (set TESTALLUSER=1) && shift && goto CheckOpts if "%1" EQU "--alluser" (set TESTALLUSER=1) && shift && goto CheckOpts
if "%1" EQU "-p" (set TESTPERUSER=1) && shift && goto CheckOpts if "%1" EQU "-p" (set TESTPERUSER=1) && shift && goto CheckOpts
if "%1" EQU "--peruser" (set TESTPERUSER=1) && shift && goto CheckOpts if "%1" EQU "--peruser" (set TESTPERUSER=1) && shift && goto CheckOpts
if not defined TESTX86 if not defined TESTX64 (set TESTX86=1) && (set TESTX64=1) if not defined TESTX86 if not defined TESTX64 (set TESTX86=1) && (set TESTX64=1)
if not defined TESTALLUSER if not defined TESTPERUSER (set TESTALLUSER=1) && (set TESTPERUSER=1) if not defined TESTALLUSER if not defined TESTPERUSER (set TESTALLUSER=1) && (set TESTPERUSER=1)
if defined TESTX86 ( if defined TESTX86 (
for %%f in ("%PCBUILD%win32\en-us\*.exe") do ( for %%f in ("%PCBUILD%win32\en-us\*.exe") do (
if defined TESTALLUSER call :test "%%~ff" "%TARGETDIR%\%%~nf-alluser" "InstallAllUsers=1 CompileAll=1" if defined TESTALLUSER call :test "%%~ff" "%TARGETDIR%\%%~nf-alluser" "InstallAllUsers=1 CompileAll=1"
if errorlevel 1 exit /B if errorlevel 1 exit /B
if defined TESTPERUSER call :test "%%~ff" "%TARGETDIR%\%%~nf-peruser" "InstallAllUsers=0 CompileAll=0" if defined TESTPERUSER call :test "%%~ff" "%TARGETDIR%\%%~nf-peruser" "InstallAllUsers=0 CompileAll=0"
if errorlevel 1 exit /B if errorlevel 1 exit /B
) )
) )
if defined TESTX64 ( if defined TESTX64 (
for %%f in ("%PCBUILD%amd64\en-us\*.exe") do ( for %%f in ("%PCBUILD%amd64\en-us\*.exe") do (
if defined TESTALLUSER call :test "%%~ff" "%TARGETDIR%\%%~nf-alluser" "InstallAllUsers=1 CompileAll=1" if defined TESTALLUSER call :test "%%~ff" "%TARGETDIR%\%%~nf-alluser" "InstallAllUsers=1 CompileAll=1"
if errorlevel 1 exit /B if errorlevel 1 exit /B
if defined TESTPERUSER call :test "%%~ff" "%TARGETDIR%\%%~nf-peruser" "InstallAllUsers=0 CompileAll=0" if defined TESTPERUSER call :test "%%~ff" "%TARGETDIR%\%%~nf-peruser" "InstallAllUsers=0 CompileAll=0"
if errorlevel 1 exit /B if errorlevel 1 exit /B
) )
) )
exit /B 0 exit /B 0
:test :test
@setlocal @setlocal
@echo on @echo on
@if not exist "%~1" exit /B 1 @if not exist "%~1" exit /B 1
@set EXITCODE=0 @set EXITCODE=0
@echo Installing %1 into %2 @echo Installing %1 into %2
"%~1" /passive /log "%~2\install\log.txt" TargetDir="%~2\Python" Include_debug=1 Include_symbols=1 %~3 "%~1" /passive /log "%~2\install\log.txt" TargetDir="%~2\Python" Include_debug=1 Include_symbols=1 %~3
@if not errorlevel 1 ( @if not errorlevel 1 (
@echo Printing version @echo Printing version
"%~2\Python\python.exe" -c "import sys; print(sys.version)" > "%~2\version.txt" 2>&1 "%~2\Python\python.exe" -c "import sys; print(sys.version)" > "%~2\version.txt" 2>&1
) )
@if not errorlevel 1 ( @if not errorlevel 1 (
@echo Capturing Start Menu @echo Capturing Start Menu
@dir /s/b "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" | findstr /ic:"python" > "%~2\startmenu.txt" 2>&1 @dir /s/b "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" | findstr /ic:"python" > "%~2\startmenu.txt" 2>&1
@dir /s/b "%APPDATA%\Microsoft\Windows\Start Menu\Programs" | findstr /ic:"python" >> "%~2\startmenu.txt" 2>&1 @dir /s/b "%APPDATA%\Microsoft\Windows\Start Menu\Programs" | findstr /ic:"python" >> "%~2\startmenu.txt" 2>&1
@echo Capturing registry @echo Capturing registry
@for /F "usebackq" %%f in (`reg query HKCR /s /f python /k`) do @( @for /F "usebackq" %%f in (`reg query HKCR /s /f python /k`) do @(
echo %%f >> "%~2\hkcr.txt" echo %%f >> "%~2\hkcr.txt"
reg query "%%f" /s >> "%~2\hkcr.txt" 2>&1 reg query "%%f" /s >> "%~2\hkcr.txt" 2>&1
) )
@reg query HKCU\Software\Python /s > "%~2\hkcu.txt" 2>&1 @reg query HKCU\Software\Python /s > "%~2\hkcu.txt" 2>&1
@reg query HKLM\Software\Python /reg:32 /s > "%~2\hklm.txt" 2>&1 @reg query HKLM\Software\Python /reg:32 /s > "%~2\hklm.txt" 2>&1
@reg query HKLM\Software\Python /reg:64 /s >> "%~2\hklm.txt" 2>&1 @reg query HKLM\Software\Python /reg:64 /s >> "%~2\hklm.txt" 2>&1
cmd /k exit 0 cmd /k exit 0
) )
@if not errorlevel 1 ( @if not errorlevel 1 (
@echo Installing package @echo Installing package
"%~2\Python\python.exe" -m pip install "azure<0.10" > "%~2\pip.txt" 2>&1 "%~2\Python\python.exe" -m pip install "azure<0.10" > "%~2\pip.txt" 2>&1
@if not errorlevel 1 ( @if not errorlevel 1 (
"%~2\Python\python.exe" -m pip uninstall -y azure python-dateutil six >> "%~2\pip.txt" 2>&1 "%~2\Python\python.exe" -m pip uninstall -y azure python-dateutil six >> "%~2\pip.txt" 2>&1
) )
) )
@if not errorlevel 1 ( @if not errorlevel 1 (
@echo Testing Tcl/tk @echo Testing Tcl/tk
@set TCL_LIBRARY=%~2\Python\tcl\tcl8.6 @set TCL_LIBRARY=%~2\Python\tcl\tcl8.6
"%~2\Python\python.exe" -m test -uall -v test_ttk_guionly test_tk test_idle > "%~2\tcltk.txt" 2>&1 "%~2\Python\python.exe" -m test -uall -v test_ttk_guionly test_tk test_idle > "%~2\tcltk.txt" 2>&1
@set TCL_LIBRARY= @set TCL_LIBRARY=
) )
@set EXITCODE=%ERRORLEVEL% @set EXITCODE=%ERRORLEVEL%
@echo Result was %EXITCODE% @echo Result was %EXITCODE%
@echo Removing %1 @echo Removing %1
"%~1" /passive /uninstall /log "%~2\uninstall\log.txt" "%~1" /passive /uninstall /log "%~2\uninstall\log.txt"
@echo off @echo off
exit /B %EXITCODE% exit /B %EXITCODE%
:Help :Help
echo testrelease.bat [--target TARGET] [-x86] [-x64] [--alluser] [--peruser] [-h] echo testrelease.bat [--target TARGET] [-x86] [-x64] [--alluser] [--peruser] [-h]
echo. echo.
echo --target (-t) Specify the target directory for installs and logs echo --target (-t) Specify the target directory for installs and logs
echo -x86 Run tests for x86 installers echo -x86 Run tests for x86 installers
echo -x64 Run tests for x64 installers echo -x64 Run tests for x64 installers
echo --alluser (-a) Run tests for all-user installs (requires Administrator) echo --alluser (-a) Run tests for all-user installs (requires Administrator)
echo --peruser (-p) Run tests for per-user installs echo --peruser (-p) Run tests for per-user installs
echo -h Display this help information echo -h Display this help information
echo. echo.
echo If no test architecture is specified, all architectures will be tested. echo If no test architecture is specified, all architectures will be tested.
echo If no install type is selected, all install types will be tested. echo If no install type is selected, all install types will be tested.
echo. echo.

112
Tools/msi/uploadrelease.bat
View File

@ -1,56 +1,56 @@
@setlocal @setlocal
@echo off @echo off
set D=%~dp0 set D=%~dp0
set PCBUILD=%D%..\..\PCBuild\ set PCBUILD=%D%..\..\PCBuild\
set HOST= set HOST=
set USER= set USER=
set TARGET= set TARGET=
set DRYRUN=false set DRYRUN=false
:CheckOpts :CheckOpts
if "%1" EQU "-h" goto Help if "%1" EQU "-h" goto Help
if "%1" EQU "-o" (set HOST=%~2) && shift && shift && goto CheckOpts if "%1" EQU "-o" (set HOST=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "--host" (set HOST=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--host" (set HOST=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "-u" (set USER=%~2) && shift && shift && goto CheckOpts if "%1" EQU "-u" (set USER=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "--user" (set USER=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--user" (set USER=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "-t" (set TARGET=%~2) && shift && shift && goto CheckOpts if "%1" EQU "-t" (set TARGET=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "--target" (set TARGET=%~2) && shift && shift && goto CheckOpts if "%1" EQU "--target" (set TARGET=%~2) && shift && shift && goto CheckOpts
if "%1" EQU "--dry-run" (set DRYRUN=true) && shift && goto CheckOpts if "%1" EQU "--dry-run" (set DRYRUN=true) && shift && goto CheckOpts
if not defined PLINK where plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" if not defined PLINK where plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"
if not defined PLINK where /R "%ProgramFiles(x86)%\PuTTY" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" if not defined PLINK where /R "%ProgramFiles(x86)%\PuTTY" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"
if not defined PLINK where /R "%ProgramFiles(x86)%" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" if not defined PLINK where /R "%ProgramFiles(x86)%" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"
if not defined PLINK echo Cannot locate plink.exe & exit /B 1 if not defined PLINK echo Cannot locate plink.exe & exit /B 1
echo Found plink.exe at %PLINK% echo Found plink.exe at %PLINK%
if not defined PSCP where pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc" if not defined PSCP where pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc"
if not defined PSCP where /R "%ProgramFiles(x86)%\PuTTY" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc" if not defined PSCP where /R "%ProgramFiles(x86)%\PuTTY" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc"
if not defined PSCP where /R "%ProgramFiles(x86)%" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc" if not defined PSCP where /R "%ProgramFiles(x86)%" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc"
if not defined PSCP echo Cannot locate pscp.exe & exit /B 1 if not defined PSCP echo Cannot locate pscp.exe & exit /B 1
echo Found pscp.exe at %PSCP% echo Found pscp.exe at %PSCP%
if not defined GPG where gpg2 > "%TEMP%\gpg.loc" 2> nul && set /P GPG= < "%TEMP%\gpg.loc" & del "%TEMP%\gpg.loc" if not defined GPG where gpg2 > "%TEMP%\gpg.loc" 2> nul && set /P GPG= < "%TEMP%\gpg.loc" & del "%TEMP%\gpg.loc"
if not defined GPG where /R "%PCBUILD%..\externals" gpg2 > "%TEMP%\gpg.loc" 2> nul && set /P GPG= < "%TEMP%\gpg.loc" & del "%TEMP%\gpg.loc" if not defined GPG where /R "%PCBUILD%..\externals" gpg2 > "%TEMP%\gpg.loc" 2> nul && set /P GPG= < "%TEMP%\gpg.loc" & del "%TEMP%\gpg.loc"
if not defined GPG echo Cannot locate gpg2.exe. Signatures will not be uploaded & pause if not defined GPG echo Cannot locate gpg2.exe. Signatures will not be uploaded & pause
echo Found gpg2.exe at %GPG% echo Found gpg2.exe at %GPG%
call "%PCBUILD%env.bat" > nul 2> nul call "%PCBUILD%env.bat" > nul 2> nul
pushd "%D%" pushd "%D%"
msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86 msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86
msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false
msbuild /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x86 msbuild /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x86
msbuild /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x64 /p:IncludeDoc=false msbuild /v:m /nologo uploadrelease.proj /t:ShowHashes /p:Platform=x64 /p:IncludeDoc=false
popd popd
exit /B 0 exit /B 0
:Help :Help
echo uploadrelease.bat --host HOST --user USERNAME [--target TARGET] [--dry-run] [-h] echo uploadrelease.bat --host HOST --user USERNAME [--target TARGET] [--dry-run] [-h]
echo. echo.
echo --host (-o) Specify the upload host (required) echo --host (-o) Specify the upload host (required)
echo --user (-u) Specify the user on the host (required) echo --user (-u) Specify the user on the host (required)
echo --target (-t) Specify the target directory on the host echo --target (-t) Specify the target directory on the host
echo --dry-run Display commands and filenames without executing them echo --dry-run Display commands and filenames without executing them
echo -h Display this help information echo -h Display this help information
echo. echo.

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