ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 10:30:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #20609: Merge with 3.3.

Browse source
This commit is contained in:
Zachary Ware 2014-02-18 11:35:15 -06:00
commit b59e4425d5
2 changed files with 46 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Misc/NEWS
View file

@ -61,6 +61,12 @@ Tests
- Issue #20605: Make test_socket getaddrinfo OS X segfault test more robust.
Build
-----
- Issue #20609: Restored the ability to build 64-bit Windows binaries on
32-bit Windows, which was broken by the change in issue #19788.
What's New in Python 3.4.0 release candidate 1?
===============================================

48
PCbuild/pythoncore.vcxproj
View file

@ -182,7 +182,11 @@
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
<Command>$(KillPythonExe)
IF %ERRORLEVEL% NEQ 0 (
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
exit /b 0
)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
@ -213,7 +217,11 @@
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
<Command>$(KillPythonExe)
IF %ERRORLEVEL% NEQ 0 (
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
exit /b 0
)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
@ -244,7 +252,11 @@
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
<Command>$(KillPythonExe)
IF %ERRORLEVEL% NEQ 0 (
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
exit /b 0
)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
@ -278,7 +290,11 @@
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
<Command>$(KillPythonExe)
IF %ERRORLEVEL% NEQ 0 (
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
exit /b 0
)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
@ -307,7 +323,11 @@
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
<Command>$(KillPythonExe)
IF %ERRORLEVEL% NEQ 0 (
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
exit /b 0
)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
@ -339,7 +359,11 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
<Command>$(KillPythonExe)
IF %ERRORLEVEL% NEQ 0 (
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
exit /b 0
)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
@ -368,7 +392,11 @@
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
<Command>$(KillPythonExe)
IF %ERRORLEVEL% NEQ 0 (
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
exit /b 0
)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
@ -400,7 +428,11 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
<Command>$(KillPythonExe)
IF %ERRORLEVEL% NEQ 0 (
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
exit /b 0
)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>