summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-03-17 20:57:38 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-03-17 20:57:38 (GMT)
commit6373ba5199fe706f174aed482d77e2bb4b29e2f0 (patch)
treea0e0196e138f1197e1d7dc8e5e013307dbea4f50 /PCbuild
parent42867c73c9794f8f4968abef0572fd950748559c (diff)
downloadcpython-6373ba5199fe706f174aed482d77e2bb4b29e2f0.zip
cpython-6373ba5199fe706f174aed482d77e2bb4b29e2f0.tar.gz
cpython-6373ba5199fe706f174aed482d77e2bb4b29e2f0.tar.bz2
Bump Windows build to 3.5
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/build_ssl.bat4
-rw-r--r--PCbuild/kill_python.c14
-rw-r--r--PCbuild/pyproject.props4
-rw-r--r--PCbuild/readme.txt2
4 files changed, 12 insertions, 12 deletions
diff --git a/PCbuild/build_ssl.bat b/PCbuild/build_ssl.bat
index 805d77a..ee551c9 100644
--- a/PCbuild/build_ssl.bat
+++ b/PCbuild/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 python34_d.dll exit 1
+ if not exist python35_d.dll exit 1
) ELSE (
set HOST_PYTHON=python.exe
- if not exist python34.dll exit 1
+ if not exist python35.dll exit 1
)
)
%HOST_PYTHON% build_ssl.py %1 %2 %3
diff --git a/PCbuild/kill_python.c b/PCbuild/kill_python.c
index 604731f..dbc9425 100644
--- a/PCbuild/kill_python.c
+++ b/PCbuild/kill_python.c
@@ -62,7 +62,7 @@ main(int argc, char **argv)
continue;
len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;
- wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
+ wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
break;
@@ -80,8 +80,8 @@ main(int argc, char **argv)
* looking for python processes. When we find one, verify it lives
* in the same directory we live in. If it does, kill it. If we're
* unable to kill it, treat this as a fatal error and return 1.
- *
- * The rationale behind this is that we're called at the start of the
+ *
+ * The rationale behind this is that we're called at the start of the
* build process on the basis that we'll take care of killing any
* running instances, such that the build won't encounter permission
* denied errors during linking. If we can't kill one of the processes,
@@ -104,11 +104,11 @@ main(int argc, char **argv)
do {
/*
- * XXX TODO: if we really wanted to be fancy, we could check the
+ * 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. python34[_d].dll),
+ * and see if any of our DLLs are loaded (i.e. python35[_d].dll),
* as that would also inhibit our ability to rebuild the solution.
- * Not worth loosing sleep over though; for now, a simple check
+ * Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient.
*/
@@ -119,7 +119,7 @@ main(int argc, char **argv)
/* It's a python process, so figure out which directory it's in... */
hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pe.th32ProcessID);
if (hsm == INVALID_HANDLE_VALUE)
- /*
+ /*
* If our module snapshot fails (which will happen if we don't own
* the process), just ignore it and continue. (It seems different
* versions of Windows return different values for GetLastError()
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 5f40b15..f28370f 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -5,7 +5,7 @@
<OutDir>$(SolutionDir)</OutDir>
<IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='x64'">
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<_PropertySheetDisplayName>amd64</_PropertySheetDisplayName>
@@ -13,7 +13,7 @@
<IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Label="UserMacros">
- <PyDllName>python34$(PyDebugExt)</PyDllName>
+ <PyDllName>python35$(PyDebugExt)</PyDllName>
<PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
<KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe>
<externalsDir>..\..</externalsDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 619f6a8..203da0f 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -37,7 +37,7 @@ Debug
Used to build Python with extra debugging capabilities, equivalent
to using ./configure --with-pydebug on UNIX. All binaries built
using this configuration have "_d" added to their name:
- python34_d.dll, python_d.exe, parser_d.pyd, and so on. Both the
+ python35_d.dll, python_d.exe, parser_d.pyd, and so on. Both the
build and rt (run test) batch files in this directory accept a -d
option for debug builds. If you are building Python to help with
development of CPython, you will most likely use this configuration.