Updated PC/VS8.0 with PCBuild/vs9to8.py.

9 files changed, 115 insertions, 91 deletions

diff --git a/PC/VS8.0/_multiprocessing.vcproj b/PC/VS8.0/_multiprocessing.vcproj
index 198b87a..ee76aec 100644
--- a/PC/VS8.0/_multiprocessing.vcproj
+++ b/PC/VS8.0/_multiprocessing.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="_multiprocessing"
-	ProjectGUID="{9e48b300-37d1-11dd-8c41-005056c00008}"
+	ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}"
 	RootNamespace="_multiprocessing"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
diff --git a/PC/VS8.0/_sqlite3.vcproj b/PC/VS8.0/_sqlite3.vcproj
index cbd02cc..d9e89c7 100644
--- a/PC/VS8.0/_sqlite3.vcproj
+++ b/PC/VS8.0/_sqlite3.vcproj
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -166,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -229,7 +229,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -354,7 +354,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -417,7 +417,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
@@ -480,7 +480,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
+				AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
 				PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
 			/>
 			<Tool
diff --git a/PC/VS8.0/bdist_wininst.vcproj b/PC/VS8.0/bdist_wininst.vcproj
index a0de04a..0bd2ee6 100644
--- a/PC/VS8.0/bdist_wininst.vcproj
+++ b/PC/VS8.0/bdist_wininst.vcproj
@@ -55,7 +55,7 @@
 				AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -145,7 +145,7 @@
 				AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
diff --git a/PC/VS8.0/pyd.vsprops b/PC/VS8.0/pyd.vsprops
index bfe6bd7..e38b961 100644
--- a/PC/VS8.0/pyd.vsprops
+++ b/PC/VS8.0/pyd.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>

+

 <VisualStudioPropertySheet

 	ProjectType="Visual C++"

 	Version="8.00"

@@ -15,6 +15,11 @@
 		OutputFile="$(OutDir)\$(ProjectName).pyd"

 		ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"

 		ImportLibrary="$(OutDir)\$(TargetName).lib"

+		GenerateManifest="false"

+	/>

+	<Tool

+		Name="VCManifestTool"

+		EmbedManifest="false"

 	/>

 	<Tool

 		Name="VCPostBuildEventTool"

diff --git a/PC/VS8.0/pyd_d.vsprops b/PC/VS8.0/pyd_d.vsprops
index f3a951c..313a30b 100644
--- a/PC/VS8.0/pyd_d.vsprops
+++ b/PC/VS8.0/pyd_d.vsprops
@@ -19,6 +19,11 @@
 		LinkIncremental="1"

 		ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"

 		ImportLibrary="$(OutDir)\$(TargetName).lib"

+		GenerateManifest="false"

+	/>

+	<Tool

+		Name="VCManifestTool"

+		EmbedManifest="false"

 	/>

 	<Tool

 		Name="VCPostBuildEventTool"

diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 5e4cde9..6494216 100644
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -50,7 +50,7 @@
 	/>

 	<UserMacro

 		Name="sqlite3Dir"

-		Value="$(externalsDir)\sqlite-3.5.9"

+		Value="$(externalsDir)\sqlite-3.6.21"

 	/>

 	<UserMacro

 		Name="bz2Dir"

@@ -58,7 +58,7 @@
 	/>

 	<UserMacro

 		Name="opensslDir"

-		Value="$(externalsDir)\openssl-0.9.8g"

+		Value="$(externalsDir)\openssl-1.0.0a"

 	/>

 	<UserMacro

 		Name="tcltkDir"

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 402ac3e..96f0544 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -703,10 +703,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Include\dtoa.h"
-				>
-			</File>			
-			<File
 				RelativePath="..\..\Include\dynamic_annotations.h"
 				>
 			</File>
@@ -847,6 +843,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Include\pycapsule.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Include\pyctype.h"
 				>
 			</File>
@@ -879,7 +879,7 @@
 				>
 			</File>
 			<File
-                                RelativePath="..\..\Include\pytime.h"
+				RelativePath="..\..\Include\pytime.h"
 				>
 			</File>
 			<File
@@ -903,6 +903,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Include\dtoa.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Include\Python-ast.h"
 				>
 			</File>
@@ -947,10 +951,6 @@
 				>
 			</File>
 			<File
-                                RelativePath="..\..\Include\_time.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Include\timefuncs.h"
 				>
 			</File>
