Fossil SCM

Merge updates from trunk.

mistachkin 2018-03-17 20:53 UTC withMman merge
Commit 2c3b7457df93218e5fa375bca62958e2b7e96d772ef22fcbdc387b82a6fbea64
Parent 142218827c47309…
2 files changed +26 -1 +26 -1
~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin
M win/Makefile.mingw.mistachkin
+26 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -2305,11 +2305,36 @@
23052305
 -DSQLITE_WIN32_NO_ANSI \
23062306
 $(MINGW_OPTIONS) \
23072307
 -DSQLITE_USE_MALLOC_H \
23082308
 -DSQLITE_USE_MSIZE
23092309
2310
-SHELL_OPTIONS = -Dmain=sqlite3_shell \
2310
+SHELL_OPTIONS = -DNDEBUG=1 \
2311
+ -DSQLITE_THREADSAFE=0 \
2312
+ -DSQLITE_DEFAULT_MEMSTATUS=0 \
2313
+ -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
2314
+ -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
2315
+ -DSQLITE_OMIT_DECLTYPE \
2316
+ -DSQLITE_OMIT_DEPRECATED \
2317
+ -DSQLITE_OMIT_GET_TABLE \
2318
+ -DSQLITE_OMIT_PROGRESS_CALLBACK \
2319
+ -DSQLITE_OMIT_SHARED_CACHE \
2320
+ -DSQLITE_OMIT_LOAD_EXTENSION \
2321
+ -DSQLITE_MAX_EXPR_DEPTH=0 \
2322
+ -DSQLITE_USE_ALLOCA \
2323
+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2324
+ -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2325
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2326
+ -DSQLITE_ENABLE_FTS4 \
2327
+ -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2328
+ -DSQLITE_ENABLE_DBSTAT_VTAB \
2329
+ -DSQLITE_ENABLE_JSON1 \
2330
+ -DSQLITE_ENABLE_FTS5 \
2331
+ -DSQLITE_ENABLE_STMTVTAB \
2332
+ -DSQLITE_USE_ZLIB \
2333
+ -DSQLITE_INTROSPECTION_PRAGMAS \
2334
+ -DSQLITE_ENABLE_DBPAGE_VTAB \
2335
+ -Dmain=sqlite3_shell \
23112336
 -DSQLITE_SHELL_IS_UTF8=1 \
23122337
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
23132338
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
23142339
 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
23152340
 -Daccess=file_access \
23162341
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -2305,11 +2305,36 @@
2305 -DSQLITE_WIN32_NO_ANSI \
2306 $(MINGW_OPTIONS) \
2307 -DSQLITE_USE_MALLOC_H \
2308 -DSQLITE_USE_MSIZE
2309
2310 SHELL_OPTIONS = -Dmain=sqlite3_shell \
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2311 -DSQLITE_SHELL_IS_UTF8=1 \
2312 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2313 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2314 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
2315 -Daccess=file_access \
2316
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -2305,11 +2305,36 @@
2305 -DSQLITE_WIN32_NO_ANSI \
2306 $(MINGW_OPTIONS) \
2307 -DSQLITE_USE_MALLOC_H \
2308 -DSQLITE_USE_MSIZE
2309
2310 SHELL_OPTIONS = -DNDEBUG=1 \
2311 -DSQLITE_THREADSAFE=0 \
2312 -DSQLITE_DEFAULT_MEMSTATUS=0 \
2313 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
2314 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
2315 -DSQLITE_OMIT_DECLTYPE \
2316 -DSQLITE_OMIT_DEPRECATED \
2317 -DSQLITE_OMIT_GET_TABLE \
2318 -DSQLITE_OMIT_PROGRESS_CALLBACK \
2319 -DSQLITE_OMIT_SHARED_CACHE \
2320 -DSQLITE_OMIT_LOAD_EXTENSION \
2321 -DSQLITE_MAX_EXPR_DEPTH=0 \
2322 -DSQLITE_USE_ALLOCA \
2323 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2324 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2325 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2326 -DSQLITE_ENABLE_FTS4 \
2327 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2328 -DSQLITE_ENABLE_DBSTAT_VTAB \
2329 -DSQLITE_ENABLE_JSON1 \
2330 -DSQLITE_ENABLE_FTS5 \
2331 -DSQLITE_ENABLE_STMTVTAB \
2332 -DSQLITE_USE_ZLIB \
2333 -DSQLITE_INTROSPECTION_PRAGMAS \
2334 -DSQLITE_ENABLE_DBPAGE_VTAB \
2335 -Dmain=sqlite3_shell \
2336 -DSQLITE_SHELL_IS_UTF8=1 \
2337 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2338 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2339 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
2340 -Daccess=file_access \
2341
M win/Makefile.mingw.mistachkin
+26 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -2305,11 +2305,36 @@
23052305
 -DSQLITE_WIN32_NO_ANSI \
