Skip to content

Commit 6373ba5

Browse files
zwarezware
committed
Bump Windows build to 3.5
1 parent 42867c7 commit 6373ba5

12 files changed

Lines changed: 734 additions & 734 deletions

‎PC/VS9.0/kill_python.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ main(int argc, char **argv)
6262
continue;
6363

6464
len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;
65-
wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
65+
wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
6666

6767
break;
6868

@@ -80,8 +80,8 @@ main(int argc, char **argv)
8080
* looking for python processes. When we find one, verify it lives
8181
* in the same directory we live in. If it does, kill it. If we're
8282
* unable to kill it, treat this as a fatal error and return 1.
83-
*
84-
* The rationale behind this is that we're called at the start of the
83+
*
84+
* The rationale behind this is that we're called at the start of the
8585
* build process on the basis that we'll take care of killing any
8686
* running instances, such that the build won't encounter permission
8787
* denied errors during linking. If we can't kill one of the processes,
@@ -104,11 +104,11 @@ main(int argc, char **argv)
104104
do {
105105

106106
/*
107-
* XXX TODO: if we really wanted to be fancy, we could check the
107+
* XXX TODO: if we really wanted to be fancy, we could check the
108108
* modules for all processes (not just the python[_d].exe ones)
109-
* and see if any of our DLLs are loaded (i.e. python34[_d].dll),
109+
* and see if any of our DLLs are loaded (i.e. python35[_d].dll),
110110
* as that would also inhibit our ability to rebuild the solution.
111-
* Not worth loosing sleep over though; for now, a simple check
111+
* Not worth loosing sleep over though; for now, a simple check
112112
* for just the python executable should be sufficient.
113113
*/
114114

@@ -119,7 +119,7 @@ main(int argc, char **argv)
119119
/* It's a python process, so figure out which directory it's in... */
120120
hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pe.th32ProcessID);
121121
if (hsm == INVALID_HANDLE_VALUE)
122-
/*
122+
/*
123123
* If our module snapshot fails (which will happen if we don't own
124124
* the process), just ignore it and continue. (It seems different
125125
* versions of Windows return different values for GetLastError()

‎PC/VS9.0/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/>
3939
<UserMacro
4040
Name="PyDllName"
41-
Value="python34"
41+
Value="python35"
4242
/>
4343
<UserMacro
4444
Name="PythonExe"

‎PC/example_nt/example.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<Tool
4040
Name="VCLinkerTool"
4141
AdditionalOptions="/export:initexample"
42-
AdditionalDependencies="odbc32.lib odbccp32.lib python34.lib"
42+
AdditionalDependencies="odbc32.lib odbccp32.lib python35.lib"
4343
OutputFile=".\Release/example.pyd"
4444
LinkIncremental="1"
4545
SuppressStartupBanner="TRUE"
@@ -105,7 +105,7 @@
105105
<Tool
106106
Name="VCLinkerTool"
107107
AdditionalOptions="/export:initexample"
108-
AdditionalDependencies="odbc32.lib odbccp32.lib python34_d.lib"
108+
AdditionalDependencies="odbc32.lib odbccp32.lib python35_d.lib"
109109
OutputFile=".\Debug/example_d.pyd"
110110
LinkIncremental="1"
111111
SuppressStartupBanner="TRUE"

‎PC/pyconfig.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
322322
their Makefile (other compilers are generally
323323
taken care of by distutils.) */
324324
# if defined(_DEBUG)
325-
# pragma comment(lib,"python34_d.lib")
325+
# pragma comment(lib,"python35_d.lib")
326326
# elif defined(Py_LIMITED_API)
327327
# pragma comment(lib,"python3.lib")
328328
# else
329-
# pragma comment(lib,"python34.lib")
329+
# pragma comment(lib,"python35.lib")
330330
# endif /* _DEBUG */
331331
# endif /* _MSC_VER */
332332
# endif /* Py_BUILD_CORE */

‎PC/python3.def‎

Lines changed: 699 additions & 699 deletions
Large diffs are not rendered by default.

‎PC/python3.mak‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
$(OutDir)python3.dll: python3.def $(OutDir)python34stub.lib
2-
cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python34stub.lib
1+
$(OutDir)python3.dll: python3.def $(OutDir)python35stub.lib
2+
cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python35stub.lib
33

