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

Unified Diff: third_party/sqlite/README.chromium

Issue 6990066: Mac TimeMachine File Exclusions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/sqlite/amalgamation/sqlite3.c » ('j') | third_party/sqlite/src/src/pager.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/README.chromium
===================================================================
--- third_party/sqlite/README.chromium (revision 87026)
+++ third_party/sqlite/README.chromium (working copy)
@@ -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,11 @@
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 made in pager.c with includes of Apple interfaces being made in
+ sqliteInt.h. In order to eliminate a symbol conflict with an Apple library
Mark Mentovai 2011/05/27 17:20:37 Extra space between “conflict” and “with.”
mrossetti 2011/05/27 19:20:35 Done.
+ after amalgamation it was also necessary to rename fts3_porter.c's 'cType'
+ to 'vOrCType'.
« no previous file with comments | « no previous file | third_party/sqlite/amalgamation/sqlite3.c » ('j') | third_party/sqlite/src/src/pager.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698