[Python-3000-checkins] r59628 - in python/branches/py3k: PC/VS7.1/_bsddb.vcproj PC/VS7.1/_ctypes.vcproj PC/VS7.1/_ctypes_test.vcproj PC/VS7.1/_elementtree.vcproj PC/VS7.1/_msi.vcproj PC/VS7.1/_socket.vcproj PC/VS7.1/_sqlite3.vcproj PC/VS7.1/_ssl.vcproj PC/VS7.1/_testcapi.vcproj PC/VS7.1/_tkinter.vcproj PC/VS7.1/bz2.vcproj PC/VS7.1/make_versioninfo.vcproj PC/VS7.1/pyexpat.vcproj PC/VS7.1/python.vcproj PC/VS7.1/pythoncore.vcproj PC/VS7.1/pythonw.vcproj PC/VS7.1/select.vcproj PC/VS7.1/unicodedata.vcproj PC/VS7.1/w9xpopen.vcproj PC/VS7.1/winsound.vcproj

christian.heimes python-3000-checkins at python.org
Mon Dec 31 17:18:23 CET 2007


Author: christian.heimes
Date: Mon Dec 31 17:18:22 2007
New Revision: 59628

Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/PC/VS7.1/_bsddb.vcproj
   python/branches/py3k/PC/VS7.1/_ctypes.vcproj
   python/branches/py3k/PC/VS7.1/_ctypes_test.vcproj
   python/branches/py3k/PC/VS7.1/_elementtree.vcproj
   python/branches/py3k/PC/VS7.1/_msi.vcproj
   python/branches/py3k/PC/VS7.1/_socket.vcproj
   python/branches/py3k/PC/VS7.1/_sqlite3.vcproj
   python/branches/py3k/PC/VS7.1/_ssl.vcproj
   python/branches/py3k/PC/VS7.1/_testcapi.vcproj
   python/branches/py3k/PC/VS7.1/_tkinter.vcproj
   python/branches/py3k/PC/VS7.1/bz2.vcproj
   python/branches/py3k/PC/VS7.1/make_versioninfo.vcproj
   python/branches/py3k/PC/VS7.1/pyexpat.vcproj
   python/branches/py3k/PC/VS7.1/python.vcproj
   python/branches/py3k/PC/VS7.1/pythoncore.vcproj
   python/branches/py3k/PC/VS7.1/pythonw.vcproj
   python/branches/py3k/PC/VS7.1/select.vcproj
   python/branches/py3k/PC/VS7.1/unicodedata.vcproj
   python/branches/py3k/PC/VS7.1/w9xpopen.vcproj
   python/branches/py3k/PC/VS7.1/winsound.vcproj
Log:
Merged revisions 59625-59627 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59627 | christian.heimes | 2007-12-31 17:17:13 +0100 (Mon, 31 Dec 2007) | 1 line
  
  Fixed include paths of PC/VS7.1
........


Modified: python/branches/py3k/PC/VS7.1/_bsddb.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_bsddb.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_bsddb.vcproj	Mon Dec 31 17:18:22 2007
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
+				AdditionalIncludeDirectories="..\..\Include;..\..\PC;&quot;..\..\..\db-4.4.20\build_win32&quot;"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -32,7 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\db-4.4.20\build_win32\Debug\libdb44sd.lib"
+				AdditionalDependencies="..\..\..\db-4.4.20\build_win32\Debug\libdb44sd.lib"
 				OutputFile="./_bsddb_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -75,7 +75,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
+				AdditionalIncludeDirectories="..\..\Include;..\..\PC;&quot;..\..\..\db-4.4.20\build_win32&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
+				AdditionalDependencies="..\..\..\db-4.4.20\build_win32\Release\libdb44s.lib"
 				OutputFile="./_bsddb.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -133,7 +133,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
+				AdditionalIncludeDirectories="..\..\Include;..\..\PC;&quot;..\..\..\db-4.4.20\build_win32&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -151,7 +151,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_IA64\libdb44s.lib"
+				AdditionalDependencies="..\..\..\db-4.4.20\build_win32\Release_IA64\libdb44s.lib"
 				OutputFile="./_bsddb.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -195,7 +195,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include;..\PC;&quot;..\..\db-4.4.20\build_win32&quot;"
