mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #22919: Windows build updated to support VC 14.0 (Visual Studio 2015), which will be used for the official 3.5 release.

Browse source
This commit is contained in:
Steve Dower 2014-11-22 12:54:57 -08:00
parent 92716777b8
commit 65e4cb10d9
144 changed files with 2494 additions and 26822 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Tools/buildbot/build.bat
View file

@ -1,7 +1,10 @@
@rem Used by the buildbot "compile" step.
@rem Clean up
call "%~dp0clean.bat"
set PLAT=
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 a new version of an external library, especially Tcl/Tk):
@ -14,4 +17,4 @@ call "%~dp0clean.bat"
@rem 4) re-comment, commit and push again
@rem Do the build
call "%~dp0..\..\PCbuild\build.bat" -e -d %*
call "%~dp0..\..\PCbuild\build.bat" -e -d -v %*

3
Tools/buildbot/buildmsi.bat
View file

@ -2,6 +2,7 @@
setlocal
set cwd=%CD%
@rem build release versions of things
call "%~dp0build.bat" -c Release
@ -9,7 +10,7 @@ call "%~dp0build.bat" -c Release
call "%~dp0..\..\Doc\make.bat" htmlhelp
@rem build the MSI file
call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86
call "%~dp0..\..\PCBuild\env.bat" x86
cd "%~dp0..\..\PC"
nmake /f icons.mak
cd ..\Tools\msi

28
Tools/buildbot/clean.bat
View file

@ -5,29 +5,25 @@ setlocal
set root=%~dp0..\..
set pcbuild=%root%\PCbuild
echo.Attempting to kill Pythons...
for %%k in (kill_python.exe
kill_python_d.exe
amd64\kill_python.exe
amd64\kill_python_d.exe
) do (
if exist "%pcbuild%\%%k" (
echo.Calling %pcbuild%\%%k...
"%pcbuild%\%%k"
)
)
if "%1" == "x64" (
set vcvars_target=x86_amd64
set platform_target=x64
set platform=x64
) else (
set vcvars_target=x86
set platform_target=x86
set platform=Win32
)
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" %vcvars_target%
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%
echo Deleting .pyc/.pyo files ...
del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"
echo Deleting test leftovers ...
rmdir /s /q "%root%\build"
msbuild /target:clean "%pcbuild%\pcbuild.sln" /p:Configuration=Release /p:PlatformTarget=%platform_target%
msbuild /target:clean "%pcbuild%\pcbuild.sln" /p:Configuration=Debug /p:PlatformTarget=%platform_target%
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%