Move bundled copy of sqlite one level deeper to better separate it...

third_party/sqlite/sqlite.gyp

Index: third_party/sqlite/sqlite.gyp
===================================================================
--- third_party/sqlite/sqlite.gyp	(revision 56608)
+++ third_party/sqlite/sqlite.gyp	(working copy)
@@ -63,156 +63,151 @@
             # ext, preprocessed, and src, with the exception of src/lempar.c,
             # src/shell*, and src/test*.  Exclusions are applied below in the
             # sources/ and sources! sections.
-            'ext/async/sqlite3async.c',
-            'ext/async/sqlite3async.h',
-            'ext/fts1/ft_hash.c',
-            'ext/fts1/ft_hash.h',
-            'ext/fts1/fts1.c',
-            'ext/fts1/fts1.h',
-            'ext/fts1/fts1_hash.c',
-            'ext/fts1/fts1_hash.h',
-            'ext/fts1/fts1_porter.c',
-            'ext/fts1/fts1_tokenizer.h',
-            'ext/fts1/fts1_tokenizer1.c',
-            'ext/fts1/fulltext.c',
-            'ext/fts1/fulltext.h',
-            'ext/fts1/simple_tokenizer.c',
-            'ext/fts1/tokenizer.h',
-            'ext/fts2/fts2.c',
-            'ext/fts2/fts2.h',
-            'ext/fts2/fts2_hash.c',
-            'ext/fts2/fts2_hash.h',
-            'ext/fts2/fts2_icu.c',
-            'ext/fts2/fts2_porter.c',
-            'ext/fts2/fts2_tokenizer.c',
-            'ext/fts2/fts2_tokenizer.h',
-            'ext/fts2/fts2_tokenizer1.c',
-            'ext/fts3/fts3.c',
-            'ext/fts3/fts3.h',
-            'ext/fts3/fts3_expr.c',
-            'ext/fts3/fts3_expr.h',
-            'ext/fts3/fts3_hash.c',
-            'ext/fts3/fts3_hash.h',
-            'ext/fts3/fts3_icu.c',
-            'ext/fts3/fts3_porter.c',
-            'ext/fts3/fts3_tokenizer.c',
-            'ext/fts3/fts3_tokenizer.h',
-            'ext/fts3/fts3_tokenizer1.c',
-            'ext/icu/icu.c',
-            'ext/icu/sqliteicu.h',
-            'ext/rtree/rtree.c',
-            'ext/rtree/rtree.h',
-            'preprocessed/keywordhash.h',
-            'preprocessed/opcodes.c',
-            'preprocessed/opcodes.h',
-            'preprocessed/parse.c',
-            'preprocessed/parse.h',
-            'preprocessed/sqlite3.h',
-            'src/alter.c',
-            'src/analyze.c',
-            'src/attach.c',
-            'src/auth.c',
-            'src/backup.c',
-            'src/bitvec.c',
-            'src/btmutex.c',
-            'src/btree.c',
-            'src/btree.h',
-            'src/btreeInt.h',
-            'src/build.c',
-            'src/callback.c',
-            'src/complete.c',
-            'src/date.c',
-            'src/delete.c',
-            'src/expr.c',
-            'src/fault.c',
-            'src/func.c',
-            'src/global.c',
-            'src/hash.c',
-            'src/hash.h',
-            'src/hwtime.h',
-            'src/insert.c',
-            'src/journal.c',
-            'src/legacy.c',
-            'src/loadext.c',
-            'src/main.c',
-            'src/malloc.c',
-            'src/mem0.c',
-            'src/mem1.c',
-            'src/mem2.c',
-            'src/mem3.c',
-            'src/mem5.c',
-            'src/memjournal.c',
-            'src/mutex.c',
-            'src/mutex.h',
-            'src/mutex_noop.c',
-            'src/mutex_os2.c',
-            'src/mutex_unix.c',
-            'src/mutex_w32.c',
-            'src/notify.c',
-            'src/os.c',
-            'src/os.h',
-            'src/os_common.h',
-            'src/os_os2.c',
-            'src/os_symbian.cc',
-            'src/os_unix.c',
-            'src/os_win.c',
-            'src/pager.c',
-            'src/pager.h',
-            'src/pcache.c',
-            'src/pcache.h',
-            'src/pcache1.c',
-            'src/pragma.c',
-            'src/prepare.c',
-            'src/printf.c',
-            'src/random.c',
-            'src/resolve.c',
-            'src/rowset.c',
-            'src/select.c',
-            'src/sqlite3ext.h',
-            'src/sqliteInt.h',
-            'src/sqliteLimit.h',
-            'src/status.c',
-            'src/table.c',
-            'src/tclsqlite.c',
-            'src/tokenize.c',
-            'src/trigger.c',
-            'src/update.c',
-            'src/utf.c',
-            'src/util.c',
-            'src/vacuum.c',
-            'src/vdbe.c',
-            'src/vdbe.h',
-            'src/vdbeInt.h',
-            'src/vdbeapi.c',
-            'src/vdbeaux.c',
-            'src/vdbeblob.c',
-            'src/vdbemem.c',
-            'src/vtab.c',
-            'src/walker.c',
-            'src/where.c',
+            'src/ext/async/sqlite3async.c',
+            'src/ext/async/sqlite3async.h',
+            'src/ext/fts1/ft_hash.c',
+            'src/ext/fts1/ft_hash.h',
+            'src/ext/fts1/fts1.c',
+            'src/ext/fts1/fts1.h',
+            'src/ext/fts1/fts1_hash.c',
+            'src/ext/fts1/fts1_hash.h',
+            'src/ext/fts1/fts1_porter.c',
+            'src/ext/fts1/fts1_tokenizer.h',
+            'src/ext/fts1/fts1_tokenizer1.c',
+            'src/ext/fts1/fulltext.c',
+            'src/ext/fts1/fulltext.h',
+            'src/ext/fts1/simple_tokenizer.c',
+            'src/ext/fts1/tokenizer.h',
+            'src/ext/fts2/fts2.c',
+            'src/ext/fts2/fts2.h',
+            'src/ext/fts2/fts2_hash.c',
+            'src/ext/fts2/fts2_hash.h',
+            'src/ext/fts2/fts2_icu.c',
+            'src/ext/fts2/fts2_porter.c',
+            'src/ext/fts2/fts2_tokenizer.c',
+            'src/ext/fts2/fts2_tokenizer.h',
+            'src/ext/fts2/fts2_tokenizer1.c',
+            'src/ext/fts3/fts3.c',
+            'src/ext/fts3/fts3.h',
+            'src/ext/fts3/fts3_expr.c',
+            'src/ext/fts3/fts3_expr.h',
+            'src/ext/fts3/fts3_hash.c',
+            'src/ext/fts3/fts3_hash.h',
+            'src/ext/fts3/fts3_icu.c',
+            'src/ext/fts3/fts3_porter.c',
+            'src/ext/fts3/fts3_tokenizer.c',
+            'src/ext/fts3/fts3_tokenizer.h',
+            'src/ext/fts3/fts3_tokenizer1.c',
+            'src/ext/icu/icu.c',
+            'src/ext/icu/sqliteicu.h',
+            'src/ext/rtree/rtree.c',
+            'src/ext/rtree/rtree.h',
+            'src/preprocessed/keywordhash.h',
+            'src/preprocessed/opcodes.c',
+            'src/preprocessed/opcodes.h',
+            'src/preprocessed/parse.c',
+            'src/preprocessed/parse.h',
+            'src/preprocessed/sqlite3.h',
+            'src/src/alter.c',
+            'src/src/analyze.c',
+            'src/src/attach.c',
+            'src/src/auth.c',
+            'src/src/backup.c',
+            'src/src/bitvec.c',
+            'src/src/btmutex.c',
+            'src/src/btree.c',
+            'src/src/btree.h',
+            'src/src/btreeInt.h',
+            'src/src/build.c',
+            'src/src/callback.c',
+            'src/src/complete.c',
+            'src/src/date.c',
+            'src/src/delete.c',
+            'src/src/expr.c',
+            'src/src/fault.c',
+            'src/src/func.c',
+            'src/src/global.c',
+            'src/src/hash.c',
+            'src/src/hash.h',
+            'src/src/hwtime.h',
+            'src/src/insert.c',
+            'src/src/journal.c',
+            'src/src/legacy.c',
+            'src/src/loadext.c',
+            'src/src/main.c',
+            'src/src/malloc.c',
+            'src/src/mem0.c',
+            'src/src/mem1.c',
+            'src/src/mem2.c',
+            'src/src/mem3.c',
+            'src/src/mem5.c',
+            'src/src/memjournal.c',
+            'src/src/mutex.c',
+            'src/src/mutex.h',
+            'src/src/mutex_noop.c',
+            'src/src/mutex_os2.c',
+            'src/src/mutex_unix.c',
+            'src/src/mutex_w32.c',
+            'src/src/notify.c',
+            'src/src/os.c',
+            'src/src/os.h',
+            'src/src/os_common.h',
+            'src/src/os_os2.c',
+            'src/src/os_symbian.cc',
+            'src/src/os_unix.c',
+            'src/src/os_win.c',
+            'src/src/pager.c',
+            'src/src/pager.h',
+            'src/src/pcache.c',
+            'src/src/pcache.h',
+            'src/src/pcache1.c',
+            'src/src/pragma.c',
+            'src/src/prepare.c',
+            'src/src/printf.c',
+            'src/src/random.c',
+            'src/src/resolve.c',
+            'src/src/rowset.c',
+            'src/src/select.c',
+            'src/src/sqlite3ext.h',
+            'src/src/sqliteInt.h',
+            'src/src/sqliteLimit.h',
+            'src/src/status.c',
+            'src/src/table.c',
+            'src/src/tclsqlite.c',
+            'src/src/tokenize.c',
+            'src/src/trigger.c',
+            'src/src/update.c',
+            'src/src/utf.c',
+            'src/src/util.c',
+            'src/src/vacuum.c',
+            'src/src/vdbe.c',
+            'src/src/vdbe.h',
+            'src/src/vdbeInt.h',
+            'src/src/vdbeapi.c',
+            'src/src/vdbeaux.c',
+            'src/src/vdbeblob.c',
+            'src/src/vdbemem.c',
+            'src/src/vtab.c',
+            'src/src/walker.c',
+            'src/src/where.c',
           ],
           'sources/': [
-            ['exclude', '^ext/(fts1|rtree)/'],
+            ['exclude', '^src/ext/(fts1|rtree)/'],
             ['exclude', '(symbian|os2|noop)\\.cc?$'],
           ],
           'sources!': [
-            'src/journal.c',
-            'src/tclsqlite.c',
+            'src/src/journal.c',
+            'src/src/tclsqlite.c',
           ],
           'include_dirs': [
-            'ext/icu',
-            'preprocessed',
-            'src',
+            'src/ext/icu',
+            'src/preprocessed',
+            'src/src',
           ],
           'dependencies': [
             '../icu/icu.gyp:icui18n',
             '../icu/icu.gyp:icuuc',
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              'preprocessed',
-            ],
-          },
           'msvs_disabled_warnings': [
               4018, 4244,
           ],
@@ -238,8 +233,8 @@
             'sqlite',
           ],
           'sources': [
-            'src/shell.c',
-            'src/shell_icu_linux.c',
+            'src/src/shell.c',
+            'src/src/shell_icu_linux.c',
           ],
           'link_settings': {
             'link_languages': ['c++'],