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

Unified Diff: third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch

Issue 885473002: [sql] Rewrite sqlite patching "system". (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/patches/0016-fts2-test-Add-fts2-to-testfixture.patch
diff --git a/third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch b/third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ff82038c1ef1ee56fefbddb6ae0e8e21968d0269
--- /dev/null
+++ b/third_party/sqlite/patches/0016-fts2-test-Add-fts2-to-testfixture.patch
@@ -0,0 +1,60 @@
+From 46382c231e6580d1d056228b5bd021d5d1f7e0fd Mon Sep 17 00:00:00 2001
+From: Scott Hess <shess@chromium.org>
+Date: Fri, 16 Jan 2015 13:07:04 -0800
+Subject: [PATCH 16/24] [fts2][test] Add fts2 to testfixture.
+
+---
+ third_party/sqlite/src/Makefile.linux-gcc | 1 +
+ third_party/sqlite/src/main.mk | 17 +++++++++++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc
+index f60f1a1..026c03c 100644
+--- a/third_party/sqlite/src/Makefile.linux-gcc
++++ b/third_party/sqlite/src/Makefile.linux-gcc
+@@ -67,6 +67,7 @@ OPTS = -DNDEBUG=1
+ # These flags match those for SQLITE_CFLAGS in config.mk.
+
+ OPTS += -DSQLITE_CORE
++OPTS += -DSQLITE_ENABLE_FTS2 -DSQLITE_ENABLE_BROKEN_FTS2
+ OPTS += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600
+ OPTS += -DHAVE_USLEEP=1
+
+diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
+index d20103f..4939da9 100644
+--- a/third_party/sqlite/src/main.mk
++++ b/third_party/sqlite/src/main.mk
+@@ -68,6 +68,12 @@ LIBOBJ+= alter.o analyze.o attach.o auth.o \
+ vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbetrace.o \
+ wal.o walker.o where.o utf.o vtab.o
+
++LIBOBJ += fts2.o \
++ fts2_hash.o \
++ fts2_icu.o \
++ fts2_porter.o \
++ fts2_tokenizer.o \
++ fts2_tokenizer1.o
+
+
+ # All of the source code files.
+@@ -305,6 +311,17 @@ TESTSRC2 = \
+ $(TOP)/ext/fts3/fts3_write.c \
+ $(TOP)/ext/async/sqlite3async.c
+
++TESTSRC2 += \
++ $(TOP)/ext/fts2/fts2.c \
++ $(TOP)/ext/fts2/fts2.h \
++ $(TOP)/ext/fts2/fts2_hash.c \
++ $(TOP)/ext/fts2/fts2_hash.h \
++ $(TOP)/ext/fts2/fts2_icu.c \
++ $(TOP)/ext/fts2/fts2_porter.c \
++ $(TOP)/ext/fts2/fts2_tokenizer.h \
++ $(TOP)/ext/fts2/fts2_tokenizer.c \
++ $(TOP)/ext/fts2/fts2_tokenizer1.c
++
+ # Header files used by all library source files.
+ #
+ HDR = \
+--
+2.2.1
+

Powered by Google App Engine
This is Rietveld 408576698