23062306
 $(MINGW_OPTIONS) \
23072307
 -DSQLITE_USE_MALLOC_H \
23082308
 -DSQLITE_USE_MSIZE
23092309
2310
-SHELL_OPTIONS = -Dmain=sqlite3_shell \
2310
+SHELL_OPTIONS = -DNDEBUG=1 \
2311
+ -DSQLITE_THREADSAFE=0 \
2312
+ -DSQLITE_DEFAULT_MEMSTATUS=0 \
2313
+ -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
2314
+ -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
2315
+ -DSQLITE_OMIT_DECLTYPE \
2316
+ -DSQLITE_OMIT_DEPRECATED \
2317
+ -DSQLITE_OMIT_GET_TABLE \
2318
+ -DSQLITE_OMIT_PROGRESS_CALLBACK \
2319
+ -DSQLITE_OMIT_SHARED_CACHE \
2320
+ -DSQLITE_OMIT_LOAD_EXTENSION \
2321
+ -DSQLITE_MAX_EXPR_DEPTH=0 \
2322
+ -DSQLITE_USE_ALLOCA \
2323
+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2324
+ -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2325
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2326
+ -DSQLITE_ENABLE_FTS4 \
2327
+ -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2328
+ -DSQLITE_ENABLE_DBSTAT_VTAB \
2329
+ -DSQLITE_ENABLE_JSON1 \
2330
+ -DSQLITE_ENABLE_FTS5 \
2331
+ -DSQLITE_ENABLE_STMTVTAB \
2332
+ -DSQLITE_USE_ZLIB \
2333
+ -DSQLITE_INTROSPECTION_PRAGMAS \
2334
+ -DSQLITE_ENABLE_DBPAGE_VTAB \
2335
+ -Dmain=sqlite3_shell \
23112336
 -DSQLITE_SHELL_IS_UTF8=1 \
23122337
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
23132338
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
23142339
 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
23152340
 -Daccess=file_access \
23162341
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -2305,11 +2305,36 @@
2305 -DSQLITE_WIN32_NO_ANSI \
2306 $(MINGW_OPTIONS) \
2307 -DSQLITE_USE_MALLOC_H \
2308 -DSQLITE_USE_MSIZE
2309
2310 SHELL_OPTIONS = -Dmain=sqlite3_shell \
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2311 -DSQLITE_SHELL_IS_UTF8=1 \
2312 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2313 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2314 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
2315 -Daccess=file_access \
2316
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -2305,11 +2305,36 @@
2305 -DSQLITE_WIN32_NO_ANSI \
2306 $(MINGW_OPTIONS) \
2307 -DSQLITE_USE_MALLOC_H \
2308 -DSQLITE_USE_MSIZE
2309
2310 SHELL_OPTIONS = -DNDEBUG=1 \
2311 -DSQLITE_THREADSAFE=0 \
2312 -DSQLITE_DEFAULT_MEMSTATUS=0 \
2313 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
2314 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
2315 -DSQLITE_OMIT_DECLTYPE \
2316 -DSQLITE_OMIT_DEPRECATED \
2317 -DSQLITE_OMIT_GET_TABLE \
2318 -DSQLITE_OMIT_PROGRESS_CALLBACK \
2319 -DSQLITE_OMIT_SHARED_CACHE \
2320 -DSQLITE_OMIT_LOAD_EXTENSION \
2321 -DSQLITE_MAX_EXPR_DEPTH=0 \
2322 -DSQLITE_USE_ALLOCA \
2323 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
2324 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2325 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2326 -DSQLITE_ENABLE_FTS4 \
2327 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2328 -DSQLITE_ENABLE_DBSTAT_VTAB \
2329 -DSQLITE_ENABLE_JSON1 \
2330 -DSQLITE_ENABLE_FTS5 \
2331 -DSQLITE_ENABLE_STMTVTAB \
2332 -DSQLITE_USE_ZLIB \
2333 -DSQLITE_INTROSPECTION_PRAGMAS \
2334 -DSQLITE_ENABLE_DBPAGE_VTAB \
2335 -Dmain=sqlite3_shell \
2336 -DSQLITE_SHELL_IS_UTF8=1 \
2337 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
2338 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
2339 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
2340 -Daccess=file_access \
2341

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button