diff options
| author |   Zachary Ware <zachary.ware@gmail.com> | 2014-02-18 11:35:15 -0600 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-02-18 11:35:15 -0600 |
| commit | b59e4425d5476117b77db6a6ee9561f56b8a252a (patch) | |
| tree | e32ddb0d989c39142ee1724eac803b613d19b3cb /PCbuild | |
| parent | Misc/NEWS: Add a news item for UNIX Sockets support in asyncio. Cleanup WS. (diff) | |
| parent | Issue #20609: Fix building 64-bit binaries on 32-bit Windows. (diff) | |
| download | cpython-b59e4425d5476117b77db6a6ee9561f56b8a252a.tar.gz cpython-b59e4425d5476117b77db6a6ee9561f56b8a252a.tar.bz2 cpython-b59e4425d5476117b77db6a6ee9561f56b8a252a.zip | |
Issue #20609: Merge with 3.3.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 11b7054d3fb..2296f0bb609 100644 --- 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> |