Issue #20609: Merge with 3.3.
This commit is contained in:
parent
907f0172e5
commit
ee227ae7cf
|
@ -35,6 +35,12 @@ Library
|
||||||
|
|
||||||
- Issue #20594: Avoid name clash with the libc function posix_close.
|
- Issue #20594: Avoid name clash with the libc function posix_close.
|
||||||
|
|
||||||
|
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?
|
What's New in Python 3.4.0 release candidate 1?
|
||||||
===============================================
|
===============================================
|
||||||
|
|
|
@ -182,7 +182,11 @@
|
||||||
<BaseAddress>0x1e000000</BaseAddress>
|
<BaseAddress>0x1e000000</BaseAddress>
|
||||||
</Link>
|
</Link>
|
||||||
<PreBuildEvent>
|
<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>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Killing any running $(PythonExe) instances...</Message>
|
<Message>Killing any running $(PythonExe) instances...</Message>
|
||||||
|
@ -213,7 +217,11 @@
|
||||||
<BaseAddress>0x1e000000</BaseAddress>
|
<BaseAddress>0x1e000000</BaseAddress>
|
||||||
</Link>
|
</Link>
|
||||||
<PreBuildEvent>
|
<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>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Killing any running $(PythonExe) instances...</Message>
|
<Message>Killing any running $(PythonExe) instances...</Message>
|
||||||
|
@ -244,7 +252,11 @@
|
||||||
<BaseAddress>0x1e000000</BaseAddress>
|
<BaseAddress>0x1e000000</BaseAddress>
|
||||||
</Link>
|
</Link>
|
||||||
<PreBuildEvent>
|
<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>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Killing any running $(PythonExe) instances...</Message>
|
<Message>Killing any running $(PythonExe) instances...</Message>
|
||||||
|
@ -278,7 +290,11 @@
|
||||||
<BaseAddress>0x1e000000</BaseAddress>
|
<BaseAddress>0x1e000000</BaseAddress>
|
||||||
</Link>
|
</Link>
|
||||||
<PreBuildEvent>
|
<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>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Killing any running $(PythonExe) instances...</Message>
|
<Message>Killing any running $(PythonExe) instances...</Message>
|
||||||
|
@ -307,7 +323,11 @@
|
||||||
<BaseAddress>0x1e000000</BaseAddress>
|
<BaseAddress>0x1e000000</BaseAddress>
|
||||||
</Link>
|
</Link>
|
||||||
<PreBuildEvent>
|
<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>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Killing any running $(PythonExe) instances...</Message>
|
<Message>Killing any running $(PythonExe) instances...</Message>
|
||||||
|
@ -339,7 +359,11 @@
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
<TargetMachine>MachineX64</TargetMachine>
|
||||||
</Link>
|
</Link>
|
||||||
<PreBuildEvent>
|
<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>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Killing any running $(PythonExe) instances...</Message>
|
<Message>Killing any running $(PythonExe) instances...</Message>
|
||||||
|
@ -368,7 +392,11 @@
|
||||||
<BaseAddress>0x1e000000</BaseAddress>
|
<BaseAddress>0x1e000000</BaseAddress>
|
||||||
</Link>
|
</Link>
|
||||||
<PreBuildEvent>
|
<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>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Killing any running $(PythonExe) instances...</Message>
|
<Message>Killing any running $(PythonExe) instances...</Message>
|
||||||
|
@ -400,7 +428,11 @@
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
<TargetMachine>MachineX64</TargetMachine>
|
||||||
</Link>
|
</Link>
|
||||||
<PreBuildEvent>
|
<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>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Killing any running $(PythonExe) instances...</Message>
|
<Message>Killing any running $(PythonExe) instances...</Message>
|
||||||
|
|
Loading…
Reference in New Issue