Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2061155

Browse files
loewisloewis
committed
Merged revisions 64243-64244 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r64243 | martin.v.loewis | 2008-06-13 20:12:51 +0200 (Fr, 13 Jun 2008) | 1 line Switch to SQLite 3.5.9. ........ r64244 | martin.v.loewis | 2008-06-13 20:19:49 +0200 (Fr, 13 Jun 2008) | 1 line Update AMD64 build for amalgamated sqlite. ........
1 parent 70ce8aa commit 2061155

4 files changed

Lines changed: 18 additions & 215 deletions

File tree

‎PCbuild/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
/>
7575
<UserMacro
7676
Name="sqlite3Dir"
77-
Value="$(externalsDir)\sqlite-source-3.3.4"
77+
Value="$(externalsDir)\sqlite-3.5.9"
7878
/>
7979
<UserMacro
8080
Name="bz2Dir"

‎PCbuild/readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ _bsddb
107107
Wraps Berkeley DB 4.4.20, which is currently built by _bsddb44.vcproj.
108108
project (see below).
109109
_sqlite3
110-
Wraps SQLite 3.3.4, which is currently built by sqlite3.vcproj (see below).
110+
Wraps SQLite 3.5.9, which is currently built by sqlite3.vcproj (see below).
111111
_tkinter
112112
Wraps the Tk windowing system. Unlike _bsddb and _sqlite3, there's no
113113
corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's

‎PCbuild/sqlite3.vcproj‎

