Fossil SCM
Add SQLITE_ENABLE_SETLK_TIMEOUT to the default SQLite configuration.
Commit
c953e01c9e0155b081ae2d38b851aa1e527da37c30ee7b54e39fb3f1ffd4ca9d
Parent
7641c8296144dd9…
5 files changed
+2
+1
+2
-2
+2
+2
+2
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -655,10 +655,11 @@ | ||
| 655 | 655 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 656 | 656 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 657 | 657 | -DSQLITE_ENABLE_FTS4 \ |
| 658 | 658 | -DSQLITE_ENABLE_FTS5 \ |
| 659 | 659 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 660 | + -DSQLITE_ENABLE_SETLK_TIMEOUT \ | |
| 660 | 661 | -DSQLITE_ENABLE_STMTVTAB \ |
| 661 | 662 | -DSQLITE_HAVE_ZLIB \ |
| 662 | 663 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 663 | 664 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 664 | 665 | -DHAVE_USLEEP |
| @@ -681,10 +682,11 @@ | ||
| 681 | 682 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 682 | 683 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 683 | 684 | -DSQLITE_ENABLE_FTS4 \ |
| 684 | 685 | -DSQLITE_ENABLE_FTS5 \ |
| 685 | 686 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 687 | + -DSQLITE_ENABLE_SETLK_TIMEOUT \ | |
| 686 | 688 | -DSQLITE_ENABLE_STMTVTAB \ |
| 687 | 689 | -DSQLITE_HAVE_ZLIB \ |
| 688 | 690 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 689 | 691 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 690 | 692 | -DHAVE_USLEEP \ |
| 691 | 693 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -655,10 +655,11 @@ | |
| 655 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 656 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 657 | -DSQLITE_ENABLE_FTS4 \ |
| 658 | -DSQLITE_ENABLE_FTS5 \ |
| 659 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 660 | -DSQLITE_ENABLE_STMTVTAB \ |
| 661 | -DSQLITE_HAVE_ZLIB \ |
| 662 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 663 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 664 | -DHAVE_USLEEP |
| @@ -681,10 +682,11 @@ | |
| 681 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 682 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 683 | -DSQLITE_ENABLE_FTS4 \ |
| 684 | -DSQLITE_ENABLE_FTS5 \ |
| 685 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 686 | -DSQLITE_ENABLE_STMTVTAB \ |
| 687 | -DSQLITE_HAVE_ZLIB \ |
| 688 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 689 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 690 | -DHAVE_USLEEP \ |
| 691 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -655,10 +655,11 @@ | |
| 655 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 656 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 657 | -DSQLITE_ENABLE_FTS4 \ |
| 658 | -DSQLITE_ENABLE_FTS5 \ |
| 659 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 660 | -DSQLITE_ENABLE_SETLK_TIMEOUT \ |
| 661 | -DSQLITE_ENABLE_STMTVTAB \ |
| 662 | -DSQLITE_HAVE_ZLIB \ |
| 663 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 664 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 665 | -DHAVE_USLEEP |
| @@ -681,10 +682,11 @@ | |
| 682 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 683 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 684 | -DSQLITE_ENABLE_FTS4 \ |
| 685 | -DSQLITE_ENABLE_FTS5 \ |
| 686 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 687 | -DSQLITE_ENABLE_SETLK_TIMEOUT \ |
| 688 | -DSQLITE_ENABLE_STMTVTAB \ |
| 689 | -DSQLITE_HAVE_ZLIB \ |
| 690 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 691 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 692 | -DHAVE_USLEEP \ |
| 693 |
+1
| --- tools/makemake.tcl | ||
| +++ tools/makemake.tcl | ||
| @@ -245,10 +245,11 @@ | ||
| 245 | 245 | -DSQLITE_ENABLE_DBSTAT_VTAB |
| 246 | 246 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 247 | 247 | -DSQLITE_ENABLE_FTS4 |
| 248 | 248 | -DSQLITE_ENABLE_FTS5 |
| 249 | 249 | -DSQLITE_ENABLE_MATH_FUNCTIONS |
| 250 | + -DSQLITE_ENABLE_SETLK_TIMEOUT | |
| 250 | 251 | -DSQLITE_ENABLE_STMTVTAB |
| 251 | 252 | -DSQLITE_HAVE_ZLIB |
| 252 | 253 | -DSQLITE_ENABLE_DBPAGE_VTAB |
| 253 | 254 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 254 | 255 | -DHAVE_USLEEP |
| 255 | 256 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -245,10 +245,11 @@ | |
| 245 | -DSQLITE_ENABLE_DBSTAT_VTAB |
| 246 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 247 | -DSQLITE_ENABLE_FTS4 |
| 248 | -DSQLITE_ENABLE_FTS5 |
| 249 | -DSQLITE_ENABLE_MATH_FUNCTIONS |
| 250 | -DSQLITE_ENABLE_STMTVTAB |
| 251 | -DSQLITE_HAVE_ZLIB |
| 252 | -DSQLITE_ENABLE_DBPAGE_VTAB |
| 253 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 254 | -DHAVE_USLEEP |
| 255 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -245,10 +245,11 @@ | |
| 245 | -DSQLITE_ENABLE_DBSTAT_VTAB |
| 246 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 247 | -DSQLITE_ENABLE_FTS4 |
| 248 | -DSQLITE_ENABLE_FTS5 |
| 249 | -DSQLITE_ENABLE_MATH_FUNCTIONS |
| 250 | -DSQLITE_ENABLE_SETLK_TIMEOUT |
| 251 | -DSQLITE_ENABLE_STMTVTAB |
| 252 | -DSQLITE_HAVE_ZLIB |
| 253 | -DSQLITE_ENABLE_DBPAGE_VTAB |
| 254 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 255 | -DHAVE_USLEEP |
| 256 |
+2
-2
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -26,13 +26,13 @@ | ||
| 26 | 26 | CFLAGS = -o |
| 27 | 27 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 28 | 28 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 29 | 29 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi |
| 30 | 30 | |
| 31 | -SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP | |
| 31 | +SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP | |
| 32 | 32 | |
| 33 | -SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen | |
| 33 | +SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen | |
| 34 | 34 | |
| 35 | 35 | PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000 |
| 36 | 36 | |
| 37 | 37 | SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c |
| 38 | 38 | |
| 39 | 39 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -26,13 +26,13 @@ | |
| 26 | CFLAGS = -o |
| 27 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 28 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 29 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi |
| 30 | |
| 31 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP |
| 32 | |
| 33 | SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 34 | |
| 35 | PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000 |
| 36 | |
| 37 | SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c |
| 38 | |
| 39 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -26,13 +26,13 @@ | |
| 26 | CFLAGS = -o |
| 27 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 28 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 29 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi |
| 30 | |
| 31 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP |
| 32 | |
| 33 | SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_SETLK_TIMEOUT -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 34 | |
| 35 | PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000 |
| 36 | |
| 37 | SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 match_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c |
| 38 | |
| 39 |
+2
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -2533,10 +2533,11 @@ | ||
| 2533 | 2533 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2534 | 2534 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2535 | 2535 | -DSQLITE_ENABLE_FTS4 \ |
| 2536 | 2536 | -DSQLITE_ENABLE_FTS5 \ |
| 2537 | 2537 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 2538 | + -DSQLITE_ENABLE_SETLK_TIMEOUT \ | |
| 2538 | 2539 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2539 | 2540 | -DSQLITE_HAVE_ZLIB \ |
| 2540 | 2541 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2541 | 2542 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2542 | 2543 | -DHAVE_USLEEP \ |
| @@ -2562,10 +2563,11 @@ | ||
| 2562 | 2563 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2563 | 2564 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2564 | 2565 | -DSQLITE_ENABLE_FTS4 \ |
| 2565 | 2566 | -DSQLITE_ENABLE_FTS5 \ |
| 2566 | 2567 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 2568 | + -DSQLITE_ENABLE_SETLK_TIMEOUT \ | |
| 2567 | 2569 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2568 | 2570 | -DSQLITE_HAVE_ZLIB \ |
| 2569 | 2571 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2570 | 2572 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2571 | 2573 | -DHAVE_USLEEP \ |
| 2572 | 2574 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -2533,10 +2533,11 @@ | |
| 2533 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2534 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2535 | -DSQLITE_ENABLE_FTS4 \ |
| 2536 | -DSQLITE_ENABLE_FTS5 \ |
| 2537 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 2538 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2539 | -DSQLITE_HAVE_ZLIB \ |
| 2540 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2541 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2542 | -DHAVE_USLEEP \ |
| @@ -2562,10 +2563,11 @@ | |
| 2562 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2563 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2564 | -DSQLITE_ENABLE_FTS4 \ |
| 2565 | -DSQLITE_ENABLE_FTS5 \ |
| 2566 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 2567 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2568 | -DSQLITE_HAVE_ZLIB \ |
| 2569 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2570 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2571 | -DHAVE_USLEEP \ |
| 2572 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -2533,10 +2533,11 @@ | |
| 2533 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2534 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2535 | -DSQLITE_ENABLE_FTS4 \ |
| 2536 | -DSQLITE_ENABLE_FTS5 \ |
| 2537 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 2538 | -DSQLITE_ENABLE_SETLK_TIMEOUT \ |
| 2539 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2540 | -DSQLITE_HAVE_ZLIB \ |
| 2541 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2542 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2543 | -DHAVE_USLEEP \ |
| @@ -2562,10 +2563,11 @@ | |
| 2563 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2564 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2565 | -DSQLITE_ENABLE_FTS4 \ |
| 2566 | -DSQLITE_ENABLE_FTS5 \ |
| 2567 | -DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 2568 | -DSQLITE_ENABLE_SETLK_TIMEOUT \ |
| 2569 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2570 | -DSQLITE_HAVE_ZLIB \ |
| 2571 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2572 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2573 | -DHAVE_USLEEP \ |
| 2574 |
+2
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -316,10 +316,11 @@ | ||
| 316 | 316 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 317 | 317 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 318 | 318 | /DSQLITE_ENABLE_FTS4 \ |
| 319 | 319 | /DSQLITE_ENABLE_FTS5 \ |
| 320 | 320 | /DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 321 | + /DSQLITE_ENABLE_SETLK_TIMEOUT \ | |
| 321 | 322 | /DSQLITE_ENABLE_STMTVTAB \ |
| 322 | 323 | /DSQLITE_HAVE_ZLIB \ |
| 323 | 324 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 324 | 325 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 325 | 326 | /DHAVE_USLEEP \ |
| @@ -342,10 +343,11 @@ | ||
| 342 | 343 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 343 | 344 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 344 | 345 | /DSQLITE_ENABLE_FTS4 \ |
| 345 | 346 | /DSQLITE_ENABLE_FTS5 \ |
| 346 | 347 | /DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 348 | + /DSQLITE_ENABLE_SETLK_TIMEOUT \ | |
| 347 | 349 | /DSQLITE_ENABLE_STMTVTAB \ |
| 348 | 350 | /DSQLITE_HAVE_ZLIB \ |
| 349 | 351 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 350 | 352 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 351 | 353 | /DHAVE_USLEEP \ |
| 352 | 354 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -316,10 +316,11 @@ | |
| 316 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 317 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 318 | /DSQLITE_ENABLE_FTS4 \ |
| 319 | /DSQLITE_ENABLE_FTS5 \ |
| 320 | /DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 321 | /DSQLITE_ENABLE_STMTVTAB \ |
| 322 | /DSQLITE_HAVE_ZLIB \ |
| 323 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 324 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 325 | /DHAVE_USLEEP \ |
| @@ -342,10 +343,11 @@ | |
| 342 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 343 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 344 | /DSQLITE_ENABLE_FTS4 \ |
| 345 | /DSQLITE_ENABLE_FTS5 \ |
| 346 | /DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 347 | /DSQLITE_ENABLE_STMTVTAB \ |
| 348 | /DSQLITE_HAVE_ZLIB \ |
| 349 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 350 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 351 | /DHAVE_USLEEP \ |
| 352 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -316,10 +316,11 @@ | |
| 316 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 317 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 318 | /DSQLITE_ENABLE_FTS4 \ |
| 319 | /DSQLITE_ENABLE_FTS5 \ |
| 320 | /DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 321 | /DSQLITE_ENABLE_SETLK_TIMEOUT \ |
| 322 | /DSQLITE_ENABLE_STMTVTAB \ |
| 323 | /DSQLITE_HAVE_ZLIB \ |
| 324 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 325 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 326 | /DHAVE_USLEEP \ |
| @@ -342,10 +343,11 @@ | |
| 343 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 344 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 345 | /DSQLITE_ENABLE_FTS4 \ |
| 346 | /DSQLITE_ENABLE_FTS5 \ |
| 347 | /DSQLITE_ENABLE_MATH_FUNCTIONS \ |
| 348 | /DSQLITE_ENABLE_SETLK_TIMEOUT \ |
| 349 | /DSQLITE_ENABLE_STMTVTAB \ |
| 350 | /DSQLITE_HAVE_ZLIB \ |
| 351 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 352 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 353 | /DHAVE_USLEEP \ |
| 354 |