+				AdditionalIncludeDirectories="..\..\Include;..\..\PC;&quot;..\..\..\db-4.4.20\build_win32&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib bufferoverflowU.lib"
+				AdditionalDependencies="..\..\..\db-4.4.20\build_win32\Release_AMD64\libdb44s.lib bufferoverflowU.lib"
 				OutputFile="./_bsddb.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -250,7 +250,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\_bsddb.c">
+			RelativePath="..\..\Modules\_bsddb.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/_ctypes.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_ctypes.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_ctypes.vcproj	Mon Dec 31 17:18:22 2007
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\_ctypes\libffi_msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\_ctypes\libffi_msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -131,7 +131,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\_ctypes\libffi_msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -190,7 +190,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /USECL:MS_ITANIUM"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\_ctypes\libffi_msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -244,31 +244,31 @@
 	</References>
 	<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="ReleaseAMD64|Win32"
 				ExcludedFromBuild="TRUE">
@@ -277,7 +277,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm">
+			RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm">
 			<FileConfiguration
 				Name="Debug|Win32"
 				ExcludedFromBuild="TRUE">

Modified: python/branches/py3k/PC/VS7.1/_ctypes_test.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_ctypes_test.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_ctypes_test.vcproj	Mon Dec 31 17:18:22 2007
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
@@ -71,7 +71,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -126,7 +126,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /USECL:MS_ITANIUM"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="0"
@@ -181,7 +181,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /USECL:MS_OPTERON"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -234,7 +234,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\_ctypes\_ctypes_test.c">
+			RelativePath="..\..\Modules\_ctypes\_ctypes_test.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/_elementtree.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_elementtree.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_elementtree.vcproj	Mon Dec 31 17:18:22 2007
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
 				PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -75,7 +75,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -132,7 +132,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -193,7 +193,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -247,16 +247,16 @@
 	</References>
 	<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>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/_msi.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_msi.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_msi.vcproj	Mon Dec 31 17:18:22 2007
@@ -5,7 +5,7 @@
 	Name="_msi"
 	ProjectGUID="{2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}"
 	SccProjectName="_msi"
-	SccLocalPath="..\pc">
+	SccLocalPath="..\..\pc">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -22,7 +22,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -77,7 +77,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -132,7 +132,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -192,7 +192,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -244,7 +244,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\PC\_msi.c">
+			RelativePath="..\..\PC\_msi.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/_socket.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_socket.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_socket.vcproj	Mon Dec 31 17:18:22 2007
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -74,7 +74,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -131,7 +131,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -192,7 +192,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -246,7 +246,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\socketmodule.c">
+			RelativePath="..\..\Modules\socketmodule.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/_sqlite3.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_sqlite3.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_sqlite3.vcproj	Mon Dec 31 17:18:22 2007
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\Include;..\..\PC;..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
+				AdditionalDependencies="..\..\..\sqlite-source-3.3.4\sqlite3.lib"
 				OutputFile="./_sqlite3_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -76,7 +76,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\Include;..\..\PC;..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
+				AdditionalDependencies="..\..\..\sqlite-source-3.3.4\sqlite3.lib"
 				OutputFile="./_sqlite3.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -134,7 +134,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\Include;..\..\PC;..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -152,7 +152,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\sqlite-source-3.3.4\ia64\sqlite3.lib"
+				AdditionalDependencies="..\..\..\sqlite-source-3.3.4\ia64\sqlite3.lib"
 				OutputFile="./_sqlite3.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -196,7 +196,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
+				AdditionalIncludeDirectories="..\..\Include;..\..\PC;..\..\..\sqlite-source-3.3.4"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\sqlite-source-3.3.4\amd64\sqlite3.lib"
+				AdditionalDependencies="..\..\..\sqlite-source-3.3.4\amd64\sqlite3.lib"
 				OutputFile="./_sqlite3.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -251,31 +251,31 @@
 	</References>
 	<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>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/_ssl.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_ssl.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_ssl.vcproj	Mon Dec 31 17:18:22 2007
@@ -73,10 +73,10 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\_ssl.c">
+			RelativePath="..\..\Modules\_ssl.c">
 		</File>
 		<File
