diff options
| author | Martin v. L?wis <martin@v.loewis.de> | 2012-06-03 12:00:48 +0200 |
|---|---|---|
| committer | Martin v. L?wis <martin@v.loewis.de> | 2012-06-03 12:00:48 +0200 |
| commit | 183bc7b78cb50c73b3142710b3b8fbafde4a3833 (patch) | |
| tree | 8a29bbfd852dccb5f14340c8d1c6309cf8fdfb72 /PC/VS8.0 | |
| parent | 15670dc71126aabce6daca6c8d32f55ea146cc11 (diff) | |
| parent | 9fe4e3d311149c5f07073f7c55509fcfd7dde47e (diff) | |
| download | cpython-183bc7b78cb50c73b3142710b3b8fbafde4a3833.tar.gz | |
Merge 3.2: issue #14937.
Diffstat (limited to 'PC/VS8.0')
| -rw-r--r-- | PC/VS8.0/_multiprocessing.vcproj | 12 | ||||
| -rw-r--r-- | PC/VS8.0/build_ssl.bat | 4 | ||||
| -rw-r--r-- | PC/VS8.0/kill_python.c | 2 | ||||
| -rw-r--r-- | PC/VS8.0/pyproject.vsprops | 4 | ||||
| -rw-r--r-- | PC/VS8.0/pythoncore.vcproj | 4 |
5 files changed, 5 insertions, 21 deletions
diff --git a/PC/VS8.0/_multiprocessing.vcproj b/PC/VS8.0/_multiprocessing.vcproj index c2bbec449d..8f1cafc92a 100644 --- a/PC/VS8.0/_multiprocessing.vcproj +++ b/PC/VS8.0/_multiprocessing.vcproj @@ -522,10 +522,6 @@ RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h"
>
</File>
- <File
- RelativePath="..\..\Modules\_multiprocessing\connection.h"
- >
- </File>
</Filter>
<Filter
Name="Source Files"
@@ -535,18 +531,10 @@ >
</File>
<File
- RelativePath="..\..\Modules\_multiprocessing\pipe_connection.c"
- >
- </File>
- <File
RelativePath="..\..\Modules\_multiprocessing\semaphore.c"
>
</File>
<File
- RelativePath="..\..\Modules\_multiprocessing\socket_connection.c"
- >
- </File>
- <File
RelativePath="..\..\Modules\_multiprocessing\win32_functions.c"
>
</File>
diff --git a/PC/VS8.0/build_ssl.bat b/PC/VS8.0/build_ssl.bat index 39c1ff0d72..357b08b66c 100644 --- a/PC/VS8.0/build_ssl.bat +++ b/PC/VS8.0/build_ssl.bat @@ -2,10 +2,10 @@ if not defined HOST_PYTHON ( if %1 EQU Debug ( set HOST_PYTHON=python_d.exe - if not exist python32_d.dll exit 1 + if not exist python33_d.dll exit 1 ) ELSE ( set HOST_PYTHON=python.exe - if not exist python32.dll exit 1 + if not exist python33.dll exit 1 ) ) %HOST_PYTHON% build_ssl.py %1 %2 %3 diff --git a/PC/VS8.0/kill_python.c b/PC/VS8.0/kill_python.c index 6b916781cc..bb323d31d0 100644 --- a/PC/VS8.0/kill_python.c +++ b/PC/VS8.0/kill_python.c @@ -106,7 +106,7 @@ main(int argc, char **argv) /* * XXX TODO: if we really wanted to be fancy, we could check the * modules for all processes (not just the python[_d].exe ones) - * and see if any of our DLLs are loaded (i.e. python32[_d].dll), + * and see if any of our DLLs are loaded (i.e. python33[_d].dll), * as that would also inhibit our ability to rebuild the solution. * Not worth loosing sleep over though; for now, a simple check * for just the python executable should be sufficient. diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index 2a82e4962c..f86cdec832 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -38,7 +38,7 @@ />
<UserMacro
Name="PyDllName"
- Value="python32"
+ Value="python33"
/>
<UserMacro
Name="PythonExe"
@@ -58,7 +58,7 @@ />
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0j"
+ Value="$(externalsDir)\openssl-1.0.1c"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj index e81559e1fd..a75bb9debb 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -1707,10 +1707,6 @@ >
</File>
<File
- RelativePath="..\..\PC\import_nt.c"
- >
- </File>
- <File
RelativePath="..\..\PC\msvcrtmodule.c"
>
</File>
|