@@ -998,38 +998,6 @@
 				RelativePath="..\..\Modules\_csv.c"
 				>
 			</File>
-			<Filter
-				Name="_io"
-				>
-				<File
-					RelativePath="..\..\Modules\_io\fileio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Modules\_io\bytesio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Modules\_io\stringio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Modules\_io\bufferedio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Modules\_io\iobase.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Modules\_io\textio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\Modules\_io\_iomodule.c"
-					>
-				</File>
-			</Filter>
 			<File
 				RelativePath="..\..\Modules\_functoolsmodule.c"
 				>
@@ -1075,6 +1043,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Modules\_time.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Modules\_time.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Modules\_weakref.c"
 				>
 			</File>
@@ -1175,10 +1151,6 @@
 				>
 			</File>
 			<File
-                                RelativePath="..\..\Modules\_time.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\timemodule.c"
 				>
 			</File>
@@ -1195,6 +1167,42 @@
 				>
 			</File>
 			<Filter
+				Name="_io"
+				>
+				<File
+					RelativePath="..\..\Modules\_io\fileio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\bytesio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\stringio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\bufferedio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\iobase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\textio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\_iomodule.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\_io\_iomodule.h"
+					>
+				</File>
+			</Filter>
+			<Filter
 				Name="zlib"
 				>
 				<File
@@ -1671,10 +1679,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Python\dtoa.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Python\dynload_win.c"
 				>
 			</File>
@@ -1771,7 +1775,7 @@
 				>
 			</File>
 			<File
-                                RelativePath="..\..\Python\pytime.c"
+				RelativePath="..\..\Python\pytime.c"
 				>
 			</File>
 			<File
@@ -1787,6 +1791,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Python\dtoa.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Python\Python-ast.c"
 				>
 			</File>
diff --git a/PC/VS8.0/sqlite3.vcproj b/PC/VS8.0/sqlite3.vcproj
index 071589a..e7e0728 100644
--- a/PC/VS8.0/sqlite3.vcproj
+++ b/PC/VS8.0/sqlite3.vcproj
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets=".\pyd_d.vsprops"
+			InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -42,8 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+				AdditionalIncludeDirectories=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,7 +82,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
+			InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops;.\x64.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -104,8 +103,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+				AdditionalIncludeDirectories=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -145,7 +143,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets=".\pyd.vsprops"
+			InheritedPropertySheets=".\sqlite3.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -166,8 +164,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+				AdditionalIncludeDirectories=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -207,7 +204,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
+			InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -229,8 +226,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+				AdditionalIncludeDirectories=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -270,7 +266,7 @@
 		<Configuration
 			Name="PGInstrument|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
+			InheritedPropertySheets=".\sqlite3.vsprops;.\pginstrument.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -291,8 +287,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+				AdditionalIncludeDirectories="&quot;..\..\..\sqlite-3.6.21&quot;"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -332,7 +327,7 @@
 		<Configuration
 			Name="PGInstrument|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
+			InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -354,8 +349,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+				AdditionalIncludeDirectories=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -394,7 +388,7 @@
 		<Configuration
 			Name="PGUpdate|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
+			InheritedPropertySheets=".\sqlite3.vsprops;.\pgupdate.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -415,8 +409,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+				AdditionalIncludeDirectories=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -456,7 +449,7 @@
 		<Configuration
 			Name="PGUpdate|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
+			InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -478,8 +471,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9"
-				PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
+				AdditionalIncludeDirectories=""
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -523,11 +515,11 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\..\..\sqlite-3.5.9\sqlite3.h"
+				RelativePath="..\..\..\sqlite-3.6.21\sqlite3.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\sqlite-3.5.9\sqlite3ext.h"
+				RelativePath="..\..\..\sqlite-3.6.21\sqlite3ext.h"
 				>
 			</File>
 		</Filter>
@@ -535,7 +527,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\..\..\sqlite-3.5.9\sqlite3.c"
+				RelativePath="..\..\..\sqlite-3.6.21\sqlite3.c"
 				>
 			</File>
 		</Filter>
diff --git a/PC/VS8.0/sqlite3.vsprops b/PC/VS8.0/sqlite3.vsprops
new file mode 100644
index 0000000..8300328
--- /dev/null
+++ b/PC/VS8.0/sqlite3.vsprops
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="sqlite3"

+	InheritedPropertySheets=".\pyproject.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"

+		PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"

+		WarningLevel="1"

+	/>

+</VisualStudioPropertySheet>