Skip to content

C
cpython
Kaydet (Commit) cc0f2b20 authored tarafından Martin v. Löwis's avatar Martin v. Löwis
Dosyalara gözat
Seçenekler

Switch to SQLite 3.5.9.

üst a4514c30
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 212 deletions
Misc/NEWS
Dosyayı görüntüle @ cc0f2b20
...@@ -307,7 +307,7 @@ Library ...@@ -307,7 +307,7 @@ Library
Build Build
----- -----
- The Windows installer now includes Tk 8.5 and bzip2 1.0.5. - The Windows installer now includes Tk 8.5, bzip2 1.0.5, and SQLite 3.5.9.
- Patch #1722225: Support QNX 6. - Patch #1722225: Support QNX 6.
......
PCbuild/pyproject.vsprops
Dosyayı görüntüle @ cc0f2b20
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
/> />
<UserMacro <UserMacro
Name="sqlite3Dir" Name="sqlite3Dir"
Value="$(externalsDir)\sqlite-source-3.3.4" Value="$(externalsDir)\sqlite-3.5.9"
/> />
<UserMacro <UserMacro
Name="bz2Dir" Name="bz2Dir"
......
PCbuild/readme.txt
Dosyayı görüntüle @ cc0f2b20
...@@ -107,7 +107,7 @@ _bsddb ...@@ -107,7 +107,7 @@ _bsddb
Wraps Berkeley DB 4.4.20, which is currently built by _bsddb44.vcproj. Wraps Berkeley DB 4.4.20, which is currently built by _bsddb44.vcproj.
project (see below). project (see below).
_sqlite3 _sqlite3
Wraps SQLite 3.3.4, which is currently built by sqlite3.vcproj (see below). Wraps SQLite 3.5.9, which is currently built by sqlite3.vcproj (see below).
_tkinter _tkinter
Wraps the Tk windowing system. Unlike _bsddb and _sqlite3, there's no Wraps the Tk windowing system. Unlike _bsddb and _sqlite3, there's no
corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's
......
PCbuild/sqlite3.vcproj
Dosyayı görüntüle @ cc0f2b20
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9,00"
Name="sqlite3" Name="sqlite3"
ProjectGUID="{A1A295E5-463C-437F-81CA-1F32367685DA}" ProjectGUID="{A1A295E5-463C-437F-81CA-1F32367685DA}"
RootNamespace="sqlite3" RootNamespace="sqlite3"
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories="$(sqlite3Dir)"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -56,7 +57,6 @@ ...@@ -56,7 +57,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll" OutputFile="$(OutDir)\$(ProjectName)_d.dll"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories="$(sqlite3Dir)"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -180,7 +181,6 @@ ...@@ -180,7 +181,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll" OutputFile="$(OutDir)\$(ProjectName).dll"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -292,6 +292,7 @@ ...@@ -292,6 +292,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories="$(sqlite3Dir)"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -304,7 +305,6 @@ ...@@ -304,7 +305,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -415,6 +415,7 @@ ...@@ -415,6 +415,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(sqlite3Dir)" AdditionalIncludeDirectories="$(sqlite3Dir)"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -427,7 +428,6 @@ ...@@ -427,7 +428,6 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -520,52 +520,12 @@ ...@@ -520,52 +520,12 @@
<Filter <Filter
Name="Header Files" 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 <File
RelativePath="$(sqlite3Dir)\sqlite3.h" RelativePath="$(sqlite3Dir)\sqlite3.h"
> >
</File> </File>
<File <File
RelativePath="$(sqlite3Dir)\sqliteInt.h" RelativePath="$(sqlite3Dir)\sqlite3ext.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbe.h"
>
</File>
<File
RelativePath="$(sqlite3Dir)\vdbeInt.h"
> >
</File> </File>
</Filter> </Filter>
...@@ -573,167 +533,7 @@ ...@@ -573,167 +533,7 @@
Name="Source Files" Name="Source Files"
> >
<File <File
RelativePath="$(sqlite3Dir)\alter.c" RelativePath="$(sqlite3Dir)\sqlite3.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> </File>
</Filter> </Filter>
......
Tools/buildbot/external-common.bat
Dosyayı görüntüle @ cc0f2b20
...@@ -15,7 +15,7 @@ cd .. ...@@ -15,7 +15,7 @@ cd ..
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20 @rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g @rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g
@rem if exist sqlite-source-3.3.4 rd /s/q sqlite-source-3.3.4 @rem if exist sqlite-source-3.5.9 rd /s/q sqlite-source-3.5.9
@rem bzip @rem bzip
if not exist bzip2-1.0.5 ( if not exist bzip2-1.0.5 (
...@@ -37,4 +37,7 @@ if not exist tcl-8.5.2.1 ( ...@@ -37,4 +37,7 @@ if not exist tcl-8.5.2.1 (
if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0 if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0
@rem sqlite3 @rem sqlite3
if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4 if not exist sqlite-source-3.5.9 (
rd /s/q sqlite-source-3.3.4
svn export http://svn.python.org/projects/external/sqlite-source-3.5.9
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment