Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: third_party/sqlite/README.chromium

Issue 6835006: Convert to SQLite amalgamation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | third_party/sqlite/amalgamation/README » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Name: sqlite 1 Name: sqlite
2 License File: src/LICENSE 2 License File: src/LICENSE
3 URL: http://sqlite.org/ 3 URL: http://sqlite.org/
4 Version: 3.6.18 4 Version: 3.6.18
5 Included In Release: Yes 5 Included In Release: Yes
6 Security Critical: Yes
6 7
7 Instructions for importing a new release of SQLite from sqlite.org. 8 Instructions for importing a new release of SQLite from sqlite.org.
8 9
9 Note: our current base version is 3.6.18. 10 Note: our current base version is 3.6.18.
10 11
11 First, you need to be on Linux. 12 First, you need to be on Linux.
12 13
13 # Determine the versions of the release you want and the release we currently 14 # Determine the versions of the release you want and the release we currently
14 # have. (See the VERSION file to determine which release we currently have.) 15 # have. (See the VERSION file to determine which release we currently have.)
15 # You may wish to consult http://www.sqlite.org/changes.html to find out what 16 # You may wish to consult http://www.sqlite.org/changes.html to find out what
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 58
58 misc.patch 59 misc.patch
59 preload-cache.patch 60 preload-cache.patch
60 safe-tolower.patch 61 safe-tolower.patch
61 fts2.patch 62 fts2.patch
62 fts3.patch 63 fts3.patch
63 icu-regexp.patch 64 icu-regexp.patch
64 icu-shell.patch 65 icu-shell.patch
65 attach-integer.patch 66 attach-integer.patch
66 webdb.patch 67 webdb.patch
68 test.patch
67 69
68 So, e.g. you could do this to apply all our patches to vanilla SQLite: 70 So, e.g. you could do this to apply all our patches to vanilla SQLite:
69 71
70 cd sqlite-$LATEST 72 cd sqlite-$LATEST
71 patch -p0 < ../sqlite/misc.patch 73 patch -p0 < ../sqlite/misc.patch
72 patch -p0 < ../sqlite/preload-cache.patch 74 patch -p0 < ../sqlite/preload-cache.patch
73 patch -p0 < ../sqlite/safe-tolower.patch 75 patch -p0 < ../sqlite/safe-tolower.patch
74 patch -p0 < ../sqlite/fts2.patch 76 patch -p0 < ../sqlite/fts2.patch
75 patch -p0 < ../sqlite/fts3.patch 77 patch -p0 < ../sqlite/fts3.patch
76 patch -p0 < ../sqlite/icu-regexp.patch 78 patch -p0 < ../sqlite/icu-regexp.patch
77 patch -p0 < ../sqlite/icu-shell.patch 79 patch -p0 < ../sqlite/icu-shell.patch
78 patch -p0 < ../sqlite/attach-integer.patch 80 patch -p0 < ../sqlite/attach-integer.patch
79 patch -p0 < ../sqlite/webdb.patch 81 patch -p0 < ../sqlite/webdb.patch
82 patch -p0 < ../sqlite/test.patch
80 83
81 This will only be the case if all changes we make also update the corresponding 84 This will only be the case if all changes we make also update the corresponding
82 patch files. Therefore please remember to do that whenever you make a change! 85 patch files. Therefore please remember to do that whenever you make a change!
83 86
84 Descriptions of the changes we've made can be found at the bottom of this file. 87 Descriptions of the changes we've made can be found at the bottom of this file.
85 88
86 -------------------------------------------- 89 --------------------------------------------
87 90
88 How to run the SQLite tests for the Chromium version of SQLite on Linux. 91 How to run the SQLite tests for the Chromium version of SQLite on Linux.
89 92
90 Prerequisties: On my corp Ubuntu 8.04 workstation, I needed to install the 93 Prerequisties: On my corp Ubuntu 8.04 workstation, I needed to install the
91 following packages: 94 following packages:
92 sudo apt-get install tcl8.4-dev libicu-dev 95 sudo apt-get install tcl8.4-dev libicu-dev
93 96
94 cd src/third_party/sqlite 97 cd src/third_party/sqlite/src
95 mkdir build 98 mkdir build
96 cd build 99 cd build
97 make -f ../Makefile.linux-gcc testfixture 100 make -f ../Makefile.linux-gcc testfixture
98 make -f ../Makefile.linux-gcc test > /tmp/test.log 101 make -f ../Makefile.linux-gcc test > /tmp/test.log
99 egrep -v 'Ok$' /tmp/test.log 102 egrep -v 'Ok$' /tmp/test.log
100 # For an ideal test run, you would see: 103 # For an ideal test run, you would see:
101 # 0 errors out of 57887 tests 104 # 0 errors out of 57887 tests
102 # However, the current situation on my corp Linux Ubuntu 8.04 machine, with 105 # However, the current situation on my corp Linux Ubuntu 8.04 machine, with
103 # test run on a locally mounted directory, is the failure of: 106 # test run on a locally mounted directory, is the failure of:
104 # "rollback-2.3", "tkt3457-1.4" 107 # "rollback-2.3", "tkt3457-1.4"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 os_unix.c, to allow Chromium's Posix VFS implementation in 168 os_unix.c, to allow Chromium's Posix VFS implementation in
166 WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp 169 WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
167 to correctly implement the "unused file descriptors" logic in the 170 to correctly implement the "unused file descriptors" logic in the
168 xDlOpen() method. The new functions are 171 xDlOpen() method. The new functions are
169 chromium_sqlite3_get_reusable_file_handle(), 172 chromium_sqlite3_get_reusable_file_handle(),
170 chromium_sqlite3_update_reusable_file_handle() and 173 chromium_sqlite3_update_reusable_file_handle() and
171 chromium_sqlite3_destroy_reusable_file_handle(). Also, added the 174 chromium_sqlite3_destroy_reusable_file_handle(). Also, added the
172 chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls 175 chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls
173 fillInUnixFile(), which will be made static again as soon as a 176 fillInUnixFile(), which will be made static again as soon as a
174 WebKit patch using the new function lands. 177 WebKit patch using the new function lands.
OLDNEW
« no previous file with comments | « no previous file | third_party/sqlite/amalgamation/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698