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

Merge with 3.5

This commit is contained in:
Zachary Ware 2015-06-10 00:44:40 -05:00
parent 97b6e98af3 785273cd84
commit 27da359519
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PCbuild/build.bat
View File

@ -9,8 +9,10 @@ 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 Enable parallel build (enabled by default)
rem -M Disable parallel build rem -M Disable parallel build
rem -v Increased output messages rem -v Increased output messages
rem -k Attempt to kill any running Pythons before building (usually unnecessary)
setlocal setlocal
set platf=Win32 set platf=Win32
@ -20,6 +22,7 @@ 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
set kill=
:CheckOpts :CheckOpts
if '%1'=='-c' (set conf=%2) & shift & shift & goto CheckOpts if '%1'=='-c' (set conf=%2) & shift & shift & goto CheckOpts
@ -28,14 +31,20 @@ 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=/m) & 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 '%1'=='-k' (set kill=true) & 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
if '%kill%'=='true' (
msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=%conf% /p:Platform=%platf% /p:KillPython=true
)
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"

7
Tools/buildbot/build.bat
View File

@ -1,10 +1,7 @@
@rem Used by the buildbot "compile" step. @rem Used by the buildbot "compile" step.
@rem Clean up @rem Clean up
set PLAT= call "%~dp0clean.bat" %*
if '%1' EQU '-p' if '%2' EQU 'x64' (set PLAT=-amd64)
call "%~dp0clean%PLAT%.bat"
@rem If you need the buildbots to start fresh (such as when upgrading to @rem 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):
@ -17,4 +14,4 @@ call "%~dp0clean%PLAT%.bat"
@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 -k -v %*

2
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" -p x64 %*

19
Tools/buildbot/clean.bat
View File

@ -5,25 +5,12 @@ setlocal
set root=%~dp0..\.. set root=%~dp0..\..
set pcbuild=%root%\PCbuild set pcbuild=%root%\PCbuild
if "%1" == "x64" ( echo Deleting build
set vcvars_target=x86_amd64 call "%pcbuild%\build.bat" -t Clean -k %*
set platform=x64 call "%pcbuild%\build.bat" -t Clean -k -d %*
) else (
set vcvars_target=x86
set platform=Win32
)
call "%pcbuild%\env.bat" %vcvars_target%
echo.Attempting to kill Pythons...
msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform% /p:KillPython=true
echo Deleting .pyc/.pyo files ... 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
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%

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

@ -1,5 +1,2 @@
@rem Used by the buildbot "test" step. @rem Used by the buildbot "test" step.
call "%~dp0test.bat" -x64 %*
setlocal
call "%~dp0..\..\PCbuild\rt.bat" -d -q -x64 -uall -rwW -n --timeout=3600 %*

14
Tools/buildbot/test.bat
View File

@ -1,5 +1,15 @@
@rem Used by the buildbot "test" step. @rem Used by the buildbot "test" step.
@setlocal
setlocal @set here=%~dp0
@set rt_opts=-q -d
call "%~dp0..\..\PCbuild\rt.bat" -d -q -uall -rwW -n --timeout=3600 %* :CheckOpts
@if '%1'=='-x64' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
@if '%1'=='-d' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
@if '%1'=='-O' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
@if '%1'=='-q' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
@if '%1'=='+d' (set rt_opts=%rt_opts:-d=%) & shift & goto CheckOpts
@if '%1'=='+q' (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts
call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9