-			RelativePath="..\Modules\_hashopenssl.c">
+			RelativePath="..\..\Modules\_hashopenssl.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/_testcapi.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_testcapi.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_testcapi.vcproj	Mon Dec 31 17:18:22 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -129,7 +129,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -188,7 +188,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -239,7 +239,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\_testcapimodule.c">
+			RelativePath="..\..\Modules\_testcapimodule.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/_tkinter.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/_tkinter.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/_tkinter.vcproj	Mon Dec 31 17:18:22 2007
@@ -4,7 +4,7 @@
 	Version="7.10"
 	Name="_tkinter"
 	SccProjectName="_tkinter"
-	SccLocalPath="..\..\..">
+	SccLocalPath="..\..\..\..">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\..\tcltk\include,..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
+				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
 				OutputFile="./_tkinter.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\..\tcltk\include,..\..\Include,..\..\PC"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WITH_APPINIT"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
+				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
 				OutputFile="./_tkinter_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -133,7 +133,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\..\tcltk\include,..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -151,7 +151,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
+				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
 				OutputFile="./_tkinter.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -195,7 +195,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\tcltk\include,..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\..\tcltk\include,..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WITH_APPINIT"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\tcltk\lib\tk84.lib ..\..\tcltk\lib\tcl84.lib odbccp32.lib"
+				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
 				OutputFile="./_tkinter.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -250,10 +250,10 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\_tkinter.c">
+			RelativePath="..\..\Modules\_tkinter.c">
 		</File>
 		<File
-			RelativePath="..\Modules\tkappinit.c">
+			RelativePath="..\..\Modules\tkappinit.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/bz2.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/bz2.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/bz2.vcproj	Mon Dec 31 17:18:22 2007
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\..\bzip2-1.0.3"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
+				AdditionalDependencies="..\..\..\bzip2-1.0.3\libbz2.lib"
 				OutputFile="./bz2_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -52,7 +52,7 @@
 				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				CommandLine="cd ..\..\bzip2-1.0.3
+				CommandLine="cd ..\..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc
 "/>
 			<Tool
@@ -79,7 +79,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\..\bzip2-1.0.3"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -93,7 +93,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
+				AdditionalDependencies="..\..\..\bzip2-1.0.3\libbz2.lib"
 				OutputFile="./bz2.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -112,7 +112,7 @@
 				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				CommandLine="cd ..\..\bzip2-1.0.3
+				CommandLine="cd ..\..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc lib
 "/>
 			<Tool
@@ -140,7 +140,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\..\bzip2-1.0.3"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -158,7 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
+				AdditionalDependencies="..\..\..\bzip2-1.0.3\libbz2.lib"
 				OutputFile="./bz2.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -177,7 +177,7 @@
 				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				CommandLine="cd ..\..\bzip2-1.0.3
+				CommandLine="cd ..\..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc lib
 "/>
 			<Tool
@@ -205,7 +205,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\..\bzip2-1.0.3"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -223,7 +223,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
+				AdditionalDependencies="..\..\..\bzip2-1.0.3\libbz2.lib"
 				OutputFile="./bz2.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -242,7 +242,7 @@
 				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				CommandLine="cd ..\..\bzip2-1.0.3
+				CommandLine="cd ..\..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc lib
 "/>
 			<Tool
@@ -263,7 +263,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\bz2module.c">
+			RelativePath="..\..\Modules\bz2module.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/make_versioninfo.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/make_versioninfo.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/make_versioninfo.vcproj	Mon Dec 31 17:18:22 2007
@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -35,9 +35,9 @@
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				CommandLine=".\make_versioninfo.exe &gt;..\PC\pythonnt_rc.h
+				CommandLine=".\make_versioninfo.exe &gt;..\..\PC\pythonnt_rc.h
 "
-				Outputs="..\PC\pythonnt_rc.h"/>
+				Outputs="..\..\PC\pythonnt_rc.h"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbccp32.lib"
@@ -53,7 +53,7 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetFileName) &gt; ..\PC\python_nt.h"/>
+				CommandLine="$(TargetFileName) &gt; ..\..\PC\python_nt.h"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -82,7 +82,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -93,9 +93,9 @@
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				CommandLine=".\make_versioninfo_d.exe &gt;..\PC\pythonnt_rc_d.h
+				CommandLine=".\make_versioninfo_d.exe &gt;..\..\PC\pythonnt_rc_d.h
 "
