| OLD | NEW |
|---|
| (Empty) | |
| 1 From 46382c231e6580d1d056228b5bd021d5d1f7e0fd Mon Sep 17 00:00:00 2001 |
| 2 From: Scott Hess <shess@chromium.org> |
| 3 Date: Fri, 16 Jan 2015 13:07:04 -0800 |
| 4 Subject: [PATCH 16/24] [fts2][test] Add fts2 to testfixture. |
| 5 |
| 6 --- |
| 7 third_party/sqlite/src/Makefile.linux-gcc | 1 + |
| 8 third_party/sqlite/src/main.mk | 17 +++++++++++++++++ |
| 9 2 files changed, 18 insertions(+) |
| 10 |
| 11 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/
Makefile.linux-gcc |
| 12 index f60f1a1..026c03c 100644 |
| 13 --- a/third_party/sqlite/src/Makefile.linux-gcc |
| 14 +++ b/third_party/sqlite/src/Makefile.linux-gcc |
| 15 @@ -67,6 +67,7 @@ OPTS = -DNDEBUG=1 |
| 16 # These flags match those for SQLITE_CFLAGS in config.mk. |
| 17 |
| 18 OPTS += -DSQLITE_CORE |
| 19 +OPTS += -DSQLITE_ENABLE_FTS2 -DSQLITE_ENABLE_BROKEN_FTS2 |
| 20 OPTS += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 |
| 21 OPTS += -DHAVE_USLEEP=1 |
| 22 |
| 23 diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk |
| 24 index d20103f..4939da9 100644 |
| 25 --- a/third_party/sqlite/src/main.mk |
| 26 +++ b/third_party/sqlite/src/main.mk |
| 27 @@ -68,6 +68,12 @@ LIBOBJ+= alter.o analyze.o attach.o auth.o \ |
| 28 vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbetrace.o \ |
| 29 wal.o walker.o where.o utf.o vtab.o |
| 30 |
| 31 +LIBOBJ += fts2.o \ |
| 32 + fts2_hash.o \ |
| 33 + fts2_icu.o \ |
| 34 + fts2_porter.o \ |
| 35 + fts2_tokenizer.o \ |
| 36 + fts2_tokenizer1.o |
| 37 |
| 38 |
| 39 # All of the source code files. |
| 40 @@ -305,6 +311,17 @@ TESTSRC2 = \ |
| 41 $(TOP)/ext/fts3/fts3_write.c \ |
| 42 $(TOP)/ext/async/sqlite3async.c |
| 43 |
| 44 +TESTSRC2 += \ |
| 45 + $(TOP)/ext/fts2/fts2.c \ |
| 46 + $(TOP)/ext/fts2/fts2.h \ |
| 47 + $(TOP)/ext/fts2/fts2_hash.c \ |
| 48 + $(TOP)/ext/fts2/fts2_hash.h \ |
| 49 + $(TOP)/ext/fts2/fts2_icu.c \ |
| 50 + $(TOP)/ext/fts2/fts2_porter.c \ |
| 51 + $(TOP)/ext/fts2/fts2_tokenizer.h \ |
| 52 + $(TOP)/ext/fts2/fts2_tokenizer.c \ |
| 53 + $(TOP)/ext/fts2/fts2_tokenizer1.c |
| 54 + |
| 55 # Header files used by all library source files. |
| 56 # |
| 57 HDR = \ |
| 58 -- |
| 59 2.2.1 |
| 60 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 885473002:
[sql] Rewrite sqlite patching "system". (Closed)
Base URL: http://chromium.googlesource.com/chromium/src.git@master