Chromium Code Reviews| Index: third_party/sqlite/README.chromium |
| =================================================================== |
| --- third_party/sqlite/README.chromium (revision 86831) |
| +++ third_party/sqlite/README.chromium (working copy) |
| @@ -18,8 +18,8 @@ |
| # Note - this is just an example. Always refer to the version above for our |
| # real current version. |
| # Set some variables to remember the versions, e.g.: |
| -BASE=3.7.6.3 |
| -LATEST=3.7.6.4 |
| +BASE=3070603 |
|
Mark Mentovai
2011/05/26 21:23:40
Whether or not this is right is up to Scott. But y
Scott Hess - ex-Googler
2011/05/26 22:05:07
Needs to be .zip. And a leading 0. And the later
Mark Mentovai
2011/05/26 22:14:22
shess wrote:
mrossetti
2011/05/27 17:11:36
I removed the version stuff for $BASE and $LATEST
|
| +LATEST=3070604 |
| # Get to the src/third_party directory in your Chromium client: |
| cd src/third_party |
| @@ -44,8 +44,8 @@ |
| # Change to the sqlite directory: |
| cd sqlite |
| -# Run the google_generate_preprocessed.sh script: |
| -./google_generate_preprocessed.sh |
| +# Run the google_generate_amalgamation.sh script: |
| +./google_generate_amalgamation.sh |
| # Find a sucker. Send review. |
| # TODO(shess) Describe an appropriate comment style. Seems like it |
| @@ -68,20 +68,19 @@ |
| attach-integer.patch |
| webdb.patch |
| test.patch |
| +mac_time_machine.patch |
| So, e.g. you could do this to apply all our patches to vanilla SQLite: |
| cd sqlite-$LATEST |
| patch -p0 < ../sqlite/misc.patch |
| patch -p0 < ../sqlite/preload-cache.patch |
| -patch -p0 < ../sqlite/safe-tolower.patch |
| patch -p0 < ../sqlite/fts2.patch |
| patch -p0 < ../sqlite/fts3.patch |
| -patch -p0 < ../sqlite/icu-regexp.patch |
| patch -p0 < ../sqlite/icu-shell.patch |
| -patch -p0 < ../sqlite/attach-integer.patch |
| patch -p0 < ../sqlite/webdb.patch |
| patch -p0 < ../sqlite/test.patch |
| +patch -p0 < ../sqlite/mac_time_machine.patch |
| This will only be the case if all changes we make also update the corresponding |
| patch files. Therefore please remember to do that whenever you make a change! |
| @@ -177,3 +176,10 @@ |
| chromium_sqlite3_fill_in_unix_sqlite3_file() function that calls |
| fillInUnixFile(), which will be made static again as soon as a |
| WebKit patch using the new function lands. |
| + - From mac_time_machine.patch: |
| + When __APPLE__ and when creating a -journal file, determine if the database |
| + for which the journal is being created has been excluded from being backed |
| + up using Apple's Time Machine and if so then also exclude the journal. These |
| + changes were all made in pager.c. In order to eliminate a symbol conflict |
|
Mark Mentovai
2011/05/26 21:23:40
The change now extends to sqliteInt.h as well.
mrossetti
2011/05/27 17:11:36
Done.
|
| + with an Apple library after amalgamation it was also necessary to rename |
| + fts3_porter.c's 'cType' to 'vOrCType'. |