-				Outputs="..\PC\pythonnt_rc_d.h"/>
+				Outputs="..\..\PC\pythonnt_rc_d.h"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbccp32.lib"
@@ -111,7 +111,7 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(TargetFileName) &gt; ..\PC\python_nt_d.h"/>
+				CommandLine="$(TargetFileName) &gt; ..\..\PC\python_nt_d.h"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -134,7 +134,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\PC\make_versioninfo.c">
+			RelativePath="..\..\PC\make_versioninfo.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/pyexpat.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/pyexpat.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/pyexpat.vcproj	Mon Dec 31 17:18:22 2007
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
 				PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -74,7 +74,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -131,7 +131,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -192,7 +192,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON  /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC,..\..\Modules\expat"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -246,16 +246,16 @@
 	</References>
 	<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>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/python.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/python.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/python.vcproj	Mon Dec 31 17:18:22 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -80,7 +80,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -115,7 +115,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\Include"/>
+				AdditionalIncludeDirectories="..\..\Include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -140,7 +140,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM  /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -204,7 +204,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -260,13 +260,13 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\PC\pycon.ico">
+			RelativePath="..\..\PC\pycon.ico">
 		</File>
 		<File
-			RelativePath="..\Modules\python.c">
+			RelativePath="..\..\Modules\python.c">
 		</File>
 		<File
-			RelativePath="..\PC\python_exe.rc">
+			RelativePath="..\..\PC\python_exe.rc">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/pythoncore.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/pythoncore.vcproj	Mon Dec 31 17:18:22 2007
@@ -24,7 +24,7 @@
 				AdditionalOptions="/Zm200 "
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -63,7 +63,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\Include"/>
+				AdditionalIncludeDirectories="..\..\Include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -86,7 +86,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200 "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -123,7 +123,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\Include"/>
+				AdditionalIncludeDirectories="..\..\Include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -147,7 +147,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -190,7 +190,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\Include"/>
+				AdditionalIncludeDirectories="..\..\Include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -214,7 +214,7 @@
 				AdditionalOptions="/Zm200  /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -257,7 +257,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\Include"/>
+				AdditionalIncludeDirectories="..\..\Include"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -277,528 +277,528 @@
 			Name="zlib"
 			Filter="">
 			<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\deflate.c">
+				RelativePath="..\..\Modules\zlib\deflate.c">
 			</File>
 			<File
-				RelativePath="..\Modules\zlib\gzio.c">
+				RelativePath="..\..\Modules\zlib\gzio.c">
 			</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\inflate.c">
+				RelativePath="..\..\Modules\zlib\inflate.c">
 			</File>
 			<File
-				RelativePath="..\Modules\zlib\inftrees.c">
+				RelativePath="..\..\Modules\zlib\inftrees.c">
 			</File>
 			<File
-				RelativePath="..\Modules\zlib\trees.c">
+				RelativePath="..\..\Modules\zlib\trees.c">
 			</File>
 			<File
-				RelativePath="..\Modules\zlib\uncompr.c">
+				RelativePath="..\..\Modules\zlib\uncompr.c">
 			</File>
 			<File
-				RelativePath="..\Modules\zlibmodule.c">
+				RelativePath="..\..\Modules\zlibmodule.c">
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="..\Modules\zlib"/>
+						AdditionalIncludeDirectories="..\..\Modules\zlib"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="..\Modules\zlib"/>
+						AdditionalIncludeDirectories="..\..\Modules\zlib"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="ReleaseItanium|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="..\Modules\zlib"/>
+						AdditionalIncludeDirectories="..\..\Modules\zlib"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="ReleaseAMD64|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="..\Modules\zlib"/>
+						AdditionalIncludeDirectories="..\..\Modules\zlib"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\Modules\zlib\zutil.c">
+				RelativePath="..\..\Modules\zlib\zutil.c">
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\Modules\_bisectmodule.c">
+			RelativePath="..\..\Modules\_bisectmodule.c">
 		</File>
 		<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\_codecsmodule.c">
+			RelativePath="..\..\Modules\_codecsmodule.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\_hotshot.c">
+			RelativePath="..\..\Modules\_hotshot.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\_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="..\Pc\_subprocess.c">
+			RelativePath="..\..\Pc\_subprocess.c">
 		</File>
 		<File
