diff options
| author | Trent Nelson <trent.nelson@snakebite.org> | 2008-03-19 07:45:19 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent.nelson@snakebite.org> | 2008-03-19 07:45:19 (GMT) |
| commit | 05a96641b4aef8a8f61db9d55cc051f39260b12f (patch) | |
| tree | e81bbb26ecd8876c4799f7e8f2231af3caf1688c | |
| parent | b27745fb6d522b18cef532e4b51c9368d568e90e (diff) | |
| download | cpython-05a96641b4aef8a8f61db9d55cc051f39260b12f.zip cpython-05a96641b4aef8a8f61db9d55cc051f39260b12f.tar.gz cpython-05a96641b4aef8a8f61db9d55cc051f39260b12f.tar.bz2 | |
Refine the Visual Studio 2008 build solution in order to improve how we deal with external components, as well as fixing outstanding issues with Windows x64 build support. Introduce two new .vcproj files, _bsddb44.vcproj and sqlite3.vcproj, which replace the previous pre-link event scripts for _bsddb and _sqlite3 respectively. The new project files inherit from our property files as if they were any other Python module. This has numerous benefits. First, the components get built with exactly the same compiler flags and settings as the rest of Python. Second, it makes it much easier to debug problems in the external components when they're part of the build system. Third, they'll benefit from profile guided optimisation in the release builds, just like the rest of Python core.
I've also introduced a slightly new pattern for managing externals in subversion. New components get checked in as <name>-<version>.x, where <version> matches the exact vendor version string. After the initial import of the external component, the .x is tagged as .0 (i.e. tcl-8.4.18.x -> tcl-8.4.18.0). Some components may not need any tweaking, whereas there are others that might (tcl/tk fall into this bucket). In that case, the relevant modifications are made to the .x branch, which will be subsequently tagged as .1 (and then n+1 going forward) when they build successfully and all tests pass. Buildbots will be converted to rely on these explicit tags only, which makes it easy for us to switch them over to a new version as and when required. (Simple change to external(-amd64).bat: if we've bumped tcl to 8.4.18.1, change the .bat to rmdir 8.4.18.0 if it exists and check out a new .1 copy.)
| -rw-r--r-- | PCbuild/_bsddb.vcproj | 43 | ||||
| -rw-r--r-- | PCbuild/_bsddb44.vcproj | 1252 | ||||
| -rw-r--r-- | PCbuild/_sqlite3.vcproj | 26 | ||||
| -rw-r--r-- | PCbuild/_tkinter.vcproj | 12 | ||||
| -rw-r--r-- | PCbuild/pcbuild.sln | 38 | ||||
| -rw-r--r-- | PCbuild/pyproject.vsprops | 38 | ||||
| -rw-r--r-- | PCbuild/sqlite3.vcproj | 743 | ||||
| -rw-r--r-- | Tools/buildbot/external-amd64.bat | 27 |
8 files changed, 2101 insertions, 78 deletions
diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj index 3efdcce..f9d77e8 100644 --- a/PCbuild/_bsddb.vcproj +++ b/PCbuild/_bsddb.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="_bsddb" ProjectGUID="{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" RootNamespace="_bsddb" @@ -42,7 +42,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -52,11 +52,9 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
vcbuild /useenv db_static.vcproj "Debug|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib" BaseAddress="0x1e180000" /> <Tool @@ -105,7 +103,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -115,11 +113,11 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist "x64\Debug AMD64\db_static.lib" exit 0
vcbuild /useenv db_static.vcproj "Debug AMD64|x64"
" + CommandLine="" /> <Tool Name="VCLinkerTool" - AdditionalDependencies=""$(bsddbDir)x64\Debug AMD64\db_static.lib"" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -168,7 +166,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -178,11 +176,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -232,7 +229,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -242,11 +239,11 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist x64\Release AMD64\db_static.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" + CommandLine="" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -295,7 +292,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -305,11 +302,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -359,7 +355,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -369,11 +365,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist "x64\Release AMD64\db_static.lib" exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" TargetMachine="17" /> @@ -423,7 +418,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -433,11 +428,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -487,7 +481,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -497,11 +491,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist x64\Release AMD64\db_static.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" TargetMachine="17" /> diff --git a/PCbuild/_bsddb44.vcproj b/PCbuild/_bsddb44.vcproj new file mode 100644 index 0000000..73032ca --- /dev/null +++ b/PCbuild/_bsddb44.vcproj @@ -0,0 +1,1252 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="_bsddb44"
+ ProjectGUID="{62172C7D-B39E-409A-B352-370FF5098C19}"
+ RootNamespace="_bsddb44"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\pyd_d.vsprops"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\..;""
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\..;""
+ PreprocessorDefinitions="DIAGNOSTIC"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\pyd.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\..;""
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\..;""
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="PGInstrument|Win32"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\..;""
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="PGInstrument|x64"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\..;""
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="PGUpdate|Win32"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\..;""
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="PGUpdate|x64"
+ ConfigurationType="4"
+ InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(bsddbDir);$(bsddbDir)\..;""
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ >
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_compact.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_compare.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_conv.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_curadj.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_cursor.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_delete.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_open.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_put.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_rec.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_reclaim.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_recno.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_rsearch.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_search.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_split.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_upgrade.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\bt_verify.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\btree\btree_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\crdel_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\crdel_rec.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\crypto_stub.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_am.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\db_byteorder.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_cam.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\db_clock.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_conv.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_dispatch.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_dup.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\db_err.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\db_getlong.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\db_idspace.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_iface.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_join.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\db_log2.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_meta.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_open.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_overflow.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_ovfl_vrfy.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_pr.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_rec.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_reclaim.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_remove.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_rename.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_ret.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\db_salloc.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_setid.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_setlsn.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\db_shash.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_stati.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_truncate.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_upg.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_upg_opd.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_vrfy.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\db\db_vrfyutil.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\dbm\dbm.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\dbreg\dbreg.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\dbreg\dbreg_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\dbreg\dbreg_rec.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\dbreg\dbreg_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\dbreg\dbreg_util.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\env_failchk.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\env_file.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\env_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\env_open.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\env_recover.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\env_region.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\env_register.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\env\env_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\fileops\fileops_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\fileops\fop_basic.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\fileops\fop_rec.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\fileops\fop_util.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_conv.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_dup.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_func.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_meta.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_open.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_page.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_rec.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_reclaim.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_upgrade.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hash\hash_verify.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hmac\hmac.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hsearch\hsearch.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_deadlock.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_failchk.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_id.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_list.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_region.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_timer.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\lock\lock_util.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\log\log.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\log\log_archive.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\log\log_compare.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\log\log_debug.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\log\log_get.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\log\log_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\log\log_put.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\log\log_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_alloc.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_bh.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_fget.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_fmethod.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_fopen.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_fput.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_fset.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_region.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_register.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_sync.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mp\mp_trickle.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mutex\mut_alloc.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mutex\mut_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mutex\mut_region.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mutex\mut_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\mutex\mut_win32.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_abs.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_alloc.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_clock.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_config.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_dir.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_errno.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_fid.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_flock.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_fsync.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_handle.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_id.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_map.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_mkdir.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_oflags.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_open.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_region.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_rename.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_root.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_rpath.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_rw.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_seek.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_sleep.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_spin.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os\os_tmpdir.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_truncate.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\os_win32\os_unlink.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_conv.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_files.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_open.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_rec.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_upgrade.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\qam\qam_verify.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_backup.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_elect.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_log.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_record.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_region.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_util.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\rep\rep_verify.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\sequence\seq_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\sequence\sequence.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\hmac\sha1.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\clib\strcasecmp.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_auto.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_chkpt.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_failchk.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_method.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_rec.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_recover.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_region.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_stat.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\txn\txn_util.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\util_cache.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\util_log.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\common\util_sig.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\xa\xa.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\xa\xa_db.c"
+ >
+ </File>
+ <File
+ RelativePath="$(bsddbDir)\..\xa\xa_map.c"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/PCbuild/_sqlite3.vcproj b/PCbuild/_sqlite3.vcproj index 646c545..19d5497 100644 --- a/PCbuild/_sqlite3.vcproj +++ b/PCbuild/_sqlite3.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="_sqlite3" ProjectGUID="{13CECB97-4119-4316-9D42-8534019A5A44}" RootNamespace="_sqlite3" @@ -53,12 +53,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -118,12 +115,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -183,12 +177,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -249,12 +240,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -314,12 +302,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -380,12 +365,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" TargetMachine="17" /> @@ -446,12 +428,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -512,12 +491,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" TargetMachine="17" /> diff --git a/PCbuild/_tkinter.vcproj b/PCbuild/_tkinter.vcproj index e3baa5c..e8f8aa5 100644 --- a/PCbuild/_tkinter.vcproj +++ b/PCbuild/_tkinter.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(tcltkLib)" + AdditionalDependencies="$(tcltkLibDebug)" /> <Tool Name="VCALinkTool" @@ -104,7 +104,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + AdditionalIncludeDirectories="$(tcltk64Dir)\include" PreprocessorDefinitions="WITH_APPINIT" /> <Tool @@ -118,7 +118,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(tcltk64Lib)" + AdditionalDependencies="$(tcltk64LibDebug)" /> <Tool Name="VCALinkTool" @@ -229,7 +229,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + AdditionalIncludeDirectories="$(tcltk64Dir)\include" PreprocessorDefinitions="WITH_APPINIT" /> <Tool @@ -354,7 +354,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + AdditionalIncludeDirectories="$(tcltk64Dir)\include" PreprocessorDefinitions="WITH_APPINIT" /> <Tool @@ -480,7 +480,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + AdditionalIncludeDirectories="$(tcltk64Dir)\include" PreprocessorDefinitions="WITH_APPINIT" /> <Tool diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 69c4a83..6838d62 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -36,6 +36,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" ProjectSection(ProjectDependencies) = postProject + {62172C7D-B39E-409A-B352-370FF5098C19} = {62172C7D-B39E-409A-B352-370FF5098C19} {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -67,6 +68,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" @@ -114,6 +116,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb44", "_bsddb44.vcproj", "{62172C7D-B39E-409A-B352-370FF5098C19}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -486,6 +492,38 @@ Global {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32 {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64 {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.ActiveCfg = Debug|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.Build.0 = Debug|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.ActiveCfg = Debug|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.Build.0 = Debug|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.ActiveCfg = Release|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.Build.0 = Release|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.ActiveCfg = Release|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.Build.0 = Release|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.Build.0 = Debug|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.ActiveCfg = Debug|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.Build.0 = Debug|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.ActiveCfg = Release|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.Build.0 = Release|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.ActiveCfg = Release|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index cd12ffb..bc41d14 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -46,23 +46,43 @@ /> <UserMacro Name="bsddbDir" - Value="..\..\db-4.4.20\build_win32\" + Value="$(bsddb44Dir)" + /> + <UserMacro + Name="bsddbDepLibs" + Value="$(bsddb44DepLibs)" + /> + <UserMacro + Name="bsddb44Dir" + Value="..\..\db-4.4.20\build_win32" + /> + <UserMacro + Name="bsddb44DepLibs" + Value="" + /> + <UserMacro + Name="bsddb45Dir" + Value="..\..\db-4.5.20.x\build_windows" + /> + <UserMacro + Name="bsddb45DepLibs" + Value="ws2_32.lib" /> <UserMacro Name="sqlite3Dir" - Value="..\..\sqlite-source-3.3.4\" + Value="..\..\sqlite-source-3.3.4" /> <UserMacro Name="bz2Dir" - Value="..\..\bzip2-1.0.3\" + Value="..\..\bzip2-1.0.3" /> <UserMacro Name="opensslDir" - Value="..\..\openssl-0.9.8g\" + Value="..\..\openssl-0.9.8g" /> <UserMacro Name="tcltkDir" - Value="..\..\tcltk\" + Value="..\..\tcltk" /> <UserMacro Name="tcltk64Dir" @@ -73,7 +93,15 @@ Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib" /> <UserMacro + Name="tcltkLibDebug" + Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib" + /> + <UserMacro Name="tcltk64Lib" Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib" /> + <UserMacro + Name="tcltk64LibDebug" + Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib" + /> </VisualStudioPropertySheet> diff --git a/PCbuild/sqlite3.vcproj b/PCbuild/sqlite3.vcproj new file mode 100644 index 0000000..a88b30f --- /dev/null +++ b/PCbuild/sqlite3.vcproj @@ -0,0 +1,743 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="sqlite3"
+ ProjectGUID="{A1A295E5-463C-437F-81CA-1F32367685DA}"
+ RootNamespace="sqlite3"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\pyd_d.vsprops"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(sqlite3Dir)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\$(ProjectName)_d.dll"
+ ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops"
+ CharacterSet="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(sqlite3Dir)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\$(ProjectName)_d.dll"
+ ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\pyd.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(sqlite3Dir)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\$(ProjectName).dll"
+ ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(sqlite3Dir)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\$(ProjectName).dll"
+ ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="PGInstrument|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(sqlite3Dir)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="PGInstrument|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(sqlite3Dir)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="PGUpdate|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(sqlite3Dir)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="PGUpdate|x64"
+ ConfigurationType="2"
+ InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
+ CharacterSet="0"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(sqlite3Dir)"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Header Files"
+ >
+ <File
+ RelativePath="$(sqlite3Dir)\btree.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\hash.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\keywordhash.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\opcodes.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\os.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\os_common.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\pager.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\parse.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\sqlite3.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\sqliteInt.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\vdbe.h"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\vdbeInt.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Source Files"
+ >
+ <File
+ RelativePath="$(sqlite3Dir)\alter.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\analyze.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\attach.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\auth.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\btree.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\build.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\callback.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\complete.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\date.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\delete.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\expr.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\func.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\hash.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\insert.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\legacy.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\main.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\opcodes.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\os.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\os_unix.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\os_win.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\pager.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\parse.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\pragma.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\prepare.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\printf.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\random.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\select.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\shell.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\table.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\tokenize.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\trigger.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\update.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\utf.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\util.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\vacuum.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\vdbe.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\vdbeapi.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\vdbeaux.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\vdbefifo.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\vdbemem.c"
+ >
+ </File>
+ <File
+ RelativePath="$(sqlite3Dir)\where.c"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat index 0ea4d64..7a8b169 100644 --- a/Tools/buildbot/external-amd64.bat +++ b/Tools/buildbot/external-amd64.bat @@ -1,7 +1,5 @@ @rem Fetches (and builds if necessary) external dependencies -@REM XXX FIXME - building for x64 disabled for now. - @rem Assume we start inside the Python source directory cd .. call "%VS90COMNTOOLS%vsvars32.bat" @@ -16,9 +14,6 @@ if exist db-4.4.20 if not exist db-4.4.20\build_win32\this_is_for_vs9 ( rd /s/q db-4.4.20 ) if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20 -if not exist db-4.4.20\build_win32\debug\libdb44sd.lib ( - vcbuild db-4.4.20\build_win32\db_static.vcproj "Debug AMD64|x64" -) @rem OpenSSL if not exist openssl-0.9.8g ( @@ -27,22 +22,20 @@ if not exist openssl-0.9.8g ( ) @rem tcltk -if not exist tcl8.4.16 ( +if not exist tcl8.4.18.1 ( if exist tcltk rd /s/q tcltk if exist tcl8.4.12 rd /s/q tcl8.4.12 if exist tk8.4.12 rd /s/q tk8.4.12 - svn export http://svn.python.org/projects/external/tcl8.4.16 - svn export http://svn.python.org/projects/external/tk8.4.16 -@REM cd tcl8.4.16\win -@REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 -@REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 INSTALLDIR=..\..\tcltk install -@REM cd ..\.. -@REM cd tk8.4.16\win -@REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 -@REM nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install -@REM cd ..\.. + if exist tcl8.4.16 rd /s/q tcl8.4.16 + if exist tk8.4.16 rd /s/q tk8.4.16 + svn export http://svn.python.org/projects/external/tcl-8.4.18.1 + svn export http://svn.python.org/projects/external/tk-8.4.18.1 + cd tcl-8.4.18.1 + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 clean all install + cd ..\.. + cd tk-8.4.18.1 + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 TCLDIR=../../tcl-8.4.18.1 clean all install ) @rem sqlite if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 -@REM if not exist build\PCbuild\sqlite3.dll copy sqlite-source-3.3.4\sqlite3.dll build\PCbuild |