Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b59e442

Browse files
zwarezware
committed
Issue #20609: Merge with 3.3.
2 parents 8e7761e + 9e5a987 commit b59e442

2 files changed

Lines changed: 46 additions & 8 deletions

File tree

‎Misc/NEWS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ Tests
6161

6262
- Issue #20605: Make test_socket getaddrinfo OS X segfault test more robust.
6363

64+
Build
65+
-----
66+
67+
- Issue #20609: Restored the ability to build 64-bit Windows binaries on
68+
32-bit Windows, which was broken by the change in issue #19788.
69+
6470

6571
What's New in Python 3.4.0 release candidate 1?
6672
===============================================

‎PCbuild/pythoncore.vcxproj‎

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,11 @@
182182
<BaseAddress>0x1e000000</BaseAddress>
183183
</Link>
184184
<PreBuildEvent>
185-
<Command>$(KillPythonExe)</Command>
185+
<Command>$(KillPythonExe)
186+
IF %ERRORLEVEL% NEQ 0 (
187+
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
188+
exit /b 0
189+
)</Command>
186190
</PreBuildEvent>
187191
<PreBuildEvent>
188192
<Message>Killing any running $(PythonExe) instances...</Message>
@@ -213,7 +217,11 @@
213217
<BaseAddress>0x1e000000</BaseAddress>
214218
</Link>
215219
<PreBuildEvent>
216-
<Command>$(KillPythonExe)</Command>
220+
<Command>$(KillPythonExe)
221+
IF %ERRORLEVEL% NEQ 0 (
222+
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
223+
exit /b 0
224+
)</Command>
217225
</PreBuildEvent>
218226
<PreBuildEvent>
219227
<Message>Killing any running $(PythonExe) instances...</Message>
@@ -244,7 +252,11 @@
244252
<BaseAddress>0x1e000000</BaseAddress>
245253
</Link>
246254
<PreBuildEvent>
247-
<Command>$(KillPythonExe)</Command>
255+
<Command>$(KillPythonExe)
256+
IF %ERRORLEVEL% NEQ 0 (
257+
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
258+
exit /b 0
259+
)</Command>
248260
</PreBuildEvent>
249261
<PreBuildEvent>
250262
<Message>Killing any running $(PythonExe) instances...</Message>
@@ -278,7 +290,11 @@
278290
<BaseAddress>0x1e000000</BaseAddress>
279291
</Link>
280292
<PreBuildEvent>
281-
<Command>$(KillPythonExe)</Command>
293+
<Command>$(KillPythonExe)
294+
IF %ERRORLEVEL% NEQ 0 (
295+
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
296+
exit /b 0
297+
)</Command>
282298
</PreBuildEvent>
283299
<PreBuildEvent>
284300
<Message>Killing any running $(PythonExe) instances...</Message>
@@ -307,7 +323,11 @@
307323
<BaseAddress>0x1e000000</BaseAddress>
308324
</Link>
309325
<PreBuildEvent>
310-
<Command>$(KillPythonExe)</Command>
326+
<Command>$(KillPythonExe)
327+
IF %ERRORLEVEL% NEQ 0 (
328+
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
329+
exit /b 0
330+
)</Command>
311331
</PreBuildEvent>
312332
<PreBuildEvent>
313333
<Message>Killing any running $(PythonExe) instances...</Message>
@@ -339,7 +359,11 @@
339359
<TargetMachine>MachineX64</TargetMachine>
340360
</Link>
341361
<PreBuildEvent>
342-
<Command>$(KillPythonExe)</Command>
362+
<Command>$(KillPythonExe)
363+
IF %ERRORLEVEL% NEQ 0 (
364+
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
365+
exit /b 0
366+
)</Command>
343367
</PreBuildEvent>
344368
<PreBuildEvent>
345369
<Message>Killing any running $(PythonExe) instances...</Message>
@@ -368,7 +392,11 @@
368392
<BaseAddress>0x1e000000</BaseAddress>
369393
</Link>
370394
<PreBuildEvent>
371-
<Command>$(KillPythonExe)</Command>
395+
<Command>$(KillPythonExe)
396+
IF %ERRORLEVEL% NEQ 0 (
397+
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
398+
exit /b 0
399+
)</Command>
372400
</PreBuildEvent>
373401
<PreBuildEvent>
374402
<Message>Killing any running $(PythonExe) instances...</Message>
@@ -400,7 +428,11 @@
400428
<TargetMachine>MachineX64</TargetMachine>
401429
</Link>
402430
<PreBuildEvent>
403-
<Command>$(KillPythonExe)</Command>
431+
<Command>$(KillPythonExe)
432+
IF %ERRORLEVEL% NEQ 0 (
433+
echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL%
434+
exit /b 0
435+
)</Command>
404436
</PreBuildEvent>
405437
<PreBuildEvent>
406438
<Message>Killing any running $(PythonExe) instances...</Message>

0 commit comments

Comments
 (0)