-			RelativePath="..\Modules\_typesmodule.c">
+			RelativePath="..\..\Modules\_typesmodule.c">
 		</File>
 		<File
-			RelativePath="..\Modules\_weakref.c">
+			RelativePath="..\..\Modules\_weakref.c">
 		</File>
 		<File
-			RelativePath="..\Pc\_winreg.c">
+			RelativePath="..\..\Pc\_winreg.c">
 		</File>
 		<File
-			RelativePath="..\Objects\abstract.c">
+			RelativePath="..\..\Objects\abstract.c">
 		</File>
 		<File
-			RelativePath="..\Parser\acceler.c">
+			RelativePath="..\..\Parser\acceler.c">
 		</File>
 		<File
-			RelativePath="..\Modules\arraymodule.c">
+			RelativePath="..\..\Modules\arraymodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\asdl.c">
+			RelativePath="..\..\Python\asdl.c">
 		</File>
 		<File
-			RelativePath="..\Python\ast.c">
+			RelativePath="..\..\Python\ast.c">
 		</File>
 		<File
-			RelativePath="..\Modules\audioop.c">
+			RelativePath="..\..\Modules\audioop.c">
 		</File>
 		<File
-			RelativePath="..\Modules\binascii.c">
+			RelativePath="..\..\Modules\binascii.c">
 		</File>
 		<File
-			RelativePath="..\Parser\bitset.c">
+			RelativePath="..\..\Parser\bitset.c">
 		</File>
 		<File
-			RelativePath="..\Python\bltinmodule.c">
+			RelativePath="..\..\Python\bltinmodule.c">
 		</File>
 		<File
-			RelativePath="..\Objects\boolobject.c">
+			RelativePath="..\..\Objects\boolobject.c">
 		</File>
 		<File
-			RelativePath="..\Objects\bufferobject.c">
+			RelativePath="..\..\Objects\bufferobject.c">
 		</File>
 		<File
-			RelativePath="..\Objects\cellobject.c">
+			RelativePath="..\..\Objects\cellobject.c">
 		</File>
 		<File
-			RelativePath="..\Python\ceval.c">
+			RelativePath="..\..\Python\ceval.c">
 		</File>
 		<File
-			RelativePath="..\Objects\classobject.c">
+			RelativePath="..\..\Objects\classobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\cmathmodule.c">
+			RelativePath="..\..\Modules\cmathmodule.c">
 		</File>
 		<File
-			RelativePath="..\Objects\cobject.c">
+			RelativePath="..\..\Objects\cobject.c">
 		</File>
 		<File
-			RelativePath="..\Python\codecs.c">
+			RelativePath="..\..\Python\codecs.c">
 		</File>
 		<File
-			RelativePath="..\Objects\codeobject.c">
+			RelativePath="..\..\Objects\codeobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\_collectionsmodule.c">
+			RelativePath="..\..\Modules\_collectionsmodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\compile.c">
+			RelativePath="..\..\Python\compile.c">
 		</File>
 		<File
-			RelativePath="..\Objects\complexobject.c">
+			RelativePath="..\..\Objects\complexobject.c">
 		</File>
 		<File
-			RelativePath="..\PC\config.c">
+			RelativePath="..\..\PC\config.c">
 		</File>
 		<File
-			RelativePath="..\Modules\cPickle.c">
+			RelativePath="..\..\Modules\cPickle.c">
 		</File>
 		<File
-			RelativePath="..\Modules\cStringIO.c">
+			RelativePath="..\..\Modules\cStringIO.c">
 		</File>
 		<File
-			RelativePath="..\Modules\datetimemodule.c">
+			RelativePath="..\..\Modules\datetimemodule.c">
 		</File>
 		<File
-			RelativePath="..\Objects\descrobject.c">
+			RelativePath="..\..\Objects\descrobject.c">
 		</File>
 		<File
-			RelativePath="..\Objects\dictobject.c">
+			RelativePath="..\..\Objects\dictobject.c">
 		</File>
 		<!--File
-			RelativePath="..\Objects\doubledigits.c">
+			RelativePath="..\..\Objects\doubledigits.c">
 		</File-->
 		<File
-			RelativePath="..\PC\dl_nt.c">
+			RelativePath="..\..\PC\dl_nt.c">
 		</File>
 		<File
-			RelativePath="..\Python\dynload_win.c">
+			RelativePath="..\..\Python\dynload_win.c">
 		</File>
 		<File
