[Python-checkins] cpython: Issue 14813: Fix Visual Studio 2008 build after the move into the PC/VS9.0
stefan.krah
python-checkins at python.org
Thu May 17 00:23:41 CEST 2012
http://hg.python.org/cpython/rev/f6a207d86154
changeset: 77008:f6a207d86154
user: Stefan Krah <skrah at bytereef.org>
date: Thu May 17 00:21:57 2012 +0200
summary:
Issue 14813: Fix Visual Studio 2008 build after the move into the PC/VS9.0
directory.
files:
PC/VS9.0/_bz2.vcproj | 4 +-
PC/VS9.0/_ctypes.vcproj | 48 +-
PC/VS9.0/_ctypes_test.vcproj | 6 +-
PC/VS9.0/_decimal.vcproj | 84 +-
PC/VS9.0/_elementtree.vcproj | 56 +-
PC/VS9.0/_hashlib.vcproj | 4 +-
PC/VS9.0/_lzma.vcproj | 4 +-
PC/VS9.0/_msi.vcproj | 4 +-
PC/VS9.0/_multiprocessing.vcproj | 8 +-
PC/VS9.0/_socket.vcproj | 6 +-
PC/VS9.0/_sqlite3.vcproj | 38 +-
PC/VS9.0/_ssl.vcproj | 4 +-
PC/VS9.0/_testbuffer.vcproj | 2 +-
PC/VS9.0/_testcapi.vcproj | 4 +-
PC/VS9.0/_tkinter.vcproj | 6 +-
PC/VS9.0/bdist_wininst.vcproj | 44 +-
PC/VS9.0/kill_python.c | 178 +++++
PC/VS9.0/make_buildinfo.c | 195 +++++
PC/VS9.0/make_buildinfo.vcproj | 2 +-
PC/VS9.0/make_versioninfo.vcproj | 28 +-
PC/VS9.0/pcbuild.sln | 2 +-
PC/VS9.0/pyexpat.vcproj | 30 +-
PC/VS9.0/pyproject.vsprops | 6 +-
PC/VS9.0/python.vcproj | 12 +-
PC/VS9.0/python3dll.vcproj | 44 +-
PC/VS9.0/pythoncore.vcproj | 624 +++++++++---------
PC/VS9.0/pythonw.vcproj | 6 +-
PC/VS9.0/select.vcproj | 4 +-
PC/VS9.0/sqlite3.vcproj | 2 +-
PC/VS9.0/ssl.vcproj | 2 +-
PC/VS9.0/unicodedata.vcproj | 8 +-
PC/VS9.0/w9xpopen.vcproj | 4 +-
PC/VS9.0/winsound.vcproj | 4 +-
PC/VS9.0/xxlimited.vcproj | 4 +-
34 files changed, 925 insertions(+), 552 deletions(-)
diff --git a/PC/VS9.0/_bz2.vcproj b/PC/VS9.0/_bz2.vcproj
--- a/PC/VS9.0/_bz2.vcproj
+++ b/PC/VS9.0/_bz2.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_bz2"
ProjectGUID="{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
RootNamespace="bz2"
@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_bz2module.c"
+ RelativePath="..\..\Modules\_bz2module.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_ctypes.vcproj b/PC/VS9.0/_ctypes.vcproj
--- a/PC/VS9.0/_ctypes.vcproj
+++ b/PC/VS9.0/_ctypes.vcproj
@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -103,7 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -164,7 +164,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -228,7 +228,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -291,7 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -355,7 +355,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -419,7 +419,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -483,7 +483,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -531,27 +531,27 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\_ctypes\ctypes.h"
+ RelativePath="..\..\Modules\_ctypes\ctypes.h"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\ctypes_dlfcn.h"
+ RelativePath="..\..\Modules\_ctypes\ctypes_dlfcn.h"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.h"
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.h"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi_msvc\ffi_common.h"
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi_common.h"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi_msvc\fficonfig.h"
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\fficonfig.h"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi_msvc\ffitarget.h"
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffitarget.h"
>
</File>
</Filter>
@@ -559,39 +559,39 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_ctypes\_ctypes.c"
+ RelativePath="..\..\Modules\_ctypes\_ctypes.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\callbacks.c"
+ RelativePath="..\..\Modules\_ctypes\callbacks.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\callproc.c"
+ RelativePath="..\..\Modules\_ctypes\callproc.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\cfield.c"
+ RelativePath="..\..\Modules\_ctypes\cfield.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c"
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\malloc_closure.c"
+ RelativePath="..\..\Modules\_ctypes\malloc_closure.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi_msvc\prep_cif.c"
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\prep_cif.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\stgdict.c"
+ RelativePath="..\..\Modules\_ctypes\stgdict.c"
>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c"
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c"
>
<FileConfiguration
Name="Debug|x64"
@@ -627,7 +627,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm"
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm"
>
<FileConfiguration
Name="Debug|Win32"
diff --git a/PC/VS9.0/_ctypes_test.vcproj b/PC/VS9.0/_ctypes_test.vcproj
--- a/PC/VS9.0/_ctypes_test.vcproj
+++ b/PC/VS9.0/_ctypes_test.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_ctypes_test"
ProjectGUID="{9EC7190A-249F-4180-A900-548FDCF3055F}"
RootNamespace="_ctypes_test"
@@ -503,7 +503,7 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\_ctypes\_ctypes_test.h"
+ RelativePath="..\..\Modules\_ctypes\_ctypes_test.h"
>
</File>
</Filter>
@@ -511,7 +511,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_ctypes\_ctypes_test.c"
+ RelativePath="..\..\Modules\_ctypes\_ctypes_test.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_decimal.vcproj b/PC/VS9.0/_decimal.vcproj
--- a/PC/VS9.0/_decimal.vcproj
+++ b/PC/VS9.0/_decimal.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_decimal"
ProjectGUID="{0E9791DB-593A-465F-98BC-681011311617}"
RootNamespace="_decimal"
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
- AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+ AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -105,7 +105,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
- AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+ AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -167,7 +167,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
- AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+ AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -231,7 +231,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
- AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+ AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -294,7 +294,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
- AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+ AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -358,7 +358,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
- AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+ AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -422,7 +422,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
- AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+ AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -486,7 +486,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
- AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+ AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -533,71 +533,71 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\_decimal\libmpdec\basearith.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\basearith.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\bits.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\bits.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\constants.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\constants.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\convolute.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\convolute.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\crt.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\crt.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\difradix2.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\difradix2.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\docstrings.h"
+ RelativePath="..\..\Modules\_decimal\docstrings.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\fnt.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\fnt.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\fourstep.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\fourstep.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\mpdecimal.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\mpdecimal.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\numbertheory.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\numbertheory.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\sixstep.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\sixstep.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\transpose.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\transpose.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\typearith.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\typearith.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\umodarith.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\umodarith.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\vccompat.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\vccompat.h"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\vcstdint.h"
+ RelativePath="..\..\Modules\_decimal\libmpdec\vcstdint.h"
>
</File>
</Filter>
@@ -605,67 +605,67 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_decimal\_decimal.c"
+ RelativePath="..\..\Modules\_decimal\_decimal.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\basearith.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\basearith.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\constants.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\constants.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\context.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\context.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\convolute.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\convolute.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\crt.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\crt.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\difradix2.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\difradix2.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\fnt.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\fnt.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\fourstep.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\fourstep.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\io.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\io.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\memory.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\memory.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\mpdecimal.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\mpdecimal.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\numbertheory.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\numbertheory.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\sixstep.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\sixstep.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\transpose.c"
+ RelativePath="..\..\Modules\_decimal\libmpdec\transpose.c"
>
</File>
<File
- RelativePath="..\Modules\_decimal\libmpdec\vcdiv64.asm"
+ RelativePath="..\..\Modules\_decimal\libmpdec\vcdiv64.asm"
>
<FileConfiguration
Name="Debug|Win32"
diff --git a/PC/VS9.0/_elementtree.vcproj b/PC/VS9.0/_elementtree.vcproj
--- a/PC/VS9.0/_elementtree.vcproj
+++ b/PC/VS9.0/_elementtree.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_elementtree"
ProjectGUID="{17E1E049-C309-4D79-843F-AE483C264AEA}"
RootNamespace="_elementtree"
@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\expat"
+ AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\expat"
+ AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -166,7 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\expat"
+ AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -229,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\expat"
+ AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -291,7 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\expat"
+ AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -354,7 +354,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\expat"
+ AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -417,7 +417,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\expat"
+ AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -480,7 +480,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Modules\expat"
+ AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -527,63 +527,63 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\expat\ascii.h"
+ RelativePath="..\..\Modules\expat\ascii.h"
>
</File>
<File
- RelativePath="..\Modules\expat\asciitab.h"
+ RelativePath="..\..\Modules\expat\asciitab.h"
>
</File>
<File
- RelativePath="..\Modules\expat\expat.h"
+ RelativePath="..\..\Modules\expat\expat.h"
>
</File>
<File
- RelativePath="..\Modules\expat\expat_config.h"
+ RelativePath="..\..\Modules\expat\expat_config.h"
>
</File>
<File
- RelativePath="..\Modules\expat\expat_external.h"
+ RelativePath="..\..\Modules\expat\expat_external.h"
>
</File>
<File
- RelativePath="..\Modules\expat\iasciitab.h"
+ RelativePath="..\..\Modules\expat\iasciitab.h"
>
</File>
<File
- RelativePath="..\Modules\expat\internal.h"
+ RelativePath="..\..\Modules\expat\internal.h"
>
</File>
<File
- RelativePath="..\Modules\expat\latin1tab.h"
+ RelativePath="..\..\Modules\expat\latin1tab.h"
>
</File>
<File
- RelativePath="..\Modules\expat\macconfig.h"
+ RelativePath="..\..\Modules\expat\macconfig.h"
>
</File>
<File
- RelativePath="..\Modules\expat\nametab.h"
+ RelativePath="..\..\Modules\expat\nametab.h"
>
</File>
<File
- RelativePath="..\Modules\expat\pyexpatns.h"
+ RelativePath="..\..\Modules\expat\pyexpatns.h"
>
</File>
<File
- RelativePath="..\Modules\expat\utf8tab.h"
+ RelativePath="..\..\Modules\expat\utf8tab.h"
>
</File>
<File
- RelativePath="..\Modules\expat\winconfig.h"
+ RelativePath="..\..\Modules\expat\winconfig.h"
>
</File>
<File
- RelativePath="..\Modules\expat\xmlrole.h"
+ RelativePath="..\..\Modules\expat\xmlrole.h"
>
</File>
<File
- RelativePath="..\Modules\expat\xmltok.h"
+ RelativePath="..\..\Modules\expat\xmltok.h"
>
</File>
</Filter>
@@ -591,19 +591,19 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_elementtree.c"
+ RelativePath="..\..\Modules\_elementtree.c"
>
</File>
<File
- RelativePath="..\Modules\expat\xmlparse.c"
+ RelativePath="..\..\Modules\expat\xmlparse.c"
>
</File>
<File
- RelativePath="..\Modules\expat\xmlrole.c"
+ RelativePath="..\..\Modules\expat\xmlrole.c"
>
</File>
<File
- RelativePath="..\Modules\expat\xmltok.c"
+ RelativePath="..\..\Modules\expat\xmltok.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_hashlib.vcproj b/PC/VS9.0/_hashlib.vcproj
--- a/PC/VS9.0/_hashlib.vcproj
+++ b/PC/VS9.0/_hashlib.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_hashlib"
ProjectGUID="{447F05A8-F581-4CAC-A466-5AC7936E207E}"
RootNamespace="_hashlib"
@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_hashopenssl.c"
+ RelativePath="..\..\Modules\_hashopenssl.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_lzma.vcproj b/PC/VS9.0/_lzma.vcproj
--- a/PC/VS9.0/_lzma.vcproj
+++ b/PC/VS9.0/_lzma.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_lzma"
ProjectGUID="{F9D71780-F393-11E0-BE50-0800200C9A66}"
RootNamespace="lzma"
@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_lzmamodule.c"
+ RelativePath="..\..\Modules\_lzmamodule.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_msi.vcproj b/PC/VS9.0/_msi.vcproj
--- a/PC/VS9.0/_msi.vcproj
+++ b/PC/VS9.0/_msi.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_msi"
ProjectGUID="{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"
RootNamespace="_msi"
@@ -519,7 +519,7 @@
Name="Source Files"
>
<File
- RelativePath="..\PC\_msi.c"
+ RelativePath="..\..\PC\_msi.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_multiprocessing.vcproj b/PC/VS9.0/_multiprocessing.vcproj
--- a/PC/VS9.0/_multiprocessing.vcproj
+++ b/PC/VS9.0/_multiprocessing.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_multiprocessing"
ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}"
RootNamespace="_multiprocessing"
@@ -519,7 +519,7 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\_multiprocessing\multiprocessing.h"
+ RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h"
>
</File>
</Filter>
@@ -527,11 +527,11 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_multiprocessing\multiprocessing.c"
+ RelativePath="..\..\Modules\_multiprocessing\multiprocessing.c"
>
</File>
<File
- RelativePath="..\Modules\_multiprocessing\semaphore.c"
+ RelativePath="..\..\Modules\_multiprocessing\semaphore.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_socket.vcproj b/PC/VS9.0/_socket.vcproj
--- a/PC/VS9.0/_socket.vcproj
+++ b/PC/VS9.0/_socket.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_socket"
ProjectGUID="{86937F53-C189-40EF-8CE8-8759D8E7D480}"
RootNamespace="_socket"
@@ -519,7 +519,7 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\socketmodule.h"
+ RelativePath="..\..\Modules\socketmodule.h"
>
</File>
</Filter>
@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\socketmodule.c"
+ RelativePath="..\..\Modules\socketmodule.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_sqlite3.vcproj b/PC/VS9.0/_sqlite3.vcproj
--- a/PC/VS9.0/_sqlite3.vcproj
+++ b/PC/VS9.0/_sqlite3.vcproj
@@ -527,43 +527,43 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\_sqlite\cache.h"
+ RelativePath="..\..\Modules\_sqlite\cache.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\connection.h"
+ RelativePath="..\..\Modules\_sqlite\connection.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\cursor.h"
+ RelativePath="..\..\Modules\_sqlite\cursor.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\microprotocols.h"
+ RelativePath="..\..\Modules\_sqlite\microprotocols.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\module.h"
+ RelativePath="..\..\Modules\_sqlite\module.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\prepare_protocol.h"
+ RelativePath="..\..\Modules\_sqlite\prepare_protocol.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\row.h"
+ RelativePath="..\..\Modules\_sqlite\row.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\sqlitecompat.h"
+ RelativePath="..\..\Modules\_sqlite\sqlitecompat.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\statement.h"
+ RelativePath="..\..\Modules\_sqlite\statement.h"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\util.h"
+ RelativePath="..\..\Modules\_sqlite\util.h"
>
</File>
</Filter>
@@ -571,39 +571,39 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_sqlite\cache.c"
+ RelativePath="..\..\Modules\_sqlite\cache.c"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\connection.c"
+ RelativePath="..\..\Modules\_sqlite\connection.c"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\cursor.c"
+ RelativePath="..\..\Modules\_sqlite\cursor.c"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\microprotocols.c"
+ RelativePath="..\..\Modules\_sqlite\microprotocols.c"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\module.c"
+ RelativePath="..\..\Modules\_sqlite\module.c"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\prepare_protocol.c"
+ RelativePath="..\..\Modules\_sqlite\prepare_protocol.c"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\row.c"
+ RelativePath="..\..\Modules\_sqlite\row.c"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\statement.c"
+ RelativePath="..\..\Modules\_sqlite\statement.c"
>
</File>
<File
- RelativePath="..\Modules\_sqlite\util.c"
+ RelativePath="..\..\Modules\_sqlite\util.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_ssl.vcproj b/PC/VS9.0/_ssl.vcproj
--- a/PC/VS9.0/_ssl.vcproj
+++ b/PC/VS9.0/_ssl.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_ssl"
ProjectGUID="{C6E20F84-3247-4AD6-B051-B073268F73BA}"
RootNamespace="_ssl"
@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_ssl.c"
+ RelativePath="..\..\Modules\_ssl.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_testbuffer.vcproj b/PC/VS9.0/_testbuffer.vcproj
--- a/PC/VS9.0/_testbuffer.vcproj
+++ b/PC/VS9.0/_testbuffer.vcproj
@@ -511,7 +511,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_testbuffer.c"
+ RelativePath="..\..\Modules\_testbuffer.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_testcapi.vcproj b/PC/VS9.0/_testcapi.vcproj
--- a/PC/VS9.0/_testcapi.vcproj
+++ b/PC/VS9.0/_testcapi.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_testcapi"
ProjectGUID="{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
RootNamespace="_testcapi"
@@ -511,7 +511,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_testcapimodule.c"
+ RelativePath="..\..\Modules\_testcapimodule.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/_tkinter.vcproj b/PC/VS9.0/_tkinter.vcproj
--- a/PC/VS9.0/_tkinter.vcproj
+++ b/PC/VS9.0/_tkinter.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="_tkinter"
ProjectGUID="{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
RootNamespace="_tkinter"
@@ -527,11 +527,11 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_tkinter.c"
+ RelativePath="..\..\Modules\_tkinter.c"
>
</File>
<File
- RelativePath="..\Modules\tkappinit.c"
+ RelativePath="..\..\Modules\tkappinit.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/bdist_wininst.vcproj b/PC/VS9.0/bdist_wininst.vcproj
--- a/PC/VS9.0/bdist_wininst.vcproj
+++ b/PC/VS9.0/bdist_wininst.vcproj
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\lib\distutils\command"
+ OutputDirectory="..\..\lib\distutils\command"
ConfigurationType="1"
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"
UseOfMFC="0"
@@ -45,14 +45,14 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\..\lib\distutils\command\wininst.tlb"
+ TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\PC\bdist_wininst;..\Include;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
@@ -67,7 +67,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="0"
- AdditionalIncludeDirectories="..\PC;..\PC\bdist_wininst;..\Include"
+ AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -75,11 +75,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib imagehlp.lib"
- OutputFile="..\lib\distutils\command\wininst-9.0.exe"
+ OutputFile="..\..\lib\distutils\command\wininst-9.0.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
+ ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -135,14 +135,14 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
- TypeLibraryName=".\..\lib\distutils\command\wininst.tlb"
+ TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\PC\bdist_wininst;..\Include;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
@@ -157,7 +157,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="0"
- AdditionalIncludeDirectories="..\PC;..\PC\bdist_wininst;..\Include"
+ AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -165,11 +165,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib imagehlp.lib"
- OutputFile="..\lib\distutils\command\wininst-9.0-amd64.exe"
+ OutputFile="..\..\lib\distutils\command\wininst-9.0-amd64.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0-amd64.pdb"
+ ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0-amd64.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -206,38 +206,38 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath="..\PC\bdist_wininst\extract.c"
+ RelativePath="..\..\PC\bdist_wininst\extract.c"
>
</File>
<File
- RelativePath="..\PC\bdist_wininst\install.c"
+ RelativePath="..\..\PC\bdist_wininst\install.c"
>
</File>
<Filter
Name="zlib"
>
<File
- RelativePath="..\Modules\zlib\adler32.c"
+ RelativePath="..\..\Modules\zlib\adler32.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\crc32.c"
+ RelativePath="..\..\Modules\zlib\crc32.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\inffast.c"
+ RelativePath="..\..\Modules\zlib\inffast.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\inflate.c"
+ RelativePath="..\..\Modules\zlib\inflate.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\inftrees.c"
+ RelativePath="..\..\Modules\zlib\inftrees.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\zutil.c"
+ RelativePath="..\..\Modules\zlib\zutil.c"
>
</File>
</Filter>
@@ -247,7 +247,7 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
- RelativePath="..\PC\bdist_wininst\archive.h"
+ RelativePath="..\..\PC\bdist_wininst\archive.h"
>
</File>
</Filter>
@@ -256,11 +256,11 @@
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File
- RelativePath="..\PC\bdist_wininst\install.rc"
+ RelativePath="..\..\PC\bdist_wininst\install.rc"
>
</File>
<File
- RelativePath="..\PC\bdist_wininst\PythonPowered.bmp"
+ RelativePath="..\..\PC\bdist_wininst\PythonPowered.bmp"
>
</File>
</Filter>
diff --git a/PC/VS9.0/kill_python.c b/PC/VS9.0/kill_python.c
new file mode 100644
--- /dev/null
+++ b/PC/VS9.0/kill_python.c
@@ -0,0 +1,178 @@
+/*
+ * Helper program for killing lingering python[_d].exe processes before
+ * building, thus attempting to avoid build failures due to files being
+ * locked.
+ */
+
+#include <windows.h>
+#include <wchar.h>
+#include <tlhelp32.h>
+#include <stdio.h>
+
+#pragma comment(lib, "psapi")
+
+#ifdef _DEBUG
+#define PYTHON_EXE (L"python_d.exe")
+#define PYTHON_EXE_LEN (12)
+#define KILL_PYTHON_EXE (L"kill_python_d.exe")
+#define KILL_PYTHON_EXE_LEN (17)
+#else
+#define PYTHON_EXE (L"python.exe")
+#define PYTHON_EXE_LEN (10)
+#define KILL_PYTHON_EXE (L"kill_python.exe")
+#define KILL_PYTHON_EXE_LEN (15)
+#endif
+
+int
+main(int argc, char **argv)
+{
+ HANDLE hp, hsp, hsm; /* process, snapshot processes, snapshot modules */
+ DWORD dac, our_pid;
+ size_t len;
+ wchar_t path[MAX_PATH+1];
+
+ MODULEENTRY32W me;
+ PROCESSENTRY32W pe;
+
+ me.dwSize = sizeof(MODULEENTRY32W);
+ pe.dwSize = sizeof(PROCESSENTRY32W);
+
+ memset(path, 0, MAX_PATH+1);
+
+ our_pid = GetCurrentProcessId();
+
+ hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, our_pid);
+ if (hsm == INVALID_HANDLE_VALUE) {
+ printf("CreateToolhelp32Snapshot[1] failed: %d\n", GetLastError());
+ return 1;
+ }
+
+ if (!Module32FirstW(hsm, &me)) {
+ printf("Module32FirstW[1] failed: %d\n", GetLastError());
+ CloseHandle(hsm);
+ return 1;
+ }
+
+ /*
+ * Enumerate over the modules for the current process in order to find
+ * kill_process[_d].exe, then take a note of the directory it lives in.
+ */
+ do {
+ if (_wcsnicmp(me.szModule, KILL_PYTHON_EXE, KILL_PYTHON_EXE_LEN))
+ continue;
+
+ len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;
+ wcsncpy_s(path, MAX_PATH+1, me.szExePath, len);
+
+ break;
+
+ } while (Module32NextW(hsm, &me));
+
+ CloseHandle(hsm);
+
+ if (path == NULL) {
+ printf("failed to discern directory of running process\n");
+ return 1;
+ }
+
+ /*
+ * Take a snapshot of system processes. Enumerate over the snapshot,
+ * 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
+ * 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,
+ * we can't provide this assurance, and the build shouldn't start.
+ */
+
+ hsp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+ if (hsp == INVALID_HANDLE_VALUE) {
+ printf("CreateToolhelp32Snapshot[2] failed: %d\n", GetLastError());
+ return 1;
+ }
+
+ if (!Process32FirstW(hsp, &pe)) {
+ printf("Process32FirstW failed: %d\n", GetLastError());
+ CloseHandle(hsp);
+ return 1;
+ }
+
+ dac = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE;
+ do {
+
+ /*
+ * 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. 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.
+ */
+
+ if (_wcsnicmp(pe.szExeFile, PYTHON_EXE, PYTHON_EXE_LEN))
+ /* This isn't a python process. */
+ continue;
+
+ /* 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()
+ * in this situation; it's easier to just ignore it and move on vs.
+ * stopping the build for what could be a false positive.)
+ */
+ continue;
+
+ if (!Module32FirstW(hsm, &me)) {
+ printf("Module32FirstW[2] failed: %d\n", GetLastError());
+ CloseHandle(hsp);
+ CloseHandle(hsm);
+ return 1;
+ }
+
+ do {
+ if (_wcsnicmp(me.szModule, PYTHON_EXE, PYTHON_EXE_LEN))
+ /* Wrong module, we're looking for python[_d].exe... */
+ continue;
+
+ if (_wcsnicmp(path, me.szExePath, len))
+ /* Process doesn't live in our directory. */
+ break;
+
+ /* Python process residing in the right directory, kill it! */
+ hp = OpenProcess(dac, FALSE, pe.th32ProcessID);
+ if (!hp) {
+ printf("OpenProcess failed: %d\n", GetLastError());
+ CloseHandle(hsp);
+ CloseHandle(hsm);
+ return 1;
+ }
+
+ if (!TerminateProcess(hp, 1)) {
+ printf("TerminateProcess failed: %d\n", GetLastError());
+ CloseHandle(hsp);
+ CloseHandle(hsm);
+ CloseHandle(hp);
+ return 1;
+ }
+
+ CloseHandle(hp);
+ break;
+
+ } while (Module32NextW(hsm, &me));
+
+ CloseHandle(hsm);
+
+ } while (Process32NextW(hsp, &pe));
+
+ CloseHandle(hsp);
+
+ return 0;
+}
+
+/* vi: set ts=8 sw=4 sts=4 expandtab */
diff --git a/PC/VS9.0/make_buildinfo.c b/PC/VS9.0/make_buildinfo.c
new file mode 100644
--- /dev/null
+++ b/PC/VS9.0/make_buildinfo.c
@@ -0,0 +1,195 @@
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <io.h>
+
+#define CMD_SIZE 500
+
+/* This file creates the getbuildinfo.o object, by first
+ invoking subwcrev.exe (if found), and then invoking cl.exe.
+ As a side effect, it might generate PCBuild\getbuildinfo2.c
+ also. If this isn't a subversion checkout, or subwcrev isn't
+ found, it compiles ..\\..\\Modules\\getbuildinfo.c instead.
+
+ Currently, subwcrev.exe is found from the registry entries
+ of TortoiseSVN.
+
+ No attempt is made to place getbuildinfo.o into the proper
+ binary directory. This isn't necessary, as this tool is
+ invoked as a pre-link step for pythoncore, so that overwrites
+ any previous getbuildinfo.o.
+
+ However, if a second argument is provided, this will be used
+ as a temporary directory where any getbuildinfo2.c and
+ getbuildinfo.o files are put. This is useful if multiple
+ configurations are being built in parallel, to avoid them
+ trampling each other's files.
+
+*/
+
+int make_buildinfo2(const char *tmppath)
+{
+ struct _stat st;
+ HKEY hTortoise;
+ char command[CMD_SIZE+1];
+ DWORD type, size;
+ if (_stat(".svn", &st) < 0)
+ return 0;
+ /* Allow suppression of subwcrev.exe invocation if a no_subwcrev file is present. */
+ if (_stat("no_subwcrev", &st) == 0)
+ return 0;
+ if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS &&
+ RegOpenKey(HKEY_CURRENT_USER, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS)
+ /* Tortoise not installed */
+ return 0;
+ command[0] = '"'; /* quote the path to the executable */
+ size = sizeof(command) - 1;
+ if (RegQueryValueEx(hTortoise, "Directory", 0, &type, command+1, &size) != ERROR_SUCCESS ||
+ type != REG_SZ)
+ /* Registry corrupted */
+ return 0;
+ strcat_s(command, CMD_SIZE, "bin\\subwcrev.exe");
+ if (_stat(command+1, &st) < 0)
+ /* subwcrev.exe not part of the release */
+ return 0;
+ strcat_s(command, CMD_SIZE, "\" ..\\.. ..\\..\\Modules\\getbuildinfo.c \"");
+ strcat_s(command, CMD_SIZE, tmppath); /* quoted tmppath */
+ strcat_s(command, CMD_SIZE, "getbuildinfo2.c\"");
+
+ puts(command); fflush(stdout);
+ if (system(command) < 0)
+ return 0;
+ return 1;
+}
+
+const char DELIMS[] = { " \n" };
+
+int get_mercurial_info(char * hgbranch, char * hgtag, char * hgrev, int size)
+{
+ int result = 0;
+ char filename[CMD_SIZE];
+ char cmdline[CMD_SIZE];
+
+ strcpy_s(filename, CMD_SIZE, "tmpXXXXXX");
+ if (_mktemp_s(filename, CMD_SIZE) == 0) {
+ int rc;
+
+ strcpy_s(cmdline, CMD_SIZE, "hg id -bit > ");
+ strcat_s(cmdline, CMD_SIZE, filename);
+ rc = system(cmdline);
+ if (rc == 0) {
+ FILE * fp;
+
+ if (fopen_s(&fp, filename, "r") == 0) {
+ char * cp = fgets(cmdline, CMD_SIZE, fp);
+
+ if (cp) {
+ char * context = NULL;
+ char * tp = strtok_s(cp, DELIMS, &context);
+ if (tp) {
+ strcpy_s(hgrev, size, tp);
+ tp = strtok_s(NULL, DELIMS, &context);
+ if (tp) {
+ strcpy_s(hgbranch, size, tp);
+ tp = strtok_s(NULL, DELIMS, &context);
+ if (tp) {
+ strcpy_s(hgtag, size, tp);
+ result = 1;
+ }
+ }
+ }
+ }
+ fclose(fp);
+ }
+ }
+ _unlink(filename);
+ }
+ return result;
+}
+
+int main(int argc, char*argv[])
+{
+ char command[CMD_SIZE] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL ";
+ char tmppath[CMD_SIZE] = "";
+ int do_unlink, result;
+ char *tmpdir = NULL;
+ if (argc <= 2 || argc > 3) {
+ fprintf(stderr, "make_buildinfo $(ConfigurationName) [tmpdir]\n");
+ return EXIT_FAILURE;
+ }
+ if (strcmp(argv[1], "Release") == 0) {
+ strcat_s(command, CMD_SIZE, "-MD ");
+ }
+ else if (strcmp(argv[1], "Debug") == 0) {
+ strcat_s(command, CMD_SIZE, "-D_DEBUG -MDd ");
+ }
+ else if (strcmp(argv[1], "ReleaseItanium") == 0) {
+ strcat_s(command, CMD_SIZE, "-MD /USECL:MS_ITANIUM ");
+ }
+ else if (strcmp(argv[1], "ReleaseAMD64") == 0) {
+ strcat_s(command, CMD_SIZE, "-MD ");
+ strcat_s(command, CMD_SIZE, "-MD /USECL:MS_OPTERON ");
+ }
+ else {
+ fprintf(stderr, "unsupported configuration %s\n", argv[1]);
+ return EXIT_FAILURE;
+ }
+ if (argc > 2) {
+ tmpdir = argv[2];
+ strcat_s(tmppath, _countof(tmppath), tmpdir);
+ /* Hack fix for bad command line: If the command is issued like this:
+ * $(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)"
+ * we will get a trailing quote because IntDir ends with a backslash that then
+ * escapes the final ". To simplify the life for developers, catch that problem
+ * here by cutting it off.
+ * The proper command line, btw is:
+ * $(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)\"
+ * Hooray for command line parsing on windows.
+ */
+ if (strlen(tmppath) > 0 && tmppath[strlen(tmppath)-1] == '"')
+ tmppath[strlen(tmppath)-1] = '\0';
+ strcat_s(tmppath, _countof(tmppath), "\\");
+ }
+
+ if ((do_unlink = make_buildinfo2(tmppath))) {
+ strcat_s(command, CMD_SIZE, "\"");
+ strcat_s(command, CMD_SIZE, tmppath);
+ strcat_s(command, CMD_SIZE, "getbuildinfo2.c\" -DSUBWCREV ");
+ }
+ else {
+ char hgtag[CMD_SIZE];
+ char hgbranch[CMD_SIZE];
+ char hgrev[CMD_SIZE];
+
+ if (get_mercurial_info(hgbranch, hgtag, hgrev, CMD_SIZE)) {
+ strcat_s(command, CMD_SIZE, "-DHGBRANCH=\\\"");
+ strcat_s(command, CMD_SIZE, hgbranch);
+ strcat_s(command, CMD_SIZE, "\\\"");
+
+ strcat_s(command, CMD_SIZE, " -DHGTAG=\\\"");
+ strcat_s(command, CMD_SIZE, hgtag);
+ strcat_s(command, CMD_SIZE, "\\\"");
+
+ strcat_s(command, CMD_SIZE, " -DHGVERSION=\\\"");
+ strcat_s(command, CMD_SIZE, hgrev);
+ strcat_s(command, CMD_SIZE, "\\\" ");
+ }
+ strcat_s(command, CMD_SIZE, "..\\..\\Modules\\getbuildinfo.c");
+ }
+ strcat_s(command, CMD_SIZE, " -Fo\"");
+ strcat_s(command, CMD_SIZE, tmppath);
+ strcat_s(command, CMD_SIZE, "getbuildinfo.o\" -I..\\..\\Include -I..\\..\\PC");
+ puts(command); fflush(stdout);
+ result = system(command);
+ if (do_unlink) {
+ command[0] = '\0';
+ strcat_s(command, CMD_SIZE, "\"");
+ strcat_s(command, CMD_SIZE, tmppath);
+ strcat_s(command, CMD_SIZE, "getbuildinfo2.c\"");
+ _unlink(command);
+ }
+ if (result < 0)
+ return EXIT_FAILURE;
+ return 0;
+}
diff --git a/PC/VS9.0/make_buildinfo.vcproj b/PC/VS9.0/make_buildinfo.vcproj
--- a/PC/VS9.0/make_buildinfo.vcproj
+++ b/PC/VS9.0/make_buildinfo.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1250"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="make_buildinfo"
ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
RootNamespace="make_buildinfo"
diff --git a/PC/VS9.0/make_versioninfo.vcproj b/PC/VS9.0/make_versioninfo.vcproj
--- a/PC/VS9.0/make_versioninfo.vcproj
+++ b/PC/VS9.0/make_versioninfo.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="make_versioninfo"
ProjectGUID="{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"
RootNamespace="make_versioninfo"
@@ -32,8 +32,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Build PC/pythonnt_rc(_d).h"
- CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\PC\pythonnt_rc.h
"
- Outputs="$(SolutionDir)..\PC\pythonnt_rc.h"
+ CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\..\PC\pythonnt_rc.h
"
+ Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -92,7 +92,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\PC\python_nt.h
"
+ CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\..\PC\python_nt.h
"
/>
</Configuration>
<Configuration
@@ -106,8 +106,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Build PC/pythonnt_rc(_d).h"
- CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\PC\pythonnt_rc.h
"
- Outputs="$(SolutionDir)..\PC\pythonnt_rc.h"
+ CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\..\PC\pythonnt_rc.h
"
+ Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -158,7 +158,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\PC\python_nt.h
"
+ CommandLine="cd $(SolutionDir)
make_versioninfo.exe > ..\..\PC\python_nt.h
"
/>
</Configuration>
<Configuration
@@ -175,8 +175,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Build PC/pythonnt_rc(_d).h"
- CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h
"
- Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
+ CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\..\PC\pythonnt_rc_d.h
"
+ Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -235,7 +235,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\PC\python_nt_d.h
"
+ CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\..\PC\python_nt_d.h
"
/>
</Configuration>
<Configuration
@@ -249,8 +249,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Build PC/pythonnt_rc(_d).h"
- CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h
"
- Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
+ CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\..\PC\pythonnt_rc_d.h
"
+ Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -303,7 +303,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\PC\python_nt_d.h
"
+ CommandLine="cd $(SolutionDir)
make_versioninfo_d.exe > ..\..\PC\python_nt_d.h
"
/>
</Configuration>
</Configurations>
@@ -314,7 +314,7 @@
Name="Source Files"
>
<File
- RelativePath="..\PC\make_versioninfo.c"
+ RelativePath="..\..\PC\make_versioninfo.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/pcbuild.sln b/PC/VS9.0/pcbuild.sln
--- a/PC/VS9.0/pcbuild.sln
+++ b/PC/VS9.0/pcbuild.sln
@@ -29,7 +29,7 @@
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
ProjectSection(SolutionItems) = preProject
- ..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c
+ ..\..\Modules\getbuildinfo.c = ..\..\Modules\getbuildinfo.c
readme.txt = readme.txt
EndProjectSection
EndProject
diff --git a/PC/VS9.0/pyexpat.vcproj b/PC/VS9.0/pyexpat.vcproj
--- a/PC/VS9.0/pyexpat.vcproj
+++ b/PC/VS9.0/pyexpat.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="pyexpat"
ProjectGUID="{D06B6426-4762-44CC-8BAD-D79052507F2F}"
RootNamespace="pyexpat"
@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\..\Modules\expat"
+ AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -103,7 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\..\Modules\expat"
+ AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -164,7 +164,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\..\Modules\expat"
+ AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -226,7 +226,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\..\Modules\expat"
+ AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -287,7 +287,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\..\Modules\expat"
+ AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -349,7 +349,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\..\Modules\expat"
+ AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -411,7 +411,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\..\Modules\expat"
+ AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -473,7 +473,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\..\Modules\expat"
+ AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
@@ -519,11 +519,11 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\expat\xmlrole.h"
+ RelativePath="..\..\Modules\expat\xmlrole.h"
>
</File>
<File
- RelativePath="..\Modules\expat\xmltok.h"
+ RelativePath="..\..\Modules\expat\xmltok.h"
>
</File>
</Filter>
@@ -531,19 +531,19 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\pyexpat.c"
+ RelativePath="..\..\Modules\pyexpat.c"
>
</File>
<File
- RelativePath="..\Modules\expat\xmlparse.c"
+ RelativePath="..\..\Modules\expat\xmlparse.c"
>
</File>
<File
- RelativePath="..\Modules\expat\xmlrole.c"
+ RelativePath="..\..\Modules\expat\xmlrole.c"
>
</File>
<File
- RelativePath="..\Modules\expat\xmltok.c"
+ RelativePath="..\..\Modules\expat\xmltok.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -11,7 +11,7 @@
Optimization="2"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\Include; ..\PC"
+ AdditionalIncludeDirectories="..\..\Include; ..\..\PC"
PreprocessorDefinitions="_WIN32"
StringPooling="true"
ExceptionHandling="0"
@@ -34,7 +34,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="..\PC;..\Include"
+ AdditionalIncludeDirectories="..\..\PC;..\..\Include"
/>
<UserMacro
Name="PyDllName"
@@ -46,7 +46,7 @@
/>
<UserMacro
Name="externalsDir"
- Value="..\.."
+ Value="..\..\.."
/>
<UserMacro
Name="sqlite3Dir"
diff --git a/PC/VS9.0/python.vcproj b/PC/VS9.0/python.vcproj
--- a/PC/VS9.0/python.vcproj
+++ b/PC/VS9.0/python.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="python"
ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
TargetFrameworkVersion="131072"
@@ -202,7 +202,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -277,7 +277,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -615,11 +615,11 @@
Name="Resource Files"
>
<File
- RelativePath="..\PC\pycon.ico"
+ RelativePath="..\..\PC\pycon.ico"
>
</File>
<File
- RelativePath="..\PC\python_exe.rc"
+ RelativePath="..\..\PC\python_exe.rc"
>
</File>
</Filter>
@@ -627,7 +627,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\python.c"
+ RelativePath="..\..\Modules\python.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/python3dll.vcproj b/PC/VS9.0/python3dll.vcproj
--- a/PC/VS9.0/python3dll.vcproj
+++ b/PC/VS9.0/python3dll.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="python3dll"
ProjectGUID="{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
RootNamespace="python3dll"
@@ -27,9 +27,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
- ReBuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
- CleanCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
+ BuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
+ ReBuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
+ CleanCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
Output="$(OutDir)\python3.dll"
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -46,9 +46,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
- ReBuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
- CleanCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
+ BuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
+ ReBuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
+ CleanCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
Output="$(OutDir)\python3.dll"
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -65,9 +65,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
- ReBuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
- CleanCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
+ BuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
+ ReBuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
+ CleanCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
Output="$(OutDir)\python3.dll"
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -84,9 +84,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
- ReBuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
- CleanCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
+ BuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
+ ReBuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
+ CleanCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
Output="$(OutDir)\python3.dll"
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -103,9 +103,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
- ReBuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
- CleanCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
+ BuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
+ ReBuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
+ CleanCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
Output="$(OutDir)\python3.dll"
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -122,9 +122,9 @@
>
<Tool
Name="VCNMakeTool"
- BuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
- ReBuildCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
- CleanCommandLine="cd $(InputDir)\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
+ BuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
+ ReBuildCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
+ CleanCommandLine="cd $(InputDir)\..\..\PC
nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
Output="$(OutDir)\python3.dll"
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -144,7 +144,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\PC\python3.def"
+ RelativePath="..\..\PC\python3.def"
>
<FileConfiguration
Name="Release|Win32"
@@ -172,7 +172,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\PC\python3dll.c"
+ RelativePath="..\..\PC\python3dll.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -212,7 +212,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\PC\python_nt.rc"
+ RelativePath="..\..\PC\python_nt.rc"
>
<FileConfiguration
Name="Release|Win32"
diff --git a/PC/VS9.0/pythoncore.vcproj b/PC/VS9.0/pythoncore.vcproj
--- a/PC/VS9.0/pythoncore.vcproj
+++ b/PC/VS9.0/pythoncore.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="pythoncore"
ProjectGUID="{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
RootNamespace="pythoncore"
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/Zm200 "
- AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"
PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
RuntimeLibrary="2"
/>
@@ -54,7 +54,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -118,7 +118,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/Zm200 "
- AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"
PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
RuntimeLibrary="2"
/>
@@ -129,7 +129,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -196,7 +196,7 @@
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"
PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
RuntimeLibrary="3"
/>
@@ -207,7 +207,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -274,7 +274,7 @@
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"
PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
RuntimeLibrary="3"
/>
@@ -285,7 +285,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -348,7 +348,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/Zm200 "
- AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"
PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
RuntimeLibrary="2"
/>
@@ -359,7 +359,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -423,7 +423,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/Zm200 "
- AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"
PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
RuntimeLibrary="2"
/>
@@ -434,7 +434,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -498,7 +498,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/Zm200 "
- AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"
PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
RuntimeLibrary="2"
/>
@@ -509,7 +509,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -573,7 +573,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/Zm200 "
- AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
+ AdditionalIncludeDirectories="..\..\Python;..\..\Modules\zlib"
PreprocessorDefinitions="_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32"
RuntimeLibrary="2"
/>
@@ -584,7 +584,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -631,359 +631,359 @@
Name="Include"
>
<File
- RelativePath="..\Include\abstract.h"
+ RelativePath="..\..\Include\abstract.h"
>
</File>
<File
- RelativePath="..\Include\accu.h"
+ RelativePath="..\..\Include\accu.h"
>
</File>
<File
- RelativePath="..\Include\asdl.h"
+ RelativePath="..\..\Include\asdl.h"
>
</File>
<File
- RelativePath="..\Include\ast.h"
+ RelativePath="..\..\Include\ast.h"
>
</File>
<File
- RelativePath="..\Include\bitset.h"
+ RelativePath="..\..\Include\bitset.h"
>
</File>
<File
- RelativePath="..\Include\boolobject.h"
+ RelativePath="..\..\Include\boolobject.h"
>
</File>
<File
- RelativePath="..\Include\bytes_methods.h"
+ RelativePath="..\..\Include\bytes_methods.h"
>
</File>
<File
- RelativePath="..\Include\bytearrayobject.h"
+ RelativePath="..\..\Include\bytearrayobject.h"
>
</File>
<File
- RelativePath="..\Include\bytesobject.h"
+ RelativePath="..\..\Include\bytesobject.h"
>
</File>
<File
- RelativePath="..\Include\cellobject.h"
+ RelativePath="..\..\Include\cellobject.h"
>
</File>
<File
- RelativePath="..\Include\ceval.h"
+ RelativePath="..\..\Include\ceval.h"
>
</File>
<File
- RelativePath="..\Include\classobject.h"
+ RelativePath="..\..\Include\classobject.h"
>
</File>
<File
- RelativePath="..\Include\code.h"
+ RelativePath="..\..\Include\code.h"
>
</File>
<File
- RelativePath="..\Include\codecs.h"
+ RelativePath="..\..\Include\codecs.h"
>
</File>
<File
- RelativePath="..\Include\compile.h"
+ RelativePath="..\..\Include\compile.h"
>
</File>
<File
- RelativePath="..\Include\complexobject.h"
+ RelativePath="..\..\Include\complexobject.h"
>
</File>
<File
- RelativePath="..\Include\datetime.h"
+ RelativePath="..\..\Include\datetime.h"
>
</File>
<File
- RelativePath="..\Include\descrobject.h"
+ RelativePath="..\..\Include\descrobject.h"
>
</File>
<File
- RelativePath="..\Include\dictobject.h"
+ RelativePath="..\..\Include\dictobject.h"
>
</File>
<File
- RelativePath="..\Include\dynamic_annotations.h"
+ RelativePath="..\..\Include\dynamic_annotations.h"
>
</File>
<File
- RelativePath="..\Include\enumobject.h"
+ RelativePath="..\..\Include\enumobject.h"
>
</File>
<File
- RelativePath="..\Include\errcode.h"
+ RelativePath="..\..\Include\errcode.h"
>
</File>
<File
- RelativePath="..\Include\eval.h"
+ RelativePath="..\..\Include\eval.h"
>
</File>
<File
- RelativePath="..\Include\fileobject.h"
+ RelativePath="..\..\Include\fileobject.h"
>
</File>
<File
- RelativePath="..\Include\fileutils.h"
+ RelativePath="..\..\Include\fileutils.h"
>
</File>
<File
- RelativePath="..\Include\floatobject.h"
+ RelativePath="..\..\Include\floatobject.h"
>
</File>
<File
- RelativePath="..\Include\frameobject.h"
+ RelativePath="..\..\Include\frameobject.h"
>
</File>
<File
- RelativePath="..\Include\funcobject.h"
+ RelativePath="..\..\Include\funcobject.h"
>
</File>
<File
- RelativePath="..\Include\genobject.h"
+ RelativePath="..\..\Include\genobject.h"
>
</File>
<File
- RelativePath="..\Include\graminit.h"
+ RelativePath="..\..\Include\graminit.h"
>
</File>
<File
- RelativePath="..\Include\grammar.h"
+ RelativePath="..\..\Include\grammar.h"
>
</File>
<File
- RelativePath="..\Include\import.h"
+ RelativePath="..\..\Include\import.h"
>
</File>
<File
- RelativePath="..\Include\intrcheck.h"
+ RelativePath="..\..\Include\intrcheck.h"
>
</File>
<File
- RelativePath="..\Include\iterobject.h"
+ RelativePath="..\..\Include\iterobject.h"
>
</File>
<File
- RelativePath="..\Include\listobject.h"
+ RelativePath="..\..\Include\listobject.h"
>
</File>
<File
- RelativePath="..\Include\longintrepr.h"
+ RelativePath="..\..\Include\longintrepr.h"
>
</File>
<File
- RelativePath="..\Include\longobject.h"
+ RelativePath="..\..\Include\longobject.h"
>
</File>
<File
- RelativePath="..\Include\marshal.h"
+ RelativePath="..\..\Include\marshal.h"
>
</File>
<File
- RelativePath="..\Include\memoryobject.h"
+ RelativePath="..\..\Include\memoryobject.h"
>
</File>
<File
- RelativePath="..\Include\metagrammar.h"
+ RelativePath="..\..\Include\metagrammar.h"
>
</File>
<File
- RelativePath="..\Include\methodobject.h"
+ RelativePath="..\..\Include\methodobject.h"
>
</File>
<File
- RelativePath="..\Include\modsupport.h"
+ RelativePath="..\..\Include\modsupport.h"
>
</File>
<File
- RelativePath="..\Include\moduleobject.h"
+ RelativePath="..\..\Include\moduleobject.h"
>
</File>
<File
- RelativePath="..\Include\node.h"
+ RelativePath="..\..\Include\node.h"
>
</File>
<File
- RelativePath="..\Include\object.h"
+ RelativePath="..\..\Include\object.h"
>
</File>
<File
- RelativePath="..\Include\objimpl.h"
+ RelativePath="..\..\Include\objimpl.h"
>
</File>
<File
- RelativePath="..\Include\opcode.h"
+ RelativePath="..\..\Include\opcode.h"
>
</File>
<File
- RelativePath="..\Include\osdefs.h"
+ RelativePath="..\..\Include\osdefs.h"
>
</File>
<File
- RelativePath="..\Include\parsetok.h"
+ RelativePath="..\..\Include\parsetok.h"
>
</File>
<File
- RelativePath="..\Include\patchlevel.h"
+ RelativePath="..\..\Include\patchlevel.h"
>
</File>
<File
- RelativePath="..\Include\pgen.h"
+ RelativePath="..\..\Include\pgen.h"
>
</File>
<File
- RelativePath="..\Include\pgenheaders.h"
+ RelativePath="..\..\Include\pgenheaders.h"
>
</File>
<File
- RelativePath="..\Include\py_curses.h"
+ RelativePath="..\..\Include\py_curses.h"
>
</File>
<File
- RelativePath="..\Include\pyarena.h"
+ RelativePath="..\..\Include\pyarena.h"
>
</File>
<File
- RelativePath="..\Include\pycapsule.h"
+ RelativePath="..\..\Include\pycapsule.h"
>
</File>
<File
- RelativePath="..\Include\pyctype.h"
+ RelativePath="..\..\Include\pyctype.h"
>
</File>
<File
- RelativePath="..\Include\pydebug.h"
+ RelativePath="..\..\Include\pydebug.h"
>
</File>
<File
- RelativePath="..\Include\pyerrors.h"
+ RelativePath="..\..\Include\pyerrors.h"
>
</File>
<File
- RelativePath="..\Include\pyexpat.h"
+ RelativePath="..\..\Include\pyexpat.h"
>
</File>
<File
- RelativePath="..\Include\pyfpe.h"
+ RelativePath="..\..\Include\pyfpe.h"
>
</File>
<File
- RelativePath="..\Include\pygetopt.h"
+ RelativePath="..\..\Include\pygetopt.h"
>
</File>
<File
- RelativePath="..\Include\pymactoolbox.h"
+ RelativePath="..\..\Include\pymactoolbox.h"
>
</File>
<File
- RelativePath="..\Include\pymath.h"
+ RelativePath="..\..\Include\pymath.h"
>
</File>
<File
- RelativePath="..\Include\pytime.h"
+ RelativePath="..\..\Include\pytime.h"
>
</File>
<File
- RelativePath="..\Include\pymacro.h"
+ RelativePath="..\..\Include\pymacro.h"
>
</File>
<File
- RelativePath="..\Include\pymem.h"
+ RelativePath="..\..\Include\pymem.h"
>
</File>
<File
- RelativePath="..\Include\pyport.h"
+ RelativePath="..\..\Include\pyport.h"
>
</File>
<File
- RelativePath="..\Include\pystate.h"
+ RelativePath="..\..\Include\pystate.h"
>
</File>
<File
- RelativePath="..\Include\pystrcmp.h"
+ RelativePath="..\..\Include\pystrcmp.h"
>
</File>
<File
- RelativePath="..\Include\pystrtod.h"
+ RelativePath="..\..\Include\pystrtod.h"
>
</File>
<File
- RelativePath="..\Include\dtoa.h"
+ RelativePath="..\..\Include\dtoa.h"
>
</File>
<File
- RelativePath="..\Include\Python-ast.h"
+ RelativePath="..\..\Include\Python-ast.h"
>
</File>
<File
- RelativePath="..\Include\Python.h"
+ RelativePath="..\..\Include\Python.h"
>
</File>
<File
- RelativePath="..\Include\pythonrun.h"
+ RelativePath="..\..\Include\pythonrun.h"
>
</File>
<File
- RelativePath="..\Include\pythread.h"
+ RelativePath="..\..\Include\pythread.h"
>
</File>
<File
- RelativePath="..\Include\rangeobject.h"
+ RelativePath="..\..\Include\rangeobject.h"
>
</File>
<File
- RelativePath="..\Include\setobject.h"
+ RelativePath="..\..\Include\setobject.h"
>
</File>
<File
- RelativePath="..\Include\sliceobject.h"
+ RelativePath="..\..\Include\sliceobject.h"
>
</File>
<File
- RelativePath="..\Include\structmember.h"
+ RelativePath="..\..\Include\structmember.h"
>
</File>
<File
- RelativePath="..\Include\structseq.h"
+ RelativePath="..\..\Include\structseq.h"
>
</File>
<File
- RelativePath="..\Include\symtable.h"
+ RelativePath="..\..\Include\symtable.h"
>
</File>
<File
- RelativePath="..\Include\sysmodule.h"
+ RelativePath="..\..\Include\sysmodule.h"
>
</File>
<File
- RelativePath="..\Include\timefuncs.h"
+ RelativePath="..\..\Include\timefuncs.h"
>
</File>
<File
- RelativePath="..\Include\token.h"
+ RelativePath="..\..\Include\token.h"
>
</File>
<File
- RelativePath="..\Include\traceback.h"
+ RelativePath="..\..\Include\traceback.h"
>
</File>
<File
- RelativePath="..\Include\tupleobject.h"
+ RelativePath="..\..\Include\tupleobject.h"
>
</File>
<File
- RelativePath="..\Include\ucnhash.h"
+ RelativePath="..\..\Include\ucnhash.h"
>
</File>
<File
- RelativePath="..\Include\unicodeobject.h"
+ RelativePath="..\..\Include\unicodeobject.h"
>
</File>
<File
- RelativePath="..\Include\weakrefobject.h"
+ RelativePath="..\..\Include\weakrefobject.h"
>
</File>
</Filter>
@@ -991,222 +991,222 @@
Name="Modules"
>
<File
- RelativePath="..\Modules\_bisectmodule.c"
+ RelativePath="..\..\Modules\_bisectmodule.c"
>
</File>
<File
- RelativePath="..\Modules\_codecsmodule.c"
+ RelativePath="..\..\Modules\_codecsmodule.c"
>
</File>
<File
- RelativePath="..\Modules\_collectionsmodule.c"
+ RelativePath="..\..\Modules\_collectionsmodule.c"
>
</File>
<File
- RelativePath="..\Modules\_csv.c"
+ RelativePath="..\..\Modules\_csv.c"
>
</File>
<File
- RelativePath="..\Modules\_functoolsmodule.c"
+ RelativePath="..\..\Modules\_functoolsmodule.c"
>
</File>
<File
- RelativePath="..\Modules\_heapqmodule.c"
+ RelativePath="..\..\Modules\_heapqmodule.c"
>
</File>
<File
- RelativePath="..\Modules\_json.c"
+ RelativePath="..\..\Modules\_json.c"
>
</File>
<File
- RelativePath="..\Modules\_localemodule.c"
+ RelativePath="..\..\Modules\_localemodule.c"
>
</File>
<File
- RelativePath="..\Modules\_lsprof.c"
+ RelativePath="..\..\Modules\_lsprof.c"
>
</File>
<File
- RelativePath="..\Modules\_math.c"
+ RelativePath="..\..\Modules\_math.c"
>
</File>
<File
- RelativePath="..\Modules\_math.h"
+ RelativePath="..\..\Modules\_math.h"
>
</File>
<File
- RelativePath="..\Modules\_pickle.c"
+ RelativePath="..\..\Modules\_pickle.c"
>
</File>
<File
- RelativePath="..\Modules\_randommodule.c"
+ RelativePath="..\..\Modules\_randommodule.c"
>
</File>
<File
- RelativePath="..\Modules\_sre.c"
+ RelativePath="..\..\Modules\_sre.c"
>
</File>
<File
- RelativePath="..\Modules\_struct.c"
+ RelativePath="..\..\Modules\_struct.c"
>
</File>
<File
- RelativePath="..\Modules\_weakref.c"
+ RelativePath="..\..\Modules\_weakref.c"
>
</File>
<File
- RelativePath="..\Modules\_winapi.c"
+ RelativePath="..\..\Modules\_winapi.c"
>
</File>
<File
- RelativePath="..\Modules\arraymodule.c"
+ RelativePath="..\..\Modules\arraymodule.c"
>
</File>
<File
- RelativePath="..\Modules\atexitmodule.c"
+ RelativePath="..\..\Modules\atexitmodule.c"
>
</File>
<File
- RelativePath="..\Modules\audioop.c"
+ RelativePath="..\..\Modules\audioop.c"
>
</File>
<File
- RelativePath="..\Modules\binascii.c"
+ RelativePath="..\..\Modules\binascii.c"
>
</File>
<File
- RelativePath="..\Modules\cmathmodule.c"
+ RelativePath="..\..\Modules\cmathmodule.c"
>
</File>
<File
- RelativePath="..\Modules\_datetimemodule.c"
+ RelativePath="..\..\Modules\_datetimemodule.c"
>
</File>
<File
- RelativePath="..\Modules\errnomodule.c"
+ RelativePath="..\..\Modules\errnomodule.c"
>
</File>
<File
- RelativePath="..\Modules\faulthandler.c"
+ RelativePath="..\..\Modules\faulthandler.c"
>
</File>
<File
- RelativePath="..\Modules\gcmodule.c"
+ RelativePath="..\..\Modules\gcmodule.c"
>
</File>
<File
- RelativePath="..\Modules\itertoolsmodule.c"
+ RelativePath="..\..\Modules\itertoolsmodule.c"
>
</File>
<File
- RelativePath="..\Modules\main.c"
+ RelativePath="..\..\Modules\main.c"
>
</File>
<File
- RelativePath="..\Modules\mathmodule.c"
+ RelativePath="..\..\Modules\mathmodule.c"
>
</File>
<File
- RelativePath="..\Modules\md5module.c"
+ RelativePath="..\..\Modules\md5module.c"
>
</File>
<File
- RelativePath="..\Modules\mmapmodule.c"
+ RelativePath="..\..\Modules\mmapmodule.c"
>
</File>
<File
- RelativePath="..\Modules\operator.c"
+ RelativePath="..\..\Modules\operator.c"
>
</File>
<File
- RelativePath="..\Modules\parsermodule.c"
+ RelativePath="..\..\Modules\parsermodule.c"
>
</File>
<File
- RelativePath="..\Modules\posixmodule.c"
+ RelativePath="..\..\Modules\posixmodule.c"
>
</File>
<File
- RelativePath="..\Modules\rotatingtree.c"
+ RelativePath="..\..\Modules\rotatingtree.c"
>
</File>
<File
- RelativePath="..\Modules\rotatingtree.h"
+ RelativePath="..\..\Modules\rotatingtree.h"
>
</File>
<File
- RelativePath="..\Modules\sha1module.c"
+ RelativePath="..\..\Modules\sha1module.c"
>
</File>
<File
- RelativePath="..\Modules\sha256module.c"
+ RelativePath="..\..\Modules\sha256module.c"
>
</File>
<File
- RelativePath="..\Modules\sha512module.c"
+ RelativePath="..\..\Modules\sha512module.c"
>
</File>
<File
- RelativePath="..\Modules\signalmodule.c"
+ RelativePath="..\..\Modules\signalmodule.c"
>
</File>
<File
- RelativePath="..\Modules\symtablemodule.c"
+ RelativePath="..\..\Modules\symtablemodule.c"
>
</File>
<File
- RelativePath="..\Modules\_threadmodule.c"
+ RelativePath="..\..\Modules\_threadmodule.c"
>
</File>
<File
- RelativePath="..\Modules\timemodule.c"
+ RelativePath="..\..\Modules\timemodule.c"
>
</File>
<File
- RelativePath="..\Modules\xxsubtype.c"
+ RelativePath="..\..\Modules\xxsubtype.c"
>
</File>
<File
- RelativePath="..\Modules\zipimport.c"
+ RelativePath="..\..\Modules\zipimport.c"
>
</File>
<File
- RelativePath="..\Modules\zlibmodule.c"
+ RelativePath="..\..\Modules\zlibmodule.c"
>
</File>
<Filter
Name="_io"
>
<File
- RelativePath="..\Modules\_io\fileio.c"
+ RelativePath="..\..\Modules\_io\fileio.c"
>
</File>
<File
- RelativePath="..\Modules\_io\bytesio.c"
+ RelativePath="..\..\Modules\_io\bytesio.c"
>
</File>
<File
- RelativePath="..\Modules\_io\stringio.c"
+ RelativePath="..\..\Modules\_io\stringio.c"
>
</File>
<File
- RelativePath="..\Modules\_io\bufferedio.c"
+ RelativePath="..\..\Modules\_io\bufferedio.c"
>
</File>
<File
- RelativePath="..\Modules\_io\iobase.c"
+ RelativePath="..\..\Modules\_io\iobase.c"
>
</File>
<File
- RelativePath="..\Modules\_io\textio.c"
+ RelativePath="..\..\Modules\_io\textio.c"
>
</File>
<File
- RelativePath="..\Modules\_io\_iomodule.c"
+ RelativePath="..\..\Modules\_io\_iomodule.c"
>
</File>
<File
- RelativePath="..\Modules\_io\_iomodule.h"
+ RelativePath="..\..\Modules\_io\_iomodule.h"
>
</File>
</Filter>
@@ -1214,31 +1214,31 @@
Name="zlib"
>
<File
- RelativePath="..\Modules\zlib\adler32.c"
+ RelativePath="..\..\Modules\zlib\adler32.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\compress.c"
+ RelativePath="..\..\Modules\zlib\compress.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\crc32.c"
+ RelativePath="..\..\Modules\zlib\crc32.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\crc32.h"
+ RelativePath="..\..\Modules\zlib\crc32.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\deflate.c"
+ RelativePath="..\..\Modules\zlib\deflate.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\deflate.h"
+ RelativePath="..\..\Modules\zlib\deflate.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\gzio.c"
+ RelativePath="..\..\Modules\zlib\gzio.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -1306,67 +1306,67 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\Modules\zlib\infback.c"
+ RelativePath="..\..\Modules\zlib\infback.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\inffast.c"
+ RelativePath="..\..\Modules\zlib\inffast.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\inffast.h"
+ RelativePath="..\..\Modules\zlib\inffast.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\inffixed.h"
+ RelativePath="..\..\Modules\zlib\inffixed.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\inflate.c"
+ RelativePath="..\..\Modules\zlib\inflate.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\inflate.h"
+ RelativePath="..\..\Modules\zlib\inflate.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\inftrees.c"
+ RelativePath="..\..\Modules\zlib\inftrees.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\inftrees.h"
+ RelativePath="..\..\Modules\zlib\inftrees.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\trees.c"
+ RelativePath="..\..\Modules\zlib\trees.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\trees.h"
+ RelativePath="..\..\Modules\zlib\trees.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\uncompr.c"
+ RelativePath="..\..\Modules\zlib\uncompr.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\zconf.h"
+ RelativePath="..\..\Modules\zlib\zconf.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\zconf.in.h"
+ RelativePath="..\..\Modules\zlib\zconf.in.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\zlib.h"
+ RelativePath="..\..\Modules\zlib\zlib.h"
>
</File>
<File
- RelativePath="..\Modules\zlib\zutil.c"
+ RelativePath="..\..\Modules\zlib\zutil.c"
>
</File>
<File
- RelativePath="..\Modules\zlib\zutil.h"
+ RelativePath="..\..\Modules\zlib\zutil.h"
>
</File>
</Filter>
@@ -1374,71 +1374,71 @@
Name="cjkcodecs"
>
<File
- RelativePath="..\Modules\cjkcodecs\_codecs_cn.c"
+ RelativePath="..\..\Modules\cjkcodecs\_codecs_cn.c"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\_codecs_hk.c"
+ RelativePath="..\..\Modules\cjkcodecs\_codecs_hk.c"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\_codecs_iso2022.c"
+ RelativePath="..\..\Modules\cjkcodecs\_codecs_iso2022.c"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\_codecs_jp.c"
+ RelativePath="..\..\Modules\cjkcodecs\_codecs_jp.c"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\_codecs_kr.c"
+ RelativePath="..\..\Modules\cjkcodecs\_codecs_kr.c"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\_codecs_tw.c"
+ RelativePath="..\..\Modules\cjkcodecs\_codecs_tw.c"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\alg_jisx0201.h"
+ RelativePath="..\..\Modules\cjkcodecs\alg_jisx0201.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\cjkcodecs.h"
+ RelativePath="..\..\Modules\cjkcodecs\cjkcodecs.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\emu_jisx0213_2000.h"
+ RelativePath="..\..\Modules\cjkcodecs\emu_jisx0213_2000.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\mappings_cn.h"
+ RelativePath="..\..\Modules\cjkcodecs\mappings_cn.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\mappings_hk.h"
+ RelativePath="..\..\Modules\cjkcodecs\mappings_hk.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\mappings_jisx0213_pair.h"
+ RelativePath="..\..\Modules\cjkcodecs\mappings_jisx0213_pair.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\mappings_jp.h"
+ RelativePath="..\..\Modules\cjkcodecs\mappings_jp.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\mappings_kr.h"
+ RelativePath="..\..\Modules\cjkcodecs\mappings_kr.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\mappings_tw.h"
+ RelativePath="..\..\Modules\cjkcodecs\mappings_tw.h"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\multibytecodec.c"
+ RelativePath="..\..\Modules\cjkcodecs\multibytecodec.c"
>
</File>
<File
- RelativePath="..\Modules\cjkcodecs\multibytecodec.h"
+ RelativePath="..\..\Modules\cjkcodecs\multibytecodec.h"
>
</File>
</Filter>
@@ -1447,175 +1447,175 @@
Name="Objects"
>
<File
- RelativePath="..\Objects\abstract.c"
+ RelativePath="..\..\Objects\abstract.c"
>
</File>
<File
- RelativePath="..\Objects\accu.c"
+ RelativePath="..\..\Objects\accu.c"
>
</File>
<File
- RelativePath="..\Objects\boolobject.c"
+ RelativePath="..\..\Objects\boolobject.c"
>
</File>
<File
- RelativePath="..\Objects\bytes_methods.c"
+ RelativePath="..\..\Objects\bytes_methods.c"
>
</File>
<File
- RelativePath="..\Objects\bytearrayobject.c"
+ RelativePath="..\..\Objects\bytearrayobject.c"
>
</File>
<File
- RelativePath="..\Objects\bytesobject.c"
+ RelativePath="..\..\Objects\bytesobject.c"
>
</File>
<File
- RelativePath="..\Objects\capsule.c"
+ RelativePath="..\..\Objects\capsule.c"
>
</File>
<File
- RelativePath="..\Objects\cellobject.c"
+ RelativePath="..\..\Objects\cellobject.c"
>
</File>
<File
- RelativePath="..\Objects\classobject.c"
+ RelativePath="..\..\Objects\classobject.c"
>
</File>
<File
- RelativePath="..\Objects\codeobject.c"
+ RelativePath="..\..\Objects\codeobject.c"
>
</File>
<File
- RelativePath="..\Objects\complexobject.c"
+ RelativePath="..\..\Objects\complexobject.c"
>
</File>
<File
- RelativePath="..\Objects\stringlib\count.h"
+ RelativePath="..\..\Objects\stringlib\count.h"
>
</File>
<File
- RelativePath="..\Objects\descrobject.c"
+ RelativePath="..\..\Objects\descrobject.c"
>
</File>
<File
- RelativePath="..\Objects\dictobject.c"
+ RelativePath="..\..\Objects\dictobject.c"
>
</File>
<File
- RelativePath="..\Objects\enumobject.c"
+ RelativePath="..\..\Objects\enumobject.c"
>
</File>
<File
- RelativePath="..\Objects\exceptions.c"
+ RelativePath="..\..\Objects\exceptions.c"
>
</File>
<File
- RelativePath="..\Objects\stringlib\fastsearch.h"
+ RelativePath="..\..\Objects\stringlib\fastsearch.h"
>
</File>
<File
- RelativePath="..\Objects\fileobject.c"
+ RelativePath="..\..\Objects\fileobject.c"
>
</File>
<File
- RelativePath="..\Objects\stringlib\find.h"
+ RelativePath="..\..\Objects\stringlib\find.h"
>
</File>
<File
- RelativePath="..\Objects\floatobject.c"
+ RelativePath="..\..\Objects\floatobject.c"
>
</File>
<File
- RelativePath="..\Objects\frameobject.c"
+ RelativePath="..\..\Objects\frameobject.c"
>
</File>
<File
- RelativePath="..\Objects\funcobject.c"
+ RelativePath="..\..\Objects\funcobject.c"
>
</File>
<File
- RelativePath="..\Objects\genobject.c"
+ RelativePath="..\..\Objects\genobject.c"
>
</File>
<File
- RelativePath="..\Objects\iterobject.c"
+ RelativePath="..\..\Objects\iterobject.c"
>
</File>
<File
- RelativePath="..\Objects\listobject.c"
+ RelativePath="..\..\Objects\listobject.c"
>
</File>
<File
- RelativePath="..\Objects\longobject.c"
+ RelativePath="..\..\Objects\longobject.c"
>
</File>
<File
- RelativePath="..\Objects\memoryobject.c"
+ RelativePath="..\..\Objects\memoryobject.c"
>
</File>
<File
- RelativePath="..\Objects\methodobject.c"
+ RelativePath="..\..\Objects\methodobject.c"
>
</File>
<File
- RelativePath="..\Objects\moduleobject.c"
+ RelativePath="..\..\Objects\moduleobject.c"
>
</File>
<File
- RelativePath="..\Objects\object.c"
+ RelativePath="..\..\Objects\object.c"
>
</File>
<File
- RelativePath="..\Objects\obmalloc.c"
+ RelativePath="..\..\Objects\obmalloc.c"
>
</File>
<File
- RelativePath="..\Objects\stringlib\partition.h"
+ RelativePath="..\..\Objects\stringlib\partition.h"
>
</File>
<File
- RelativePath="..\Objects\rangeobject.c"
+ RelativePath="..\..\Objects\rangeobject.c"
>
</File>
<File
- RelativePath="..\Objects\setobject.c"
+ RelativePath="..\..\Objects\setobject.c"
>
</File>
<File
- RelativePath="..\Objects\sliceobject.c"
+ RelativePath="..\..\Objects\sliceobject.c"
>
</File>
<File
- RelativePath="..\Objects\stringlib\split.h"
+ RelativePath="..\..\Objects\stringlib\split.h"
>
</File>
<File
- RelativePath="..\Objects\structseq.c"
+ RelativePath="..\..\Objects\structseq.c"
>
</File>
<File
- RelativePath="..\Objects\tupleobject.c"
+ RelativePath="..\..\Objects\tupleobject.c"
>
</File>
<File
- RelativePath="..\Objects\typeobject.c"
+ RelativePath="..\..\Objects\typeobject.c"
>
</File>
<File
- RelativePath="..\Objects\unicodectype.c"
+ RelativePath="..\..\Objects\unicodectype.c"
>
</File>
<File
- RelativePath="..\Objects\unicodeobject.c"
+ RelativePath="..\..\Objects\unicodeobject.c"
>
</File>
<File
- RelativePath="..\Objects\unicodetype_db.h"
+ RelativePath="..\..\Objects\unicodetype_db.h"
>
</File>
<File
- RelativePath="..\Objects\weakrefobject.c"
+ RelativePath="..\..\Objects\weakrefobject.c"
>
</File>
</Filter>
@@ -1623,59 +1623,59 @@
Name="Parser"
>
<File
- RelativePath="..\Parser\acceler.c"
+ RelativePath="..\..\Parser\acceler.c"
>
</File>
<File
- RelativePath="..\Parser\bitset.c"
+ RelativePath="..\..\Parser\bitset.c"
>
</File>
<File
- RelativePath="..\Parser\firstsets.c"
+ RelativePath="..\..\Parser\firstsets.c"
>
</File>
<File
- RelativePath="..\Parser\grammar.c"
+ RelativePath="..\..\Parser\grammar.c"
>
</File>
<File
- RelativePath="..\Parser\grammar1.c"
+ RelativePath="..\..\Parser\grammar1.c"
>
</File>
<File
- RelativePath="..\Parser\listnode.c"
+ RelativePath="..\..\Parser\listnode.c"
>
</File>
<File
- RelativePath="..\Parser\metagrammar.c"
+ RelativePath="..\..\Parser\metagrammar.c"
>
</File>
<File
- RelativePath="..\Parser\myreadline.c"
+ RelativePath="..\..\Parser\myreadline.c"
>
</File>
<File
- RelativePath="..\Parser\node.c"
+ RelativePath="..\..\Parser\node.c"
>
</File>
<File
- RelativePath="..\Parser\parser.c"
+ RelativePath="..\..\Parser\parser.c"
>
</File>
<File
- RelativePath="..\Parser\parser.h"
+ RelativePath="..\..\Parser\parser.h"
>
</File>
<File
- RelativePath="..\Parser\parsetok.c"
+ RelativePath="..\..\Parser\parsetok.c"
>
</File>
<File
- RelativePath="..\Parser\tokenizer.c"
+ RelativePath="..\..\Parser\tokenizer.c"
>
</File>
<File
- RelativePath="..\Parser\tokenizer.h"
+ RelativePath="..\..\Parser\tokenizer.h"
>
</File>
</Filter>
@@ -1683,31 +1683,31 @@
Name="PC"
>
<File
- RelativePath="..\PC\winreg.c"
+ RelativePath="..\..\PC\winreg.c"
>
</File>
<File
- RelativePath="..\PC\config.c"
+ RelativePath="..\..\PC\config.c"
>
</File>
<File
- RelativePath="..\PC\dl_nt.c"
+ RelativePath="..\..\PC\dl_nt.c"
>
</File>
<File
- RelativePath="..\PC\errmap.h"
+ RelativePath="..\..\PC\errmap.h"
>
</File>
<File
- RelativePath="..\PC\getpathp.c"
+ RelativePath="..\..\PC\getpathp.c"
>
</File>
<File
- RelativePath="..\PC\msvcrtmodule.c"
+ RelativePath="..\..\PC\msvcrtmodule.c"
>
</File>
<File
- RelativePath="..\PC\pyconfig.h"
+ RelativePath="..\..\PC\pyconfig.h"
>
</File>
</Filter>
@@ -1715,191 +1715,191 @@
Name="Python"
>
<File
- RelativePath="..\Python\_warnings.c"
+ RelativePath="..\..\Python\_warnings.c"
>
</File>
<File
- RelativePath="..\Python\asdl.c"
+ RelativePath="..\..\Python\asdl.c"
>
</File>
<File
- RelativePath="..\Python\ast.c"
+ RelativePath="..\..\Python\ast.c"
>
</File>
<File
- RelativePath="..\Python\bltinmodule.c"
+ RelativePath="..\..\Python\bltinmodule.c"
>
</File>
<File
- RelativePath="..\Python\ceval.c"
+ RelativePath="..\..\Python\ceval.c"
>
</File>
<File
- RelativePath="..\Python\codecs.c"
+ RelativePath="..\..\Python\codecs.c"
>
</File>
<File
- RelativePath="..\Python\compile.c"
+ RelativePath="..\..\Python\compile.c"
>
</File>
<File
- RelativePath="..\Python\dynamic_annotations.c"
+ RelativePath="..\..\Python\dynamic_annotations.c"
>
</File>
<File
- RelativePath="..\Python\dynload_win.c"
+ RelativePath="..\..\Python\dynload_win.c"
>
</File>
<File
- RelativePath="..\Python\errors.c"
+ RelativePath="..\..\Python\errors.c"
>
</File>
<File
- RelativePath="..\Python\fileutils.c"
+ RelativePath="..\..\Python\fileutils.c"
>
</File>
<File
- RelativePath="..\Python\formatter_unicode.c"
+ RelativePath="..\..\Python\formatter_unicode.c"
>
</File>
<File
- RelativePath="..\Python\frozen.c"
+ RelativePath="..\..\Python\frozen.c"
>
</File>
<File
- RelativePath="..\Python\future.c"
+ RelativePath="..\..\Python\future.c"
>
</File>
<File
- RelativePath="..\Python\getargs.c"
+ RelativePath="..\..\Python\getargs.c"
>
</File>
<File
- RelativePath="..\Python\getcompiler.c"
+ RelativePath="..\..\Python\getcompiler.c"
>
</File>
<File
- RelativePath="..\Python\getcopyright.c"
+ RelativePath="..\..\Python\getcopyright.c"
>
</File>
<File
- RelativePath="..\Python\getopt.c"
+ RelativePath="..\..\Python\getopt.c"
>
</File>
<File
- RelativePath="..\Python\getplatform.c"
+ RelativePath="..\..\Python\getplatform.c"
>
</File>
<File
- RelativePath="..\Python\getversion.c"
+ RelativePath="..\..\Python\getversion.c"
>
</File>
<File
- RelativePath="..\Python\graminit.c"
+ RelativePath="..\..\Python\graminit.c"
>
</File>
<File
- RelativePath="..\Python\import.c"
+ RelativePath="..\..\Python\import.c"
>
</File>
<File
- RelativePath="..\Python\importdl.c"
+ RelativePath="..\..\Python\importdl.c"
>
</File>
<File
- RelativePath="..\Python\importdl.h"
+ RelativePath="..\..\Python\importdl.h"
>
</File>
<File
- RelativePath="..\Python\marshal.c"
+ RelativePath="..\..\Python\marshal.c"
>
</File>
<File
- RelativePath="..\Python\modsupport.c"
+ RelativePath="..\..\Python\modsupport.c"
>
</File>
<File
- RelativePath="..\Python\mysnprintf.c"
+ RelativePath="..\..\Python\mysnprintf.c"
>
</File>
<File
- RelativePath="..\Python\mystrtoul.c"
+ RelativePath="..\..\Python\mystrtoul.c"
>
</File>
<File
- RelativePath="..\Python\peephole.c"
+ RelativePath="..\..\Python\peephole.c"
>
</File>
<File
- RelativePath="..\Python\pyarena.c"
+ RelativePath="..\..\Python\pyarena.c"
>
</File>
<File
- RelativePath="..\Python\pyctype.c"
+ RelativePath="..\..\Python\pyctype.c"
>
</File>
<File
- RelativePath="..\Python\pyfpe.c"
+ RelativePath="..\..\Python\pyfpe.c"
>
</File>
<File
- RelativePath="..\Python\pymath.c"
+ RelativePath="..\..\Python\pymath.c"
>
</File>
<File
- RelativePath="..\Python\pytime.c"
+ RelativePath="..\..\Python\pytime.c"
>
</File>
<File
- RelativePath="..\Python\pystate.c"
+ RelativePath="..\..\Python\pystate.c"
>
</File>
<File
- RelativePath="..\Python\pystrcmp.c"
+ RelativePath="..\..\Python\pystrcmp.c"
>
</File>
<File
- RelativePath="..\Python\pystrtod.c"
+ RelativePath="..\..\Python\pystrtod.c"
>
</File>
<File
- RelativePath="..\Python\dtoa.c"
+ RelativePath="..\..\Python\dtoa.c"
>
</File>
<File
- RelativePath="..\Python\Python-ast.c"
+ RelativePath="..\..\Python\Python-ast.c"
>
</File>
<File
- RelativePath="..\Python\pythonrun.c"
+ RelativePath="..\..\Python\pythonrun.c"
>
</File>
<File
- RelativePath="..\Python\random.c"
+ RelativePath="..\..\Python\random.c"
>
</File>
<File
- RelativePath="..\Python\structmember.c"
+ RelativePath="..\..\Python\structmember.c"
>
</File>
<File
- RelativePath="..\Python\symtable.c"
+ RelativePath="..\..\Python\symtable.c"
>
</File>
<File
- RelativePath="..\Python\sysmodule.c"
+ RelativePath="..\..\Python\sysmodule.c"
>
</File>
<File
- RelativePath="..\Python\thread.c"
+ RelativePath="..\..\Python\thread.c"
>
</File>
<File
- RelativePath="..\Python\thread_nt.h"
+ RelativePath="..\..\Python\thread_nt.h"
>
</File>
<File
- RelativePath="..\Python\traceback.c"
+ RelativePath="..\..\Python\traceback.c"
>
</File>
</Filter>
@@ -1907,7 +1907,7 @@
Name="Resource Files"
>
<File
- RelativePath="..\PC\python_nt.rc"
+ RelativePath="..\..\PC\python_nt.rc"
>
</File>
</Filter>
diff --git a/PC/VS9.0/pythonw.vcproj b/PC/VS9.0/pythonw.vcproj
--- a/PC/VS9.0/pythonw.vcproj
+++ b/PC/VS9.0/pythonw.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="pythonw"
ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
TargetFrameworkVersion="131072"
@@ -600,7 +600,7 @@
Name="Resource Files"
>
<File
- RelativePath="..\PC\python_exe.rc"
+ RelativePath="..\..\PC\python_exe.rc"
>
</File>
</Filter>
@@ -608,7 +608,7 @@
Name="Source Files"
>
<File
- RelativePath="..\PC\WinMain.c"
+ RelativePath="..\..\PC\WinMain.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/select.vcproj b/PC/VS9.0/select.vcproj
--- a/PC/VS9.0/select.vcproj
+++ b/PC/VS9.0/select.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="select"
ProjectGUID="{18CAE28C-B454-46C1-87A0-493D91D97F03}"
RootNamespace="select"
@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\selectmodule.c"
+ RelativePath="..\..\Modules\selectmodule.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/sqlite3.vcproj b/PC/VS9.0/sqlite3.vcproj
--- a/PC/VS9.0/sqlite3.vcproj
+++ b/PC/VS9.0/sqlite3.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="sqlite3"
ProjectGUID="{A1A295E5-463C-437F-81CA-1F32367685DA}"
RootNamespace="sqlite3"
diff --git a/PC/VS9.0/ssl.vcproj b/PC/VS9.0/ssl.vcproj
--- a/PC/VS9.0/ssl.vcproj
+++ b/PC/VS9.0/ssl.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="ssl"
ProjectGUID="{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
RootNamespace="ssl"
diff --git a/PC/VS9.0/unicodedata.vcproj b/PC/VS9.0/unicodedata.vcproj
--- a/PC/VS9.0/unicodedata.vcproj
+++ b/PC/VS9.0/unicodedata.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="unicodedata"
ProjectGUID="{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}"
RootNamespace="unicodedata"
@@ -511,11 +511,11 @@
Name="Header Files"
>
<File
- RelativePath="..\Modules\unicodedata_db.h"
+ RelativePath="..\..\Modules\unicodedata_db.h"
>
</File>
<File
- RelativePath="..\Modules\unicodename_db.h"
+ RelativePath="..\..\Modules\unicodename_db.h"
>
</File>
</Filter>
@@ -523,7 +523,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\unicodedata.c"
+ RelativePath="..\..\Modules\unicodedata.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/w9xpopen.vcproj b/PC/VS9.0/w9xpopen.vcproj
--- a/PC/VS9.0/w9xpopen.vcproj
+++ b/PC/VS9.0/w9xpopen.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="w9xpopen"
ProjectGUID="{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
RootNamespace="w9xpopen"
@@ -566,7 +566,7 @@
Name="Source Files"
>
<File
- RelativePath="..\PC\w9xpopen.c"
+ RelativePath="..\..\PC\w9xpopen.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/winsound.vcproj b/PC/VS9.0/winsound.vcproj
--- a/PC/VS9.0/winsound.vcproj
+++ b/PC/VS9.0/winsound.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="winsound"
ProjectGUID="{28B5D777-DDF2-4B6B-B34F-31D938813856}"
RootNamespace="winsound"
@@ -513,7 +513,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\PC\winsound.c"
+ RelativePath="..\..\PC\winsound.c"
>
</File>
</Filter>
diff --git a/PC/VS9.0/xxlimited.vcproj b/PC/VS9.0/xxlimited.vcproj
--- a/PC/VS9.0/xxlimited.vcproj
+++ b/PC/VS9.0/xxlimited.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="xxlimited"
ProjectGUID="{F749B822-B489-4CA5-A3AD-CE078F5F338A}"
RootNamespace="xxlimited"
@@ -407,7 +407,7 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\xxlimited.c"
+ RelativePath="..\..\Modules\xxlimited.c"
>
</File>
</Filter>
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list