Fossil SCM
Add the SQLITE_ENABLE_FTS3_PARENTHESIS compile-time option to SQLite to enable better full-text search pattern parsing.
Commit
d4acb48c53309eceb373966a2e61b65a2e916bb4
Parent
afbf6740f36c0f1…
6 files changed
+6
-2
+1
+1
-1
+1
-1
+4
+4
+6
-2
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -156,10 +156,13 @@ | ||
| 156 | 156 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 157 | 157 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 158 | 158 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 159 | 159 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 160 | 160 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 161 | + $(SRCDIR)/../skins/test/css.txt \ | |
| 162 | + $(SRCDIR)/../skins/test/footer.txt \ | |
| 163 | + $(SRCDIR)/../skins/test/header.txt \ | |
| 161 | 164 | $(SRCDIR)/diff.tcl \ |
| 162 | 165 | $(SRCDIR)/markdown.md |
| 163 | 166 | |
| 164 | 167 | TRANS_SRC = \ |
| 165 | 168 | $(OBJDIR)/add_.c \ |
| @@ -450,11 +453,12 @@ | ||
| 450 | 453 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 451 | 454 | -DSQLITE_THREADSAFE=0 \ |
| 452 | 455 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 453 | 456 | -DSQLITE_OMIT_DEPRECATED \ |
| 454 | 457 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 455 | - -DSQLITE_ENABLE_FTS4 | |
| 458 | + -DSQLITE_ENABLE_FTS4 \ | |
| 459 | + -DSQLITE_ENABLE_FTS3_PARENTHESIS | |
| 456 | 460 | |
| 457 | 461 | # Setup the options used to compile the included SQLite shell. |
| 458 | 462 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 459 | 463 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 460 | 464 | -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| @@ -491,11 +495,11 @@ | ||
| 491 | 495 | $(OBJDIR)/cson_amalgamation.o |
| 492 | 496 | |
| 493 | 497 | |
| 494 | 498 | $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ) |
| 495 | 499 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 496 | - $(TCC) $(CFLAGS) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) | |
| 500 | + $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) | |
| 497 | 501 | |
| 498 | 502 | # This rule prevents make from using its default rules to try build |
| 499 | 503 | # an executable named "manifest" out of the file named "manifest.c" |
| 500 | 504 | # |
| 501 | 505 | $(SRCDIR)/../manifest: |
| 502 | 506 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -156,10 +156,13 @@ | |
| 156 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 157 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 158 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 159 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 160 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 161 | $(SRCDIR)/diff.tcl \ |
| 162 | $(SRCDIR)/markdown.md |
| 163 | |
| 164 | TRANS_SRC = \ |
| 165 | $(OBJDIR)/add_.c \ |
| @@ -450,11 +453,12 @@ | |
| 450 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 451 | -DSQLITE_THREADSAFE=0 \ |
| 452 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 453 | -DSQLITE_OMIT_DEPRECATED \ |
| 454 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 455 | -DSQLITE_ENABLE_FTS4 |
| 456 | |
| 457 | # Setup the options used to compile the included SQLite shell. |
| 458 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 459 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 460 | -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| @@ -491,11 +495,11 @@ | |
| 491 | $(OBJDIR)/cson_amalgamation.o |
| 492 | |
| 493 | |
| 494 | $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ) |
| 495 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 496 | $(TCC) $(CFLAGS) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) |
| 497 | |
| 498 | # This rule prevents make from using its default rules to try build |
| 499 | # an executable named "manifest" out of the file named "manifest.c" |
| 500 | # |
| 501 | $(SRCDIR)/../manifest: |
| 502 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -156,10 +156,13 @@ | |
| 156 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 157 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 158 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 159 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 160 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 161 | $(SRCDIR)/../skins/test/css.txt \ |
| 162 | $(SRCDIR)/../skins/test/footer.txt \ |
| 163 | $(SRCDIR)/../skins/test/header.txt \ |
| 164 | $(SRCDIR)/diff.tcl \ |
| 165 | $(SRCDIR)/markdown.md |
| 166 | |
| 167 | TRANS_SRC = \ |
| 168 | $(OBJDIR)/add_.c \ |
| @@ -450,11 +453,12 @@ | |
| 453 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 454 | -DSQLITE_THREADSAFE=0 \ |
| 455 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 456 | -DSQLITE_OMIT_DEPRECATED \ |
| 457 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 458 | -DSQLITE_ENABLE_FTS4 \ |
| 459 | -DSQLITE_ENABLE_FTS3_PARENTHESIS |
| 460 | |
| 461 | # Setup the options used to compile the included SQLite shell. |
| 462 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 463 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 464 | -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| @@ -491,11 +495,11 @@ | |
| 495 | $(OBJDIR)/cson_amalgamation.o |
| 496 | |
| 497 | |
| 498 | $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ) |
| 499 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 500 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) |
| 501 | |
| 502 | # This rule prevents make from using its default rules to try build |
| 503 | # an executable named "manifest" out of the file named "manifest.c" |
| 504 | # |
| 505 | $(SRCDIR)/../manifest: |
| 506 |
+1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -158,10 +158,11 @@ | ||
| 158 | 158 | -DSQLITE_THREADSAFE=0 |
| 159 | 159 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 160 | 160 | -DSQLITE_OMIT_DEPRECATED |
| 161 | 161 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 162 | 162 | -DSQLITE_ENABLE_FTS4 |
| 163 | + -DSQLITE_ENABLE_FTS3_PARENTHESIS | |
| 163 | 164 | } |
| 164 | 165 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 165 | 166 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 166 | 167 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 167 | 168 | #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096 |
| 168 | 169 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -158,10 +158,11 @@ | |
| 158 | -DSQLITE_THREADSAFE=0 |
| 159 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 160 | -DSQLITE_OMIT_DEPRECATED |
| 161 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 162 | -DSQLITE_ENABLE_FTS4 |
| 163 | } |
| 164 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 165 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 166 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 167 | #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096 |
| 168 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -158,10 +158,11 @@ | |
| 158 | -DSQLITE_THREADSAFE=0 |
| 159 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 160 | -DSQLITE_OMIT_DEPRECATED |
| 161 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 162 | -DSQLITE_ENABLE_FTS4 |
| 163 | -DSQLITE_ENABLE_FTS3_PARENTHESIS |
| 164 | } |
| 165 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 166 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 167 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 168 | #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096 |
| 169 |
+1
-1
| --- win/Makefile.PellesCGMake | ||
| +++ win/Makefile.PellesCGMake | ||
| @@ -83,11 +83,11 @@ | ||
| 83 | 83 | |
| 84 | 84 | # define the SQLite files, which need special flags on compile |
| 85 | 85 | SQLITESRC=sqlite3.c |
| 86 | 86 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf)) |
| 87 | 87 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 88 | -SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_WIN32_NO_ANSI | |
| 88 | +SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_WIN32_NO_ANSI | |
| 89 | 89 | |
| 90 | 90 | # define the SQLite shell files, which need special flags on compile |
| 91 | 91 | SQLITESHELLSRC=shell.c |
| 92 | 92 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf)) |
| 93 | 93 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 94 | 94 |
| --- win/Makefile.PellesCGMake | |
| +++ win/Makefile.PellesCGMake | |
| @@ -83,11 +83,11 @@ | |
| 83 | |
| 84 | # define the SQLite files, which need special flags on compile |
| 85 | SQLITESRC=sqlite3.c |
| 86 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf)) |
| 87 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 88 | SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_WIN32_NO_ANSI |
| 89 | |
| 90 | # define the SQLite shell files, which need special flags on compile |
| 91 | SQLITESHELLSRC=shell.c |
| 92 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf)) |
| 93 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 94 |
| --- win/Makefile.PellesCGMake | |
| +++ win/Makefile.PellesCGMake | |
| @@ -83,11 +83,11 @@ | |
| 83 | |
| 84 | # define the SQLite files, which need special flags on compile |
| 85 | SQLITESRC=sqlite3.c |
| 86 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf)) |
| 87 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 88 | SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_WIN32_NO_ANSI |
| 89 | |
| 90 | # define the SQLite shell files, which need special flags on compile |
| 91 | SQLITESHELLSRC=shell.c |
| 92 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf)) |
| 93 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 94 |
+1
-1
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -24,11 +24,11 @@ | ||
| 24 | 24 | CFLAGS = -o |
| 25 | 25 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 26 | 26 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 27 | 27 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 |
| 28 | 28 | |
| 29 | -SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 | |
| 29 | +SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS | |
| 30 | 30 | |
| 31 | 31 | SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | 32 | |
| 33 | 33 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c foci_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c |
| 34 | 34 | |
| 35 | 35 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -24,11 +24,11 @@ | |
| 24 | CFLAGS = -o |
| 25 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 26 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 27 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 |
| 28 | |
| 29 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 |
| 30 | |
| 31 | SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | |
| 33 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c foci_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c |
| 34 | |
| 35 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -24,11 +24,11 @@ | |
| 24 | CFLAGS = -o |
| 25 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 26 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 27 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 |
| 28 | |
| 29 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS |
| 30 | |
| 31 | SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | |
| 33 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c foci_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c |
| 34 | |
| 35 |
+4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -509,10 +509,13 @@ | ||
| 509 | 509 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 510 | 510 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 511 | 511 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 512 | 512 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 513 | 513 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 514 | + $(SRCDIR)/../skins/test/css.txt \ | |
| 515 | + $(SRCDIR)/../skins/test/footer.txt \ | |
| 516 | + $(SRCDIR)/../skins/test/header.txt \ | |
| 514 | 517 | $(SRCDIR)/diff.tcl \ |
| 515 | 518 | $(SRCDIR)/markdown.md |
| 516 | 519 | |
| 517 | 520 | TRANS_SRC = \ |
| 518 | 521 | $(OBJDIR)/add_.c \ |
| @@ -2025,10 +2028,11 @@ | ||
| 2025 | 2028 | -DSQLITE_THREADSAFE=0 \ |
| 2026 | 2029 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2027 | 2030 | -DSQLITE_OMIT_DEPRECATED \ |
| 2028 | 2031 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2029 | 2032 | -DSQLITE_ENABLE_FTS4 \ |
| 2033 | + -DSQLITE_ENABLE_FTS3_PARENTHESIS \ | |
| 2030 | 2034 | -DSQLITE_WIN32_NO_ANSI \ |
| 2031 | 2035 | -D_HAVE__MINGW_H \ |
| 2032 | 2036 | -DSQLITE_USE_MALLOC_H \ |
| 2033 | 2037 | -DSQLITE_USE_MSIZE |
| 2034 | 2038 | |
| 2035 | 2039 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -509,10 +509,13 @@ | |
| 509 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 510 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 511 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 512 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 513 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 514 | $(SRCDIR)/diff.tcl \ |
| 515 | $(SRCDIR)/markdown.md |
| 516 | |
| 517 | TRANS_SRC = \ |
| 518 | $(OBJDIR)/add_.c \ |
| @@ -2025,10 +2028,11 @@ | |
| 2025 | -DSQLITE_THREADSAFE=0 \ |
| 2026 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2027 | -DSQLITE_OMIT_DEPRECATED \ |
| 2028 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2029 | -DSQLITE_ENABLE_FTS4 \ |
| 2030 | -DSQLITE_WIN32_NO_ANSI \ |
| 2031 | -D_HAVE__MINGW_H \ |
| 2032 | -DSQLITE_USE_MALLOC_H \ |
| 2033 | -DSQLITE_USE_MSIZE |
| 2034 | |
| 2035 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -509,10 +509,13 @@ | |
| 509 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 510 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 511 | $(SRCDIR)/../skins/rounded1/css.txt \ |
| 512 | $(SRCDIR)/../skins/rounded1/footer.txt \ |
| 513 | $(SRCDIR)/../skins/rounded1/header.txt \ |
| 514 | $(SRCDIR)/../skins/test/css.txt \ |
| 515 | $(SRCDIR)/../skins/test/footer.txt \ |
| 516 | $(SRCDIR)/../skins/test/header.txt \ |
| 517 | $(SRCDIR)/diff.tcl \ |
| 518 | $(SRCDIR)/markdown.md |
| 519 | |
| 520 | TRANS_SRC = \ |
| 521 | $(OBJDIR)/add_.c \ |
| @@ -2025,10 +2028,11 @@ | |
| 2028 | -DSQLITE_THREADSAFE=0 \ |
| 2029 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2030 | -DSQLITE_OMIT_DEPRECATED \ |
| 2031 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2032 | -DSQLITE_ENABLE_FTS4 \ |
| 2033 | -DSQLITE_ENABLE_FTS3_PARENTHESIS \ |
| 2034 | -DSQLITE_WIN32_NO_ANSI \ |
| 2035 | -D_HAVE__MINGW_H \ |
| 2036 | -DSQLITE_USE_MALLOC_H \ |
| 2037 | -DSQLITE_USE_MSIZE |
| 2038 | |
| 2039 |
+4
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -190,10 +190,11 @@ | ||
| 190 | 190 | /DSQLITE_THREADSAFE=0 \ |
| 191 | 191 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 192 | 192 | /DSQLITE_OMIT_DEPRECATED \ |
| 193 | 193 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 194 | 194 | /DSQLITE_ENABLE_FTS4 \ |
| 195 | + /DSQLITE_ENABLE_FTS3_PARENTHESIS \ | |
| 195 | 196 | /DSQLITE_WIN32_NO_ANSI |
| 196 | 197 | |
| 197 | 198 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 198 | 199 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 199 | 200 | /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| @@ -348,10 +349,13 @@ | ||
| 348 | 349 | $(SRCDIR)\../skins/plain_gray/footer.txt \ |
| 349 | 350 | $(SRCDIR)\../skins/plain_gray/header.txt \ |
| 350 | 351 | $(SRCDIR)\../skins/rounded1/css.txt \ |
| 351 | 352 | $(SRCDIR)\../skins/rounded1/footer.txt \ |
| 352 | 353 | $(SRCDIR)\../skins/rounded1/header.txt \ |
| 354 | + $(SRCDIR)\../skins/test/css.txt \ | |
| 355 | + $(SRCDIR)\../skins/test/footer.txt \ | |
| 356 | + $(SRCDIR)\../skins/test/header.txt \ | |
| 353 | 357 | $(SRCDIR)\diff.tcl \ |
| 354 | 358 | $(SRCDIR)\markdown.md |
| 355 | 359 | |
| 356 | 360 | OBJ = $(OX)\add$O \ |
| 357 | 361 | $(OX)\allrepo$O \ |
| 358 | 362 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -190,10 +190,11 @@ | |
| 190 | /DSQLITE_THREADSAFE=0 \ |
| 191 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 192 | /DSQLITE_OMIT_DEPRECATED \ |
| 193 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 194 | /DSQLITE_ENABLE_FTS4 \ |
| 195 | /DSQLITE_WIN32_NO_ANSI |
| 196 | |
| 197 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 198 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 199 | /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| @@ -348,10 +349,13 @@ | |
| 348 | $(SRCDIR)\../skins/plain_gray/footer.txt \ |
| 349 | $(SRCDIR)\../skins/plain_gray/header.txt \ |
| 350 | $(SRCDIR)\../skins/rounded1/css.txt \ |
| 351 | $(SRCDIR)\../skins/rounded1/footer.txt \ |
| 352 | $(SRCDIR)\../skins/rounded1/header.txt \ |
| 353 | $(SRCDIR)\diff.tcl \ |
| 354 | $(SRCDIR)\markdown.md |
| 355 | |
| 356 | OBJ = $(OX)\add$O \ |
| 357 | $(OX)\allrepo$O \ |
| 358 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -190,10 +190,11 @@ | |
| 190 | /DSQLITE_THREADSAFE=0 \ |
| 191 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 192 | /DSQLITE_OMIT_DEPRECATED \ |
| 193 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 194 | /DSQLITE_ENABLE_FTS4 \ |
| 195 | /DSQLITE_ENABLE_FTS3_PARENTHESIS \ |
| 196 | /DSQLITE_WIN32_NO_ANSI |
| 197 | |
| 198 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 199 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 200 | /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| @@ -348,10 +349,13 @@ | |
| 349 | $(SRCDIR)\../skins/plain_gray/footer.txt \ |
| 350 | $(SRCDIR)\../skins/plain_gray/header.txt \ |
| 351 | $(SRCDIR)\../skins/rounded1/css.txt \ |
| 352 | $(SRCDIR)\../skins/rounded1/footer.txt \ |
| 353 | $(SRCDIR)\../skins/rounded1/header.txt \ |
| 354 | $(SRCDIR)\../skins/test/css.txt \ |
| 355 | $(SRCDIR)\../skins/test/footer.txt \ |
| 356 | $(SRCDIR)\../skins/test/header.txt \ |
| 357 | $(SRCDIR)\diff.tcl \ |
| 358 | $(SRCDIR)\markdown.md |
| 359 | |
| 360 | OBJ = $(OX)\add$O \ |
| 361 | $(OX)\allrepo$O \ |
| 362 |