| Index: third_party/sqlite/sqlite.gyp
|
| diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
|
| index 71a66bd8ee8553ad681a4a34e6bcbdf0cb456289..1f50f5e109275627861023b5fa76a5dddc91f78d 100644
|
| --- a/third_party/sqlite/sqlite.gyp
|
| +++ b/third_party/sqlite/sqlite.gyp
|
| @@ -1,4 +1,4 @@
|
| -# Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| +# Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| @@ -69,31 +69,10 @@
|
| 'type': '<(library)',
|
| 'msvs_guid': '6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9',
|
| 'sources': [
|
| - # This list contains all .h, .c, and .cc files in the directories
|
| - # 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.
|
| - 'preprocessed/keywordhash.h',
|
| - 'preprocessed/opcodes.c',
|
| - 'preprocessed/opcodes.h',
|
| - 'preprocessed/parse.c',
|
| - 'preprocessed/parse.h',
|
| - 'preprocessed/sqlite3.h',
|
| - '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',
|
| + 'amalgamation/sqlite3.h',
|
| + 'amalgamation/sqlite3.c',
|
| + # fts2.c currently has a lot of conflicts when added to
|
| + # the amalgamation. It is probably not worth fixing that.
|
| 'src/ext/fts2/fts2.c',
|
| 'src/ext/fts2/fts2.h',
|
| 'src/ext/fts2/fts2_hash.c',
|
| @@ -103,115 +82,18 @@
|
| '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/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', '^src/ext/(fts1|rtree)/'],
|
| - ['exclude', '(symbian|os2|noop)\\.cc?$'],
|
| - ],
|
| - 'sources!': [
|
| - 'src/src/journal.c',
|
| - 'src/src/tclsqlite.c',
|
| ],
|
| +
|
| + # TODO(shess): Previously fts1 and rtree files were
|
| + # explicitly excluded from the build. Make sure they are
|
| + # logically still excluded.
|
| +
|
| + # TODO(shess): Should all of the sources be listed and then
|
| + # excluded? For editing purposes?
|
| +
|
| 'include_dirs': [
|
| - 'preprocessed',
|
| - 'src/ext/icu',
|
| + 'amalgamation',
|
| + # Needed for fts2 to build.
|
| 'src/src',
|
| ],
|
| 'dependencies': [
|
| @@ -228,11 +110,6 @@
|
| 4018, 4244,
|
| ],
|
| 'conditions': [
|
| - ['OS=="win"', {
|
| - 'sources/': [['exclude', '_unix\\.cc?$']],
|
| - }, { # else: OS!="win"
|
| - 'sources/': [['exclude', '_(w32|win)\\.cc?$']],
|
| - }],
|
| ['OS=="linux"', {
|
| 'cflags': [
|
| # SQLite doesn't believe in compiler warnings,
|
|
|
Chromium Code Reviews
Issue 6835006:
Convert to SQLite amalgamation. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src