[Python-checkins] cpython (3.3): Issue #20609: Fix building 64-bit binaries on 32-bit Windows.
zach.ware
python-checkins at python.org
Tue Feb 18 18:35:28 CET 2014
http://hg.python.org/cpython/rev/d610a2740b5f
changeset: 89254:d610a2740b5f
branch: 3.3
parent: 89250:fa81f6ddd60e
user: Zachary Ware <zachary.ware at gmail.com>
date: Tue Feb 18 11:33:18 2014 -0600
summary:
Issue #20609: Fix building 64-bit binaries on 32-bit Windows.
files:
Misc/NEWS | 6 +++
PCbuild/pythoncore.vcxproj | 48 +++++++++++++++++++++----
2 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -131,6 +131,12 @@
- Issue #20488: Importlib is no longer *an* implementation of import, it's *the*
implementation.
+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.3.4?
===========================
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -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>
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list