Lines changed: 11 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="Windows-1252"?>
22
<VisualStudioProject
33
ProjectType="Visual C++"
4-
Version="9.00"
4+
Version="9,00"
55
Name="sqlite3"
66
ProjectGUID="{A1A295E5-463C-437F-81CA-1F32367685DA}"
77
RootNamespace="sqlite3"
@@ -43,6 +43,7 @@
4343
<Tool
4444
Name="VCCLCompilerTool"
4545
AdditionalIncludeDirectories="$(sqlite3Dir)"
46+
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
4647
/>
4748
<Tool
4849
Name="VCManagedResourceCompilerTool"
@@ -56,7 +57,6 @@
5657
<Tool
5758
Name="VCLinkerTool"
5859
OutputFile="$(OutDir)\$(ProjectName)_d.dll"
59-
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
6060
/>
6161
<Tool
6262
Name="VCALinkTool"
@@ -105,6 +105,7 @@
105105
<Tool
106106
Name="VCCLCompilerTool"
107107
AdditionalIncludeDirectories="$(sqlite3Dir)"
108+
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
108109
/>
109110
<Tool
110111
Name="VCManagedResourceCompilerTool"
@@ -118,7 +119,6 @@
118119
<Tool
119120
Name="VCLinkerTool"
120121
OutputFile="$(OutDir)\$(ProjectName)_d.dll"
121-
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
122122
/>
123123
<Tool
124124
Name="VCALinkTool"
@@ -167,6 +167,7 @@
167167
<Tool
168168
Name="VCCLCompilerTool"
169169
AdditionalIncludeDirectories="$(sqlite3Dir)"
170+
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
170171
/>
171172
<Tool
172173
Name="VCManagedResourceCompilerTool"
@@ -180,7 +181,6 @@
180181
<Tool
181182
Name="VCLinkerTool"
182183
OutputFile="$(OutDir)\$(ProjectName).dll"
183-
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
184184
/>
185185
<Tool
186186
Name="VCALinkTool"
@@ -230,6 +230,7 @@
230230
<Tool
231231
Name="VCCLCompilerTool"
232232
AdditionalIncludeDirectories="$(sqlite3Dir)"
233+
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
233234
/>
234235
<Tool
235236
Name="VCManagedResourceCompilerTool"
@@ -243,7 +244,6 @@
243244
<Tool
244245
Name="VCLinkerTool"
245246
OutputFile="$(OutDir)\$(ProjectName).dll"
246-
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
247247
/>
248248
<Tool
249249
Name="VCALinkTool"
@@ -292,6 +292,7 @@
292292
<Tool
293293
Name="VCCLCompilerTool"
294294
AdditionalIncludeDirectories="$(sqlite3Dir)"
295+
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
295296
/>
296297
<Tool
297298
Name="VCManagedResourceCompilerTool"
@@ -304,7 +305,6 @@
304305
/>
305306
<Tool
306307
Name="VCLinkerTool"
307-
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
308308
/>
309309
<Tool
310310
Name="VCALinkTool"
@@ -354,6 +354,7 @@
354354
<Tool
355355
Name="VCCLCompilerTool"
356356
AdditionalIncludeDirectories="$(sqlite3Dir)"
357+
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
357358
/>
358359
<Tool
359360
Name="VCManagedResourceCompilerTool"
@@ -366,7 +367,6 @@
366367
/>
367368
<Tool
368369
Name="VCLinkerTool"
369-
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
370370
/>
371371
<Tool
372372
Name="VCALinkTool"
@@ -415,6 +415,7 @@
415415
<Tool
416416
Name="VCCLCompilerTool"
417417
AdditionalIncludeDirectories="$(sqlite3Dir)"
418+
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
418419
/>
419420
<Tool
420421
Name="VCManagedResourceCompilerTool"
@@ -427,7 +428,6 @@
427428
/>
428429
<Tool
429430
Name="VCLinkerTool"
430-
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
431431
/>
432432
<Tool
433433
Name="VCALinkTool"
@@ -477,6 +477,7 @@
477477
<Tool
478478
Name="VCCLCompilerTool"
479479
AdditionalIncludeDirectories="$(sqlite3Dir)"
480+
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
480481
/>
481482
<Tool
482483
Name="VCManagedResourceCompilerTool"
@@ -489,7 +490,6 @@
489490
/>
490491
<Tool
491492
Name="VCLinkerTool"
492-
ModuleDefinitionFile="$(sqlite3Dir)\sqlite3.def"
493493
/>
494494
<Tool
495495
Name="VCALinkTool"
@@ -520,220 +520,20 @@
520520
<Filter
521521
Name="Header Files"
522522
>
523-
<File
524-
RelativePath="$(sqlite3Dir)\btree.h"
525-
>
526-
</File>
527-
<File
528-
RelativePath="$(sqlite3Dir)\hash.h"
529-
>
530-
</File>
531-
<File
532-
RelativePath="$(sqlite3Dir)\keywordhash.h"
533-
>
534-
</File>
535-
<File
536-
RelativePath="$(sqlite3Dir)\opcodes.h"
537-
>
538-
</File>
539-
<File
540-
RelativePath="$(sqlite3Dir)\os.h"
541-
>
542-
</File>
543-
<File
544-
RelativePath="$(sqlite3Dir)\os_common.h"
545-
>
546-
</File>
547-
<File
548-
RelativePath="$(sqlite3Dir)\pager.h"
549-
>
550-
</File>
551-
<File
552-
RelativePath="$(sqlite3Dir)\parse.h"
553-
>
554-
</File>
555523
<File
556524
RelativePath="$(sqlite3Dir)\sqlite3.h"
557525
>
558526
</File>
559527
<File
560-
RelativePath="$(sqlite3Dir)\sqliteInt.h"
561-
>
562-
</File>
563-
<File
564-
RelativePath="$(sqlite3Dir)\vdbe.h"
565-
>
566-
</File>
567-
<File
568-
RelativePath="$(sqlite3Dir)\vdbeInt.h"
528+
RelativePath="$(sqlite3Dir)\sqlite3ext.h"
569529
>
570530
</File>
571531
</Filter>
572532
<Filter
573533
Name="Source Files"
574534
>
575535
<File
576-
RelativePath="$(sqlite3Dir)\alter.c"
577-
>
578-
</File>
579-
<File
580-
RelativePath="$(sqlite3Dir)\analyze.c"
581-
>
582-
</File>
583-
<File
584-
RelativePath="$(sqlite3Dir)\attach.c"
585-
>
586-
</File>
587-
<File
588-
RelativePath="$(sqlite3Dir)\auth.c"
589-
>
590-
</File>
591-
<File
592-
RelativePath="$(sqlite3Dir)\btree.c"
593-
>
594-
</File>
595-
<File
596-
RelativePath="$(sqlite3Dir)\build.c"
597-
>
598-
</File>
599-
<File
600-
RelativePath="$(sqlite3Dir)\callback.c"
601-
>
602-
</File>
603-
<File
604-
RelativePath="$(sqlite3Dir)\complete.c"
605-
>
606-
</File>
607-
<File
608-
RelativePath="$(sqlite3Dir)\date.c"
609-
>
610-
</File>
611-
<File
612-
RelativePath="$(sqlite3Dir)\delete.c"
613-
>
614-
</File>
615-
<File
616-
RelativePath="$(sqlite3Dir)\expr.c"
617-
>
618-
</File>
619-
<File
620-
RelativePath="$(sqlite3Dir)\func.c"
621-
>
622-
</File>
623-
<File
624-
RelativePath="$(sqlite3Dir)\hash.c"
625-
>
626-
</File>
627-
<File
628-
RelativePath="$(sqlite3Dir)\insert.c"
629-
>
630-
</File>
631-
<File
632-
RelativePath="$(sqlite3Dir)\legacy.c"
633-
>
634-
</File>
635-
<File
636-
RelativePath="$(sqlite3Dir)\main.c"
637-
>
638-
</File>
639-
<File
640-
RelativePath="$(sqlite3Dir)\opcodes.c"
641-
>
642-
</File>
643-
<File
644-
RelativePath="$(sqlite3Dir)\os.c"
645-
>
646-
</File>
647-
<File
648-
RelativePath="$(sqlite3Dir)\os_unix.c"
649-
>
650-
</File>
651-
<File
652-
RelativePath="$(sqlite3Dir)\os_win.c"
653-
>
654-
</File>
655-
<File
656-
RelativePath="$(sqlite3Dir)\pager.c"
657-
>
658-
</File>
659-
<File
660-
RelativePath="$(sqlite3Dir)\parse.c"
661-
>
662-
</File>
663-
<File
664-
RelativePath="$(sqlite3Dir)\pragma.c"
665-
>
666-
</File>
667-
<File
668-
RelativePath="$(sqlite3Dir)\prepare.c"
669-
>
670-
</File>
671-
<File
672-
RelativePath="$(sqlite3Dir)\printf.c"
673-
>
674-
</File>
675-
<File
676-
RelativePath="$(sqlite3Dir)\random.c"
677-
>
678-
</File>
679-
<File
680-
RelativePath="$(sqlite3Dir)\select.c"
681-
>
682-
</File>
683-
<File
684-
RelativePath="$(sqlite3Dir)\shell.c"
685-
>
686-
</File>
687-
<File
688-
RelativePath="$(sqlite3Dir)\table.c"
689-
>
690-
</File>
691-
<File
692-
RelativePath="$(sqlite3Dir)\tokenize.c"
693-
>
694-
</File>
695-
<File
696-
RelativePath="$(sqlite3Dir)\trigger.c"
697-
>
698-
</File>
699-
<File
700-
RelativePath="$(sqlite3Dir)\update.c"
701-
>
702-
</File>
703-
<File
704-
RelativePath="$(sqlite3Dir)\utf.c"
705-
>
706-
</File>
707-
<File
708-
RelativePath="$(sqlite3Dir)\util.c"
709-
>
710-
</File>
711-
<File
712-
RelativePath="$(sqlite3Dir)\vacuum.c"
713-
>
714-
</File>
715-
<File
716-
RelativePath="$(sqlite3Dir)\vdbe.c"
717-
>
718-
</File>
719-
<File
720-
RelativePath="$(sqlite3Dir)\vdbeapi.c"
721-
>
722-
</File>
723-
<File
724-
RelativePath="$(sqlite3Dir)\vdbeaux.c"
725-
>
726-
</File>
727-
<File
728-
RelativePath="$(sqlite3Dir)\vdbefifo.c"
729-
>
730-
</File>
731-
<File
732-
RelativePath="$(sqlite3Dir)\vdbemem.c"
733-
>
734-
</File>
735-
<File
736-
RelativePath="$(sqlite3Dir)\where.c"
536+
RelativePath="$(sqlite3Dir)\sqlite3.c"
737537
>
738538
</File>
739539
</Filter>

‎Tools/buildbot/external-common.bat‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cd ..
1515
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
1616
@rem if exist db-4.4.20 rd /s/q db-4.4.20
1717
@rem if exist openssl-0.9.8g rd /s/q openssl-0.9.8g
18-
@rem if exist sqlite-source-3.3.4 rd /s/q sqlite-source-3.3.4
18+
@rem if exist sqlite-source-3.5.9 rd /s/q sqlite-source-3.5.9
1919

2020
@rem bzip
2121
if not exist bzip2-1.0.5 (
@@ -37,4 +37,7 @@ if not exist tcl-8.5.2.1 (
3737
if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0
3838

3939
@rem sqlite3
40-
if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
40+
if not exist sqlite-source-3.5.9 (
41+
rd /s/q sqlite-source-3.3.4
42+
svn export http://svn.python.org/projects/external/sqlite-source-3.5.9
43+
)

0 commit comments

Comments
 (0)