-			RelativePath="..\Objects\enumobject.c">
+			RelativePath="..\..\Objects\enumobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\errnomodule.c">
+			RelativePath="..\..\Modules\errnomodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\errors.c">
+			RelativePath="..\..\Python\errors.c">
 		</File>
 		<File
-			RelativePath="..\Objects\exceptions.c">
+			RelativePath="..\..\Objects\exceptions.c">
 		</File>
 		<File
-			RelativePath="..\Objects\fileobject.c">
+			RelativePath="..\..\Objects\fileobject.c">
 		</File>
 		<File
-			RelativePath="..\Parser\firstsets.c">
+			RelativePath="..\..\Parser\firstsets.c">
 		</File>
 		<File
-			RelativePath="..\Objects\floatobject.c">
+			RelativePath="..\..\Objects\floatobject.c">
 		</File>
 		<File
-			RelativePath="..\Objects\frameobject.c">
+			RelativePath="..\..\Objects\frameobject.c">
 		</File>
 		<File
-			RelativePath="..\Python\frozen.c">
+			RelativePath="..\..\Python\frozen.c">
 		</File>
 		<File
-			RelativePath="..\Objects\funcobject.c">
+			RelativePath="..\..\Objects\funcobject.c">
 		</File>
 		<File
-			RelativePath="..\Python\future.c">
+			RelativePath="..\..\Python\future.c">
 		</File>
 		<File
-			RelativePath="..\Modules\gcmodule.c">
+			RelativePath="..\..\Modules\gcmodule.c">
 		</File>
 		<File
-			RelativePath="..\Objects\genobject.c">
+			RelativePath="..\..\Objects\genobject.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\getmtime.c">
+			RelativePath="..\..\Python\getmtime.c">
 		</File>
 		<File
-			RelativePath="..\Python\getopt.c">
+			RelativePath="..\..\Python\getopt.c">
 		</File>
 		<File
-			RelativePath="..\PC\getpathp.c">
+			RelativePath="..\..\PC\getpathp.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="..\Parser\grammar.c">
+			RelativePath="..\..\Parser\grammar.c">
 		</File>
 		<File
-			RelativePath="..\Parser\grammar1.c">
+			RelativePath="..\..\Parser\grammar1.c">
 		</File>
 		<File
-			RelativePath="..\Modules\imageop.c">
+			RelativePath="..\..\Modules\imageop.c">
 		</File>
 		<File
-			RelativePath="..\Python\import.c">
+			RelativePath="..\..\Python\import.c">
 		</File>
 		<File
-			RelativePath="..\PC\import_nt.c">
+			RelativePath="..\..\PC\import_nt.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories="..\Python"/>
+					AdditionalIncludeDirectories="..\..\Python"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories="..\Python"/>
+					AdditionalIncludeDirectories="..\..\Python"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="ReleaseItanium|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories="..\Python"/>
+					AdditionalIncludeDirectories="..\..\Python"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="ReleaseAMD64|Win32">
 				<Tool
 					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories="..\Python"/>
+					AdditionalIncludeDirectories="..\..\Python"/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\importdl.c">
+			RelativePath="..\..\Python\importdl.c">
 		</File>
 		<File
-			RelativePath="..\Objects\intobject.c">
+			RelativePath="..\..\Objects\intobject.c">
 		</File>
 		<File
-			RelativePath="..\Objects\iterobject.c">
+			RelativePath="..\..\Objects\iterobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\itertoolsmodule.c">
+			RelativePath="..\..\Modules\itertoolsmodule.c">
 		</File>
 		<File
-			RelativePath="..\Parser\listnode.c">
+			RelativePath="..\..\Parser\listnode.c">
 		</File>
 		<File
-			RelativePath="..\Objects\listobject.c">
+			RelativePath="..\..\Objects\listobject.c">
 		</File>
 		<File
-			RelativePath="..\Objects\longobject.c">
+			RelativePath="..\..\Objects\longobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\main.c">
+			RelativePath="..\..\Modules\main.c">
 		</File>
 		<File
-			RelativePath="..\Python\marshal.c">
+			RelativePath="..\..\Python\marshal.c">
 		</File>
 		<File
