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

diff --git a/PC/VS8.0/_multiprocessing.vcproj b/PC/VS8.0/_multiprocessing.vcproj
index 198b87aa103dee3dc7354585d8cfd9cc51366ea9..ee76aecec3aaa5a4702139b661db1e0baa0da30f 100644 (file)
--- 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 cbd02cc3efa3a567ddc95cf7f30b58a282ca5b18..d9e89c73ce26550d43be0a900cc2f74301607cfc 100644 (file)
--- 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 a0de04a79ded720a12bbaaeeda1c7a2ea6e2cdb5..0bd2ee6de01c28efc4b910a7a2c06b114b0c8c43 100644 (file)
--- 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 bfe6bd7e2d4c36474fe8f1f4f3962aa21502702d..e38b9615a2375acfe7d8d5301d814a4a940b05be 100644 (file)
--- a/PC/VS8.0/pyd.vsprops
+++ b/PC/VS8.0/pyd.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
+\r
 <VisualStudioPropertySheet\r
        ProjectType="Visual C++"\r
        Version="8.00"\r
@@ -15,6 +15,11 @@
                OutputFile="$(OutDir)\$(ProjectName).pyd"\r
                ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"\r
                ImportLibrary="$(OutDir)\$(TargetName).lib"\r
+               GenerateManifest="false"\r
+       />\r
+       <Tool\r
+               Name="VCManifestTool"\r
+               EmbedManifest="false"\r
        />\r
        <Tool\r
                Name="VCPostBuildEventTool"\r

diff --git a/PC/VS8.0/pyd_d.vsprops b/PC/VS8.0/pyd_d.vsprops
index f3a951c53f542028d845543ec8f362a12f8cb14c..313a30b782fd555f1fbf4f3c37be9fb87fd2e206 100644 (file)
--- a/PC/VS8.0/pyd_d.vsprops
+++ b/PC/VS8.0/pyd_d.vsprops
@@ -19,6 +19,11 @@
                LinkIncremental="1"\r
                ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"\r
                ImportLibrary="$(OutDir)\$(TargetName).lib"\r
+               GenerateManifest="false"\r
+       />\r
+       <Tool\r
+               Name="VCManifestTool"\r
+               EmbedManifest="false"\r
        />\r
        <Tool\r
                Name="VCPostBuildEventTool"\r

diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 5e4cde9c377dc0ef9ea71b18c28f649e8c703966..64942160e26685d2d2c7d39aa561a2806cb4f106 100644 (file)
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -50,7 +50,7 @@
        />\r
        <UserMacro\r
                Name="sqlite3Dir"\r
-               Value="$(externalsDir)\sqlite-3.5.9"\r
+               Value="$(externalsDir)\sqlite-3.6.21"\r
        />\r
        <UserMacro\r
                Name="bz2Dir"\r
@@ -58,7 +58,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-0.9.8g"\r
+               Value="$(externalsDir)\openssl-1.0.0a"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 402ac3ee90a72e6c15d099920e6e22163b405512..96f05440a33145a7e80fb224d3644143301307e3 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -702,10 +702,6 @@
                                RelativePath="..\..\Include\dictobject.h"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\Include\dtoa.h"
-                               >
-                       </File>                 
                        <File
                                RelativePath="..\..\Include\dynamic_annotations.h"
                                >
@@ -846,6 +842,10 @@
                                RelativePath="..\..\Include\pyarena.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\Include\pycapsule.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\Include\pyctype.h"
                                >
@@ -879,7 +879,7 @@
                                >
                        </File>
                        <File
-                                RelativePath="..\..\Include\pytime.h"
+                               RelativePath="..\..\Include\pytime.h"
                                >
                        </File>
                        <File
@@ -902,6 +902,10 @@
                                RelativePath="..\..\Include\pystrtod.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\Include\dtoa.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\Include\Python-ast.h"
                                >
@@ -946,10 +950,6 @@
                                RelativePath="..\..\Include\sysmodule.h"
                                >
                        </File>
-                       <File
-                                RelativePath="..\..\Include\_time.h"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\Include\timefuncs.h"
                                >
@@ -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"
                                >
@@ -1074,6 +1042,14 @@
                                RelativePath="..\..\Modules\_struct.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\Modules\_time.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\Modules\_time.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\Modules\_weakref.c"
                                >
@@ -1174,10 +1150,6 @@
                                RelativePath="..\..\Modules\_threadmodule.c"
                                >
                        </File>
-                       <File
-                                RelativePath="..\..\Modules\_time.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\Modules\timemodule.c"
                                >
@@ -1194,6 +1166,42 @@
                                RelativePath="..\..\Modules\zlibmodule.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>
+                               <File
+                                       RelativePath="..\..\Modules\_io\_iomodule.h"
+                                       >
+                               </File>
+                       </Filter>
                        <Filter
                                Name="zlib"
                                >
@@ -1670,10 +1678,6 @@
                                RelativePath="..\..\Python\dynamic_annotations.c"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\Python\dtoa.c"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\Python\dynload_win.c"
                                >
@@ -1771,7 +1775,7 @@
                                >
                        </File>
                        <File
-                                RelativePath="..\..\Python\pytime.c"
+                               RelativePath="..\..\Python\pytime.c"
                                >
                        </File>
                        <File
@@ -1786,6 +1790,10 @@
                                RelativePath="..\..\Python\pystrtod.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\Python\dtoa.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\Python\Python-ast.c"
                                >

diff --git a/PC/VS8.0/sqlite3.vcproj b/PC/VS8.0/sqlite3.vcproj
index 071589a7ff28c485dcca004265635a45280ae8cc..e7e072880c63bb9bd3b237883d4eae6aaf90714f 100644 (file)
--- 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 (file)
index 0000000..8300328
--- /dev/null
+++ b/PC/VS8.0/sqlite3.vsprops
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioPropertySheet\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="sqlite3"\r
+       InheritedPropertySheets=".\pyproject.vsprops"\r
+       >\r
+       <Tool\r
+               Name="VCCLCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"\r
+               PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"\r
+               WarningLevel="1"\r
+       />\r
+</VisualStudioPropertySheet>\r