Mac TimeMachine File Exclusions

third_party/sqlite/README.chromium

 Name: sqlite
 License File: src/LICENSE
 URL: http://sqlite.org/
 Version: 3.7.6.3
 Included In Release: Yes
 Security Critical: Yes
 
 Instructions for importing a new release of SQLite from sqlite.org.
 
 Note: our current base version is 3.7.6.3.
@@ skipping 26 matching lines @@
 
 # Use kdiff3 to merge the changes:
 kdiff3 -m sqlite-$BASE sqlite-$LATEST sqlite
 
 # Resolve any conflicts.  Figure out if we've got everything we should
 # have (see below), or if we can omit any changes we no longer need.
 
 # 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
 # should at least include the SQLite version number.
 
 --------------------------------------------
 
 For reference, all of our local patches are also kept as .patch files in the
 sqlite directory. Here is a list of the patches, in the order they should be
 applied to a vanilla SQLite (of the version we currently have) to get, in
 principle, exactly what is checked in:
 
 misc.patch
 preload-cache.patch
 safe-tolower.patch
 fts2.patch
 fts3.patch
 icu-regexp.patch
 icu-shell.patch
 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!
 
 Descriptions of the changes we've made can be found at the bottom of this file.
 
 --------------------------------------------
 
 How to run the SQLite tests for the Chromium version of SQLite on Linux.
 
@@ skipping 75 matching lines @@
    os_unix.c, to allow Chromium's Posix VFS implementation in
    WebKit/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
    to correctly implement the "unused file descriptors" logic in the
    xDlOpen() method. The new functions are
    chromium_sqlite3_get_reusable_file_handle(),
    chromium_sqlite3_update_reusable_file_handle() and
    chromium_sqlite3_destroy_reusable_file_handle(). Also, added the
    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'.