4-
$(OutDir)python34stub.lib: python34stub.def
5-
lib /def:python34stub.def /out:$(OutDir)python34stub.lib /MACHINE:$(MACHINE)
4+
$(OutDir)python35stub.lib: python35stub.def
5+
lib /def:python35stub.def /out:$(OutDir)python35stub.lib /MACHINE:$(MACHINE)
66

77
clean:
88
IF EXIST $(OutDir)python3.dll del $(OutDir)python3.dll
99
IF EXIST $(OutDir)python3.lib del $(OutDir)python3.lib
10-
IF EXIST $(OutDir)python34stub.lib del $(OutDir)python34stub.lib
10+
IF EXIST $(OutDir)python35stub.lib del $(OutDir)python35stub.lib
1111
IF EXIST $(OutDir)python3.exp del $(OutDir)python3.exp
12-
IF EXIST $(OutDir)python34stub.exp del $(OutDir)python34stub.exp
12+
IF EXIST $(OutDir)python35stub.exp del $(OutDir)python35stub.exp
1313

1414
rebuild: clean $(OutDir)python3.dll

PC/python34gen.py renamed to PC/python35gen.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Generate python34stub.def out of python3.def
1+
# Generate python35stub.def out of python3.def
22
# The regular import library cannot be used,
33
# since it doesn't provide the right symbols for
44
# data forwarding
5-
out = open("python34stub.def", "w")
6-
out.write('LIBRARY "python34"\n')
5+
out = open("python35stub.def", "w")
6+
out.write('LIBRARY "python35"\n')
77
out.write('EXPORTS\n')
88

99
inp = open("python3.def")
@@ -14,7 +14,7 @@
1414
assert line.strip()=='EXPORTS'
1515

1616
for line in inp:
17-
# SYM1=python34.SYM2[ DATA]
17+
# SYM1=python35.SYM2[ DATA]
1818
head, tail = line.split('.')
1919
if 'DATA' in tail:
2020
symbol, tail = tail.split(' ')

PC/python34stub.def renamed to PC/python35stub.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LIBRARY "python34"
1+
LIBRARY "python35"
22
EXPORTS
33
PyArg_Parse
44
PyArg_ParseTuple

‎PCbuild/build_ssl.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
if not defined HOST_PYTHON (
33
if %1 EQU Debug (
44
set HOST_PYTHON=python_d.exe
5-
if not exist python34_d.dll exit 1
5+
if not exist python35_d.dll exit 1
66
) ELSE (
77
set HOST_PYTHON=python.exe
8-
if not exist python34.dll exit 1
8+
if not exist python35.dll exit 1
99
)
1010
)
1111
%HOST_PYTHON% build_ssl.py %1 %2 %3

‎PCbuild/kill_python.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ main(int argc, char **argv)
6262
continue;
6363

6464
len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;
65-
wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
65+
wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
6666

6767
break;
6868

@@ -80,8 +80,8 @@ main(int argc, char **argv)
8080
* looking for python processes. When we find one, verify it lives
8181
* in the same directory we live in. If it does, kill it. If we're
8282
* unable to kill it, treat this as a fatal error and return 1.
83-
*
84-
* The rationale behind this is that we're called at the start of the
83+
*
84+
* The rationale behind this is that we're called at the start of the
8585
* build process on the basis that we'll take care of killing any
8686
* running instances, such that the build won't encounter permission
8787
* denied errors during linking. If we can't kill one of the processes,
@@ -104,11 +104,11 @@ main(int argc, char **argv)
104104
do {
105105

106106
/*
107-
* XXX TODO: if we really wanted to be fancy, we could check the
107+
* XXX TODO: if we really wanted to be fancy, we could check the
108108
* modules for all processes (not just the python[_d].exe ones)
109-
* and see if any of our DLLs are loaded (i.e. python34[_d].dll),
109+
* and see if any of our DLLs are loaded (i.e. python35[_d].dll),
110110
* as that would also inhibit our ability to rebuild the solution.
111-
* Not worth loosing sleep over though; for now, a simple check
111+
* Not worth loosing sleep over though; for now, a simple check
112112
* for just the python executable should be sufficient.
113113
*/
114114

@@ -119,7 +119,7 @@ main(int argc, char **argv)
119119
/* It's a python process, so figure out which directory it's in... */
120120
hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pe.th32ProcessID);
121121
if (hsm == INVALID_HANDLE_VALUE)
122-
/*
122+
/*
123123
* If our module snapshot fails (which will happen if we don't own
124124
* the process), just ignore it and continue. (It seems different
125125
* versions of Windows return different values for GetLastError()

0 commit comments

Comments
 (0)