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

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
Index: third_party/sqlite/README.chromium
===================================================================
--- third_party/sqlite/README.chromium (revision 86429)
+++ third_party/sqlite/README.chromium (working copy)
@@ -42,8 +42,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
@@ -66,6 +66,7 @@
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:
@@ -80,6 +81,7 @@
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!
@@ -175,3 +177,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
+ with an Apple library after amalgamation it was also necessary to rename
+ fts3_porter.c's 'cType' to 'vOrCType'.

Powered by Google App Engine
This is Rietveld 408576698