From a8b7ee824dc4b62697add70bc4449d018ffc027f Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 26 Apr 2006 17:06:03 +0000
Subject: [PATCH] update to sqlite 3.3.5
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1258 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
w32/vsnet/GetLibs.vbs | 10 +-
w32/vsnet/Tools/sqlite.vcproj | 439 +++++++++++++++++++++++-----------
2 files changed, 305 insertions(+), 144 deletions(-)
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index d5daaec2bd..c7e1b78ec8 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -1,4 +1,4 @@
-On Error Resume Next
+'On Error Resume Next
' **************
' Initialization
' **************
@@ -412,12 +412,12 @@ End Sub
Sub BuildLibs_sqlite(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "sqlite") Then
- WgetUnCompress "http://www.sqlite.org/sqlite-source-3_2_7.zip", LibDestDir
- If Not FSO.FolderExists(LibDestDir & "sqlite-source-3_2_7") Then
+ WgetUnCompress "http://www.sqlite.org/sqlite-source-3_3_5.zip", LibDestDir
+ If Not FSO.FolderExists(LibDestDir & "sqlite-source-3_3_5") Then
Wscript.echo "Unable to get SQLite from default download location, Trying backup location:"
- WgetUnCompress LibsBase & "sqlite-source-3_2_7.zip", LibDestDir
+ WgetUnCompress LibsBase & "sqlite-source-3_3_5.zip", LibDestDir
End If
- RenameFolder LibDestDir & "sqlite-source-3_2_7", "sqlite"
+ RenameFolder LibDestDir & "sqlite-source-3_3_5", "sqlite"
FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True
FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
End If
diff --git a/w32/vsnet/Tools/sqlite.vcproj b/w32/vsnet/Tools/sqlite.vcproj
index 6954658de4..98bcc13b73 100644
--- a/w32/vsnet/Tools/sqlite.vcproj
+++ b/w32/vsnet/Tools/sqlite.vcproj
@@ -1,178 +1,288 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="sqlite"
ProjectGUID="{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG"
- MinimalRebuild="TRUE"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="0"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCLibrarianTool"/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCLibrarianTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="0"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/sqlite.lib"/>
+ OutputFile="$(OutDir)/sqlite.lib"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG"
- MinimalRebuild="TRUE"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="0"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="sqlite3.def"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
- CharacterSet="2">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="0"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
- ModuleDefinitionFile="sqlite3.def"/>
+ ModuleDefinitionFile="sqlite3.def"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -181,177 +291,228 @@
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
<File
- RelativePath="alter.c">
+ RelativePath="alter.c"
+ >
</File>
<File
- RelativePath="analyze.c">
+ RelativePath="analyze.c"
+ >
</File>
<File
- RelativePath="attach.c">
+ RelativePath="attach.c"
+ >
</File>
<File
- RelativePath="auth.c">
+ RelativePath="auth.c"
+ >
</File>
<File
- RelativePath="btree.c">
+ RelativePath="btree.c"
+ >
</File>
<File
- RelativePath="build.c">
+ RelativePath="build.c"
+ >
</File>
<File
- RelativePath="callback.c">
+ RelativePath="callback.c"
+ >
</File>
<File
- RelativePath="complete.c">
+ RelativePath="complete.c"
+ >
</File>
<File
- RelativePath="date.c">
+ RelativePath="date.c"
+ >
</File>
<File
- RelativePath="delete.c">
+ RelativePath="delete.c"
+ >
</File>
<File
- RelativePath="expr.c">
+ RelativePath="expr.c"
+ >
</File>
<File
- RelativePath="func.c">
+ RelativePath="func.c"
+ >
</File>
<File
- RelativePath="hash.c">
+ RelativePath="hash.c"
+ >
</File>
<File
- RelativePath="insert.c">
+ RelativePath="insert.c"
+ >
</File>
<File
- RelativePath="legacy.c">
+ RelativePath="legacy.c"
+ >
</File>
<File
- RelativePath="main.c">
+ RelativePath="main.c"
+ >
</File>
<File
- RelativePath="opcodes.c">
+ RelativePath="opcodes.c"
+ >
</File>
<File
- RelativePath="os_unix.c">
+ RelativePath="os.c"
+ >
</File>
<File
- RelativePath="os_win.c">
+ RelativePath="os_unix.c"
+ >
</File>
<File
- RelativePath="pager.c">
+ RelativePath="os_win.c"
+ >
</File>
<File
- RelativePath="parse.c">
+ RelativePath="pager.c"
+ >
</File>
<File
- RelativePath="pragma.c">
+ RelativePath="parse.c"
+ >
</File>
<File
- RelativePath="prepare.c">
+ RelativePath="pragma.c"
+ >
</File>
<File
- RelativePath="printf.c">
+ RelativePath="prepare.c"
+ >
</File>
<File
- RelativePath="random.c">
+ RelativePath="printf.c"
+ >
</File>
<File
- RelativePath="select.c">
+ RelativePath="random.c"
+ >
</File>
<File
- RelativePath="shell.c">
+ RelativePath="select.c"
+ >
</File>
<File
- RelativePath="table.c">
+ RelativePath="shell.c"
+ >
</File>
<File
- RelativePath="tokenize.c">
+ RelativePath="table.c"
+ >
</File>
<File
- RelativePath="trigger.c">
+ RelativePath="tokenize.c"
+ >
</File>
<File
- RelativePath="update.c">
+ RelativePath="trigger.c"
+ >
</File>
<File
- RelativePath="utf.c">
+ RelativePath="update.c"
+ >
</File>
<File
- RelativePath="util.c">
+ RelativePath="utf.c"
+ >
</File>
<File
- RelativePath="vacuum.c">
+ RelativePath="util.c"
+ >
</File>
<File
- RelativePath="vdbe.c">
+ RelativePath="vacuum.c"
+ >
</File>
<File
- RelativePath="vdbeapi.c">
+ RelativePath="vdbe.c"
+ >
</File>
<File
- RelativePath="vdbeaux.c">
+ RelativePath="vdbeapi.c"
+ >
</File>
<File
- RelativePath="vdbefifo.c">
+ RelativePath="vdbeaux.c"
+ >
</File>
<File
- RelativePath="vdbemem.c">
+ RelativePath="vdbefifo.c"
+ >
</File>
<File
- RelativePath="where.c">
+ RelativePath="vdbemem.c"
+ >
+ </File>
+ <File
+ RelativePath="where.c"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
<File
- RelativePath="btree.h">
+ RelativePath="btree.h"
+ >
</File>
<File
- RelativePath="hash.h">
+ RelativePath="hash.h"
+ >
</File>
<File
- RelativePath="keywordhash.h">
+ RelativePath="keywordhash.h"
+ >
</File>
<File
- RelativePath="opcodes.h">
+ RelativePath="opcodes.h"
+ >
</File>
<File
- RelativePath="os.h">
+ RelativePath="os.h"
+ >
</File>
<File
- RelativePath="os_common.h">
+ RelativePath="os_common.h"
+ >
</File>
<File
- RelativePath="os_unix.h">
+ RelativePath="pager.h"
+ >
</File>
<File
- RelativePath="os_win.h">
+ RelativePath="parse.h"
+ >
</File>
<File
- RelativePath="pager.h">
+ RelativePath="sqlite3.h"
+ >
</File>
<File
- RelativePath="parse.h">
+ RelativePath="sqliteInt.h"
+ >
</File>
<File
- RelativePath="sqlite3.h">
+ RelativePath="vdbe.h"
+ >
</File>
<File
- RelativePath="sqliteInt.h">
- </File>
- <File
- RelativePath="vdbe.h">
- </File>
- <File
- RelativePath="vdbeInt.h">
+ RelativePath="vdbeInt.h"
+ >
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
-