-			RelativePath="..\Modules\mathmodule.c">
+			RelativePath="..\..\Modules\mathmodule.c">
 		</File>
 		<File
-			RelativePath="..\Modules\md5.c">
+			RelativePath="..\..\Modules\md5.c">
 		</File>
 		<File
-			RelativePath="..\Modules\md5module.c">
+			RelativePath="..\..\Modules\md5module.c">
 		</File>
 		<File
-			RelativePath="..\Parser\metagrammar.c">
+			RelativePath="..\..\Parser\metagrammar.c">
 		</File>
 		<File
-			RelativePath="..\Objects\methodobject.c">
+			RelativePath="..\..\Objects\methodobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\mmapmodule.c">
+			RelativePath="..\..\Modules\mmapmodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\modsupport.c">
+			RelativePath="..\..\Python\modsupport.c">
 		</File>
 		<File
-			RelativePath="..\Objects\moduleobject.c">
+			RelativePath="..\..\Objects\moduleobject.c">
 		</File>
 		<File
-			RelativePath="..\PC\msvcrtmodule.c">
+			RelativePath="..\..\PC\msvcrtmodule.c">
 		</File>
 		<File
-			RelativePath="..\Modules\cjkcodecs\multibytecodec.c">
+			RelativePath="..\..\Modules\cjkcodecs\multibytecodec.c">
 		</File>
 		<File
-			RelativePath="..\Parser\myreadline.c">
+			RelativePath="..\..\Parser\myreadline.c">
 		</File>
 		<File
-			RelativePath="..\Python\mysnprintf.c">
+			RelativePath="..\..\Python\mysnprintf.c">
 		</File>
 		<File
-			RelativePath="..\Python\mystrtoul.c">
+			RelativePath="..\..\Python\mystrtoul.c">
 		</File>
 		<File
-			RelativePath="..\Parser\node.c">
+			RelativePath="..\..\Parser\node.c">
 		</File>
 		<File
-			RelativePath="..\Objects\object.c">
+			RelativePath="..\..\Objects\object.c">
 		</File>
 		<File
-			RelativePath="..\Objects\obmalloc.c">
+			RelativePath="..\..\Objects\obmalloc.c">
 		</File>
 		<File
-			RelativePath="..\Modules\operator.c">
+			RelativePath="..\..\Modules\operator.c">
 		</File>
 		<File
-			RelativePath="..\Parser\parser.c">
+			RelativePath="..\..\Parser\parser.c">
 		</File>
 		<File
-			RelativePath="..\Modules\parsermodule.c">
+			RelativePath="..\..\Modules\parsermodule.c">
 		</File>
 		<File
-			RelativePath="..\Parser\parsetok.c">
+			RelativePath="..\..\Parser\parsetok.c">
 		</File>
 		<File
-			RelativePath="..\Python\peephole.c">
+			RelativePath="..\..\Python\peephole.c">
 		</File>
 		<File
-			RelativePath="..\Modules\posixmodule.c">
+			RelativePath="..\..\Modules\posixmodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\pyarena.c">
+			RelativePath="..\..\Python\pyarena.c">
 		</File>
 		<File
-			RelativePath="..\Python\pyfpe.c">
+			RelativePath="..\..\Python\pyfpe.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\Python-ast.c">
+			RelativePath="..\..\Python\Python-ast.c">
 		</File>
 		<File
-			RelativePath="..\PC\python_nt.rc">
+			RelativePath="..\..\PC\python_nt.rc">
 		</File>
 		<File
-			RelativePath="..\Python\pythonrun.c">
+			RelativePath="..\..\Python\pythonrun.c">
 		</File>
 		<File
-			RelativePath="..\Objects\rangeobject.c">
+			RelativePath="..\..\Objects\rangeobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\rotatingtree.c">
+			RelativePath="..\..\Modules\rotatingtree.c">
 		</File>
 		<File
-			RelativePath="..\Objects\setobject.c">
+			RelativePath="..\..\Objects\setobject.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\shamodule.c">
+			RelativePath="..\..\Modules\shamodule.c">
 		</File>
 		<File
-			RelativePath="..\Modules\signalmodule.c">
+			RelativePath="..\..\Modules\signalmodule.c">
 		</File>
 		<File
-			RelativePath="..\Objects\sliceobject.c">
+			RelativePath="..\..\Objects\sliceobject.c">
 		</File>
 		<File
-			RelativePath="..\Objects\stringobject.c">
+			RelativePath="..\..\Objects\stringobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\stropmodule.c">
+			RelativePath="..\..\Modules\stropmodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\structmember.c">
+			RelativePath="..\..\Python\structmember.c">
 		</File>
 		<File
-			RelativePath="..\Objects\structseq.c">
+			RelativePath="..\..\Objects\structseq.c">
 		</File>
 		<File
-			RelativePath="..\Python\symtable.c">
+			RelativePath="..\..\Python\symtable.c">
 		</File>
 		<File
-			RelativePath="..\Modules\symtablemodule.c">
+			RelativePath="..\..\Modules\symtablemodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\sysmodule.c">
+			RelativePath="..\..\Python\sysmodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\thread.c">
+			RelativePath="..\..\Python\thread.c">
 		</File>
 		<File
-			RelativePath="..\Modules\threadmodule.c">
+			RelativePath="..\..\Modules\threadmodule.c">
 		</File>
 		<File
-			RelativePath="..\Modules\timemodule.c">
+			RelativePath="..\..\Modules\timemodule.c">
 		</File>
 		<File
-			RelativePath="..\Parser\tokenizer.c">
+			RelativePath="..\..\Parser\tokenizer.c">
 		</File>
 		<File
-			RelativePath="..\Python\traceback.c">
+			RelativePath="..\..\Python\traceback.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\weakrefobject.c">
+			RelativePath="..\..\Objects\weakrefobject.c">
 		</File>
 		<File
-			RelativePath="..\Modules\xxsubtype.c">
+			RelativePath="..\..\Modules\xxsubtype.c">
 		</File>
 		<File
-			RelativePath="..\Modules\yuvconvert.c">
+			RelativePath="..\..\Modules\yuvconvert.c">
 		</File>
 		<File
-			RelativePath="..\Modules\zipimport.c">
+			RelativePath="..\..\Modules\zipimport.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/pythonw.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/pythonw.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/pythonw.vcproj	Mon Dec 31 17:18:22 2007
@@ -4,7 +4,7 @@
 	Version="7.10"
 	Name="pythonw"
 	SccProjectName="pythonw"
-	SccLocalPath="..\pc">
+	SccLocalPath="..\..\pc">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -75,7 +75,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -133,7 +133,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -195,7 +195,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -250,10 +250,10 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\PC\python_exe.rc">
+			RelativePath="..\..\PC\python_exe.rc">
 		</File>
 		<File
-			RelativePath="..\PC\WinMain.c">
+			RelativePath="..\..\PC\WinMain.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/select.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/select.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/select.vcproj	Mon Dec 31 17:18:22 2007
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -133,7 +133,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -195,7 +195,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -250,7 +250,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\selectmodule.c">
+			RelativePath="..\..\Modules\selectmodule.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/unicodedata.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/unicodedata.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/unicodedata.vcproj	Mon Dec 31 17:18:22 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -129,7 +129,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -188,7 +188,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -239,7 +239,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\Modules\unicodedata.c">
+			RelativePath="..\..\Modules\unicodedata.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/w9xpopen.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/w9xpopen.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/w9xpopen.vcproj	Mon Dec 31 17:18:22 2007
@@ -113,7 +113,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\PC\w9xpopen.c">
+			RelativePath="..\..\PC\w9xpopen.c">
 		</File>
 	</Files>
 	<Globals>

Modified: python/branches/py3k/PC/VS7.1/winsound.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/winsound.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/winsound.vcproj	Mon Dec 31 17:18:22 2007
@@ -4,7 +4,7 @@
 	Version="7.10"
 	Name="winsound"
 	SccProjectName="winsound"
-	SccLocalPath="..\pc">
+	SccLocalPath="..\..\pc">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -76,7 +76,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -131,7 +131,7 @@
 				AdditionalOptions=" /USECL:MS_ITANIUM /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -191,7 +191,7 @@
 				AdditionalOptions=" /USECL:MS_OPTERON /GS-"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC"
+				AdditionalIncludeDirectories="..\..\Include,..\..\PC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -243,7 +243,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\PC\winsound.c">
+			RelativePath="..\..\PC\winsound.c">
 		</File>
 	</Files>
 	<Globals>


More information about the Python-3000-checkins mailing list