Fossil SCM
Merge trunk. Implement new "max-worker-threads" setting, which controls the maximum number of auxilary worker threads that a single prepared statement may start.
Commit
3a9f3a73c2865bb768c43a0b876131639fdf41eb
Parent
8b2169089916f7a…
21 files changed
+6
+6
+1
+1
-1
-1
-1
-1
+1
+1
+1
-1
+1
-1
+1
-1
+1
-1
-1
-1
-1
-1
-1
-1
+31
-14
~
src/db.c
~
src/db.c
~
src/main.c
~
src/main.c
~
src/main.mk
~
src/main.mk
~
src/makemake.tcl
~
src/makemake.tcl
~
src/sqlcmd.c
~
src/sqlcmd.c
~
win/Makefile.PellesCGMake
~
win/Makefile.PellesCGMake
~
win/Makefile.dmc
~
win/Makefile.dmc
~
win/Makefile.mingw
~
win/Makefile.mingw
~
win/Makefile.mingw.mistachkin
~
win/Makefile.mingw.mistachkin
~
win/Makefile.msc
~
win/Makefile.msc
~
win/buildmsvc.bat
M
src/db.c
+6
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -741,10 +741,11 @@ | ||
| 741 | 741 | sqlite3_create_function( |
| 742 | 742 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 743 | 743 | ); |
| 744 | 744 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 745 | 745 | re_add_sql_func(db); |
| 746 | + sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.iMaxWorkerThreads); | |
| 746 | 747 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 747 | 748 | return db; |
| 748 | 749 | } |
| 749 | 750 | |
| 750 | 751 | |
| @@ -1050,10 +1051,11 @@ | ||
| 1050 | 1051 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1051 | 1052 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1052 | 1053 | g.repositoryOpen = 1; |
| 1053 | 1054 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1054 | 1055 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1056 | + g.iMaxWorkerThreads = db_get_int("max-worker-threads", 0); | |
| 1055 | 1057 | } |
| 1056 | 1058 | |
| 1057 | 1059 | /* |
| 1058 | 1060 | ** Flags for the db_find_and_open_repository() function. |
| 1059 | 1061 | */ |
| @@ -2188,10 +2190,11 @@ | ||
| 2188 | 2190 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2189 | 2191 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2190 | 2192 | { "manifest", 0, 0, 1, 0, "off" }, |
| 2191 | 2193 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2192 | 2194 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2195 | + { "max-worker-threads", 0, 16, 0, 0, "0" }, | |
| 2193 | 2196 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2194 | 2197 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2195 | 2198 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2196 | 2199 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2197 | 2200 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2352,10 +2355,13 @@ | ||
| 2352 | 2355 | ** when running as a web-server, Fossil does not open the |
| 2353 | 2356 | ** global configuration database. |
| 2354 | 2357 | ** |
| 2355 | 2358 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2356 | 2359 | ** default is 250000 bytes. |
| 2360 | +** | |
| 2361 | +** max-worker-threads The maximum number of auxiliary worker threads that a | |
| 2362 | +** single prepared statement may start. | |
| 2357 | 2363 | ** |
| 2358 | 2364 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2359 | 2365 | ** files have been modified. (Default "on".) |
| 2360 | 2366 | ** |
| 2361 | 2367 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 2362 | 2368 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -741,10 +741,11 @@ | |
| 741 | sqlite3_create_function( |
| 742 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 743 | ); |
| 744 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 745 | re_add_sql_func(db); |
| 746 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 747 | return db; |
| 748 | } |
| 749 | |
| 750 | |
| @@ -1050,10 +1051,11 @@ | |
| 1050 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1051 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1052 | g.repositoryOpen = 1; |
| 1053 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1054 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1055 | } |
| 1056 | |
| 1057 | /* |
| 1058 | ** Flags for the db_find_and_open_repository() function. |
| 1059 | */ |
| @@ -2188,10 +2190,11 @@ | |
| 2188 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2189 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2190 | { "manifest", 0, 0, 1, 0, "off" }, |
| 2191 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2192 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2193 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2194 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2195 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2196 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2197 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2352,10 +2355,13 @@ | |
| 2352 | ** when running as a web-server, Fossil does not open the |
| 2353 | ** global configuration database. |
| 2354 | ** |
| 2355 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2356 | ** default is 250000 bytes. |
| 2357 | ** |
| 2358 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2359 | ** files have been modified. (Default "on".) |
| 2360 | ** |
| 2361 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 2362 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -741,10 +741,11 @@ | |
| 741 | sqlite3_create_function( |
| 742 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 743 | ); |
| 744 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 745 | re_add_sql_func(db); |
| 746 | sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.iMaxWorkerThreads); |
| 747 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 748 | return db; |
| 749 | } |
| 750 | |
| 751 | |
| @@ -1050,10 +1051,11 @@ | |
| 1051 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1052 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1053 | g.repositoryOpen = 1; |
| 1054 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1055 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1056 | g.iMaxWorkerThreads = db_get_int("max-worker-threads", 0); |
| 1057 | } |
| 1058 | |
| 1059 | /* |
| 1060 | ** Flags for the db_find_and_open_repository() function. |
| 1061 | */ |
| @@ -2188,10 +2190,11 @@ | |
| 2190 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2191 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2192 | { "manifest", 0, 0, 1, 0, "off" }, |
| 2193 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2194 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2195 | { "max-worker-threads", 0, 16, 0, 0, "0" }, |
| 2196 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2197 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2198 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2199 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2200 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2352,10 +2355,13 @@ | |
| 2355 | ** when running as a web-server, Fossil does not open the |
| 2356 | ** global configuration database. |
| 2357 | ** |
| 2358 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2359 | ** default is 250000 bytes. |
| 2360 | ** |
| 2361 | ** max-worker-threads The maximum number of auxiliary worker threads that a |
| 2362 | ** single prepared statement may start. |
| 2363 | ** |
| 2364 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2365 | ** files have been modified. (Default "on".) |
| 2366 | ** |
| 2367 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 2368 |
M
src/db.c
+6
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -741,10 +741,11 @@ | ||
| 741 | 741 | sqlite3_create_function( |
| 742 | 742 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 743 | 743 | ); |
| 744 | 744 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 745 | 745 | re_add_sql_func(db); |
| 746 | + sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.iMaxWorkerThreads); | |
| 746 | 747 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 747 | 748 | return db; |
| 748 | 749 | } |
| 749 | 750 | |
| 750 | 751 | |
| @@ -1050,10 +1051,11 @@ | ||
| 1050 | 1051 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1051 | 1052 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1052 | 1053 | g.repositoryOpen = 1; |
| 1053 | 1054 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1054 | 1055 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1056 | + g.iMaxWorkerThreads = db_get_int("max-worker-threads", 0); | |
| 1055 | 1057 | } |
| 1056 | 1058 | |
| 1057 | 1059 | /* |
| 1058 | 1060 | ** Flags for the db_find_and_open_repository() function. |
| 1059 | 1061 | */ |
| @@ -2188,10 +2190,11 @@ | ||
| 2188 | 2190 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2189 | 2191 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2190 | 2192 | { "manifest", 0, 0, 1, 0, "off" }, |
| 2191 | 2193 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2192 | 2194 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2195 | + { "max-worker-threads", 0, 16, 0, 0, "0" }, | |
| 2193 | 2196 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2194 | 2197 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2195 | 2198 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2196 | 2199 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2197 | 2200 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2352,10 +2355,13 @@ | ||
| 2352 | 2355 | ** when running as a web-server, Fossil does not open the |
| 2353 | 2356 | ** global configuration database. |
| 2354 | 2357 | ** |
| 2355 | 2358 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2356 | 2359 | ** default is 250000 bytes. |
| 2360 | +** | |
| 2361 | +** max-worker-threads The maximum number of auxiliary worker threads that a | |
| 2362 | +** single prepared statement may start. | |
| 2357 | 2363 | ** |
| 2358 | 2364 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2359 | 2365 | ** files have been modified. (Default "on".) |
| 2360 | 2366 | ** |
| 2361 | 2367 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 2362 | 2368 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -741,10 +741,11 @@ | |
| 741 | sqlite3_create_function( |
| 742 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 743 | ); |
| 744 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 745 | re_add_sql_func(db); |
| 746 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 747 | return db; |
| 748 | } |
| 749 | |
| 750 | |
| @@ -1050,10 +1051,11 @@ | |
| 1050 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1051 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1052 | g.repositoryOpen = 1; |
| 1053 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1054 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1055 | } |
| 1056 | |
| 1057 | /* |
| 1058 | ** Flags for the db_find_and_open_repository() function. |
| 1059 | */ |
| @@ -2188,10 +2190,11 @@ | |
| 2188 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2189 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2190 | { "manifest", 0, 0, 1, 0, "off" }, |
| 2191 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2192 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2193 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2194 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2195 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2196 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2197 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2352,10 +2355,13 @@ | |
| 2352 | ** when running as a web-server, Fossil does not open the |
| 2353 | ** global configuration database. |
| 2354 | ** |
| 2355 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2356 | ** default is 250000 bytes. |
| 2357 | ** |
| 2358 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2359 | ** files have been modified. (Default "on".) |
| 2360 | ** |
| 2361 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 2362 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -741,10 +741,11 @@ | |
| 741 | sqlite3_create_function( |
| 742 | db, "if_selected", 3, SQLITE_UTF8, 0, file_is_selected,0,0 |
| 743 | ); |
| 744 | if( g.fSqlTrace ) sqlite3_trace(db, db_sql_trace, 0); |
| 745 | re_add_sql_func(db); |
| 746 | sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.iMaxWorkerThreads); |
| 747 | sqlite3_exec(db, "PRAGMA foreign_keys=OFF;", 0, 0, 0); |
| 748 | return db; |
| 749 | } |
| 750 | |
| 751 | |
| @@ -1050,10 +1051,11 @@ | |
| 1051 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1052 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1053 | g.repositoryOpen = 1; |
| 1054 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1055 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1056 | g.iMaxWorkerThreads = db_get_int("max-worker-threads", 0); |
| 1057 | } |
| 1058 | |
| 1059 | /* |
| 1060 | ** Flags for the db_find_and_open_repository() function. |
| 1061 | */ |
| @@ -2188,10 +2190,11 @@ | |
| 2190 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2191 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2192 | { "manifest", 0, 0, 1, 0, "off" }, |
| 2193 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2194 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2195 | { "max-worker-threads", 0, 16, 0, 0, "0" }, |
| 2196 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2197 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2198 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2199 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2200 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2352,10 +2355,13 @@ | |
| 2355 | ** when running as a web-server, Fossil does not open the |
| 2356 | ** global configuration database. |
| 2357 | ** |
| 2358 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2359 | ** default is 250000 bytes. |
| 2360 | ** |
| 2361 | ** max-worker-threads The maximum number of auxiliary worker threads that a |
| 2362 | ** single prepared statement may start. |
| 2363 | ** |
| 2364 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2365 | ** files have been modified. (Default "on".) |
| 2366 | ** |
| 2367 | ** pgp-command Command used to clear-sign manifests at check-in. |
| 2368 |
+1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -221,10 +221,11 @@ | ||
| 221 | 221 | int anAuxCols[MX_AUX]; /* Number of columns for option() values */ |
| 222 | 222 | |
| 223 | 223 | int allowSymlinks; /* Cached "allow-symlinks" option */ |
| 224 | 224 | |
| 225 | 225 | int mainTimerId; /* Set to fossil_timer_start() */ |
| 226 | + int iMaxWorkerThreads ; /* Store "max-worker-threads" setting */ | |
| 226 | 227 | #ifdef FOSSIL_ENABLE_JSON |
| 227 | 228 | struct FossilJsonBits { |
| 228 | 229 | int isJsonMode; /* True if running in JSON mode, else |
| 229 | 230 | false. This changes how errors are |
| 230 | 231 | reported. In JSON mode we try to |
| 231 | 232 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -221,10 +221,11 @@ | |
| 221 | int anAuxCols[MX_AUX]; /* Number of columns for option() values */ |
| 222 | |
| 223 | int allowSymlinks; /* Cached "allow-symlinks" option */ |
| 224 | |
| 225 | int mainTimerId; /* Set to fossil_timer_start() */ |
| 226 | #ifdef FOSSIL_ENABLE_JSON |
| 227 | struct FossilJsonBits { |
| 228 | int isJsonMode; /* True if running in JSON mode, else |
| 229 | false. This changes how errors are |
| 230 | reported. In JSON mode we try to |
| 231 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -221,10 +221,11 @@ | |
| 221 | int anAuxCols[MX_AUX]; /* Number of columns for option() values */ |
| 222 | |
| 223 | int allowSymlinks; /* Cached "allow-symlinks" option */ |
| 224 | |
| 225 | int mainTimerId; /* Set to fossil_timer_start() */ |
| 226 | int iMaxWorkerThreads ; /* Store "max-worker-threads" setting */ |
| 227 | #ifdef FOSSIL_ENABLE_JSON |
| 228 | struct FossilJsonBits { |
| 229 | int isJsonMode; /* True if running in JSON mode, else |
| 230 | false. This changes how errors are |
| 231 | reported. In JSON mode we try to |
| 232 |
+1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -221,10 +221,11 @@ | ||
| 221 | 221 | int anAuxCols[MX_AUX]; /* Number of columns for option() values */ |
| 222 | 222 | |
| 223 | 223 | int allowSymlinks; /* Cached "allow-symlinks" option */ |
| 224 | 224 | |
| 225 | 225 | int mainTimerId; /* Set to fossil_timer_start() */ |
| 226 | + int iMaxWorkerThreads ; /* Store "max-worker-threads" setting */ | |
| 226 | 227 | #ifdef FOSSIL_ENABLE_JSON |
| 227 | 228 | struct FossilJsonBits { |
| 228 | 229 | int isJsonMode; /* True if running in JSON mode, else |
| 229 | 230 | false. This changes how errors are |
| 230 | 231 | reported. In JSON mode we try to |
| 231 | 232 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -221,10 +221,11 @@ | |
| 221 | int anAuxCols[MX_AUX]; /* Number of columns for option() values */ |
| 222 | |
| 223 | int allowSymlinks; /* Cached "allow-symlinks" option */ |
| 224 | |
| 225 | int mainTimerId; /* Set to fossil_timer_start() */ |
| 226 | #ifdef FOSSIL_ENABLE_JSON |
| 227 | struct FossilJsonBits { |
| 228 | int isJsonMode; /* True if running in JSON mode, else |
| 229 | false. This changes how errors are |
| 230 | reported. In JSON mode we try to |
| 231 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -221,10 +221,11 @@ | |
| 221 | int anAuxCols[MX_AUX]; /* Number of columns for option() values */ |
| 222 | |
| 223 | int allowSymlinks; /* Cached "allow-symlinks" option */ |
| 224 | |
| 225 | int mainTimerId; /* Set to fossil_timer_start() */ |
| 226 | int iMaxWorkerThreads ; /* Store "max-worker-threads" setting */ |
| 227 | #ifdef FOSSIL_ENABLE_JSON |
| 228 | struct FossilJsonBits { |
| 229 | int isJsonMode; /* True if running in JSON mode, else |
| 230 | false. This changes how errors are |
| 231 | reported. In JSON mode we try to |
| 232 |
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -391,11 +391,10 @@ | ||
| 391 | 391 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 392 | 392 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 393 | 393 | -DSQLITE_THREADSAFE=2 \ |
| 394 | 394 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 395 | 395 | -DSQLITE_OMIT_DEPRECATED \ |
| 396 | - -DSQLITE_DEFAULT_WORKER_THREADS=1 \ | |
| 397 | 396 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 398 | 397 | |
| 399 | 398 | # Setup the options used to compile the included SQLite shell. |
| 400 | 399 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 401 | 400 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 402 | 401 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -391,11 +391,10 @@ | |
| 391 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 392 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 393 | -DSQLITE_THREADSAFE=2 \ |
| 394 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 395 | -DSQLITE_OMIT_DEPRECATED \ |
| 396 | -DSQLITE_DEFAULT_WORKER_THREADS=1 \ |
| 397 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 398 | |
| 399 | # Setup the options used to compile the included SQLite shell. |
| 400 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 401 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 402 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -391,11 +391,10 @@ | |
| 391 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 392 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 393 | -DSQLITE_THREADSAFE=2 \ |
| 394 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 395 | -DSQLITE_OMIT_DEPRECATED \ |
| 396 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 397 | |
| 398 | # Setup the options used to compile the included SQLite shell. |
| 399 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 400 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 401 |
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -391,11 +391,10 @@ | ||
| 391 | 391 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 392 | 392 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 393 | 393 | -DSQLITE_THREADSAFE=2 \ |
| 394 | 394 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 395 | 395 | -DSQLITE_OMIT_DEPRECATED \ |
| 396 | - -DSQLITE_DEFAULT_WORKER_THREADS=1 \ | |
| 397 | 396 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 398 | 397 | |
| 399 | 398 | # Setup the options used to compile the included SQLite shell. |
| 400 | 399 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 401 | 400 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 402 | 401 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -391,11 +391,10 @@ | |
| 391 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 392 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 393 | -DSQLITE_THREADSAFE=2 \ |
| 394 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 395 | -DSQLITE_OMIT_DEPRECATED \ |
| 396 | -DSQLITE_DEFAULT_WORKER_THREADS=1 \ |
| 397 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 398 | |
| 399 | # Setup the options used to compile the included SQLite shell. |
| 400 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 401 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 402 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -391,11 +391,10 @@ | |
| 391 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 392 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 393 | -DSQLITE_THREADSAFE=2 \ |
| 394 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 395 | -DSQLITE_OMIT_DEPRECATED \ |
| 396 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 397 | |
| 398 | # Setup the options used to compile the included SQLite shell. |
| 399 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 400 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 401 |
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -138,11 +138,10 @@ | ||
| 138 | 138 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 139 | 139 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 140 | 140 | -DSQLITE_THREADSAFE=2 |
| 141 | 141 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 142 | 142 | -DSQLITE_OMIT_DEPRECATED |
| 143 | - -DSQLITE_DEFAULT_WORKER_THREADS=1 | |
| 144 | 143 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 145 | 144 | } |
| 146 | 145 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 147 | 146 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 148 | 147 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 149 | 148 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -138,11 +138,10 @@ | |
| 138 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 139 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 140 | -DSQLITE_THREADSAFE=2 |
| 141 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 142 | -DSQLITE_OMIT_DEPRECATED |
| 143 | -DSQLITE_DEFAULT_WORKER_THREADS=1 |
| 144 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 145 | } |
| 146 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 147 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 148 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 149 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -138,11 +138,10 @@ | |
| 138 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 139 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 140 | -DSQLITE_THREADSAFE=2 |
| 141 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 142 | -DSQLITE_OMIT_DEPRECATED |
| 143 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 144 | } |
| 145 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 146 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 147 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 148 |
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -138,11 +138,10 @@ | ||
| 138 | 138 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 139 | 139 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 140 | 140 | -DSQLITE_THREADSAFE=2 |
| 141 | 141 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 142 | 142 | -DSQLITE_OMIT_DEPRECATED |
| 143 | - -DSQLITE_DEFAULT_WORKER_THREADS=1 | |
| 144 | 143 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 145 | 144 | } |
| 146 | 145 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 147 | 146 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 148 | 147 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 149 | 148 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -138,11 +138,10 @@ | |
| 138 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 139 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 140 | -DSQLITE_THREADSAFE=2 |
| 141 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 142 | -DSQLITE_OMIT_DEPRECATED |
| 143 | -DSQLITE_DEFAULT_WORKER_THREADS=1 |
| 144 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 145 | } |
| 146 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 147 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 148 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 149 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -138,11 +138,10 @@ | |
| 138 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 139 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 140 | -DSQLITE_THREADSAFE=2 |
| 141 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 142 | -DSQLITE_OMIT_DEPRECATED |
| 143 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 144 | } |
| 145 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 146 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 147 | #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI |
| 148 |
+1
| --- src/sqlcmd.c | ||
| +++ src/sqlcmd.c | ||
| @@ -124,10 +124,11 @@ | ||
| 124 | 124 | sqlite3_create_function(db, "compress", 1, SQLITE_UTF8, 0, |
| 125 | 125 | sqlcmd_compress, 0, 0); |
| 126 | 126 | sqlite3_create_function(db, "decompress", 1, SQLITE_UTF8, 0, |
| 127 | 127 | sqlcmd_decompress, 0, 0); |
| 128 | 128 | re_add_sql_func(db); |
| 129 | + sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.iMaxWorkerThreads); | |
| 129 | 130 | g.repositoryOpen = 1; |
| 130 | 131 | g.db = db; |
| 131 | 132 | return SQLITE_OK; |
| 132 | 133 | } |
| 133 | 134 | |
| 134 | 135 |
| --- src/sqlcmd.c | |
| +++ src/sqlcmd.c | |
| @@ -124,10 +124,11 @@ | |
| 124 | sqlite3_create_function(db, "compress", 1, SQLITE_UTF8, 0, |
| 125 | sqlcmd_compress, 0, 0); |
| 126 | sqlite3_create_function(db, "decompress", 1, SQLITE_UTF8, 0, |
| 127 | sqlcmd_decompress, 0, 0); |
| 128 | re_add_sql_func(db); |
| 129 | g.repositoryOpen = 1; |
| 130 | g.db = db; |
| 131 | return SQLITE_OK; |
| 132 | } |
| 133 | |
| 134 |
| --- src/sqlcmd.c | |
| +++ src/sqlcmd.c | |
| @@ -124,10 +124,11 @@ | |
| 124 | sqlite3_create_function(db, "compress", 1, SQLITE_UTF8, 0, |
| 125 | sqlcmd_compress, 0, 0); |
| 126 | sqlite3_create_function(db, "decompress", 1, SQLITE_UTF8, 0, |
| 127 | sqlcmd_decompress, 0, 0); |
| 128 | re_add_sql_func(db); |
| 129 | sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.iMaxWorkerThreads); |
| 130 | g.repositoryOpen = 1; |
| 131 | g.db = db; |
| 132 | return SQLITE_OK; |
| 133 | } |
| 134 | |
| 135 |
+1
| --- src/sqlcmd.c | ||
| +++ src/sqlcmd.c | ||
| @@ -124,10 +124,11 @@ | ||
| 124 | 124 | sqlite3_create_function(db, "compress", 1, SQLITE_UTF8, 0, |
| 125 | 125 | sqlcmd_compress, 0, 0); |
| 126 | 126 | sqlite3_create_function(db, "decompress", 1, SQLITE_UTF8, 0, |
| 127 | 127 | sqlcmd_decompress, 0, 0); |
| 128 | 128 | re_add_sql_func(db); |
| 129 | + sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.iMaxWorkerThreads); | |
| 129 | 130 | g.repositoryOpen = 1; |
| 130 | 131 | g.db = db; |
| 131 | 132 | return SQLITE_OK; |
| 132 | 133 | } |
| 133 | 134 | |
| 134 | 135 |
| --- src/sqlcmd.c | |
| +++ src/sqlcmd.c | |
| @@ -124,10 +124,11 @@ | |
| 124 | sqlite3_create_function(db, "compress", 1, SQLITE_UTF8, 0, |
| 125 | sqlcmd_compress, 0, 0); |
| 126 | sqlite3_create_function(db, "decompress", 1, SQLITE_UTF8, 0, |
| 127 | sqlcmd_decompress, 0, 0); |
| 128 | re_add_sql_func(db); |
| 129 | g.repositoryOpen = 1; |
| 130 | g.db = db; |
| 131 | return SQLITE_OK; |
| 132 | } |
| 133 | |
| 134 |
| --- src/sqlcmd.c | |
| +++ src/sqlcmd.c | |
| @@ -124,10 +124,11 @@ | |
| 124 | sqlite3_create_function(db, "compress", 1, SQLITE_UTF8, 0, |
| 125 | sqlcmd_compress, 0, 0); |
| 126 | sqlite3_create_function(db, "decompress", 1, SQLITE_UTF8, 0, |
| 127 | sqlcmd_decompress, 0, 0); |
| 128 | re_add_sql_func(db); |
| 129 | sqlite3_limit(db, SQLITE_LIMIT_WORKER_THREADS, g.iMaxWorkerThreads); |
| 130 | g.repositoryOpen = 1; |
| 131 | g.db = db; |
| 132 | return SQLITE_OK; |
| 133 | } |
| 134 | |
| 135 |
+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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_DEFAULT_WORKER_THREADS=1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_WIN32_NO_ANSI | |
| 88 | +SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_DEFAULT_WORKER_THREADS=1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -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.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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_DEFAULT_WORKER_THREADS=1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_WIN32_NO_ANSI | |
| 88 | +SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_DEFAULT_WORKER_THREADS=1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_DEFAULT_WORKER_THREADS=1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS | |
| 29 | +SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS | |
| 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 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 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 rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_DEFAULT_WORKER_THREADS=1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 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 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 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 rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 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 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 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 rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.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 |
+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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_DEFAULT_WORKER_THREADS=1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS | |
| 29 | +SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS | |
| 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 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 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 rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_DEFAULT_WORKER_THREADS=1 -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 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 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 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 rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.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=2 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 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 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 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 rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.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 |
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -1838,11 +1838,10 @@ | ||
| 1838 | 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | - -DSQLITE_DEFAULT_WORKER_THREADS=1 \ | |
| 1844 | 1843 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1845 | 1844 | -DSQLITE_WIN32_NO_ANSI \ |
| 1846 | 1845 | -D_HAVE__MINGW_H \ |
| 1847 | 1846 | -DSQLITE_USE_MALLOC_H \ |
| 1848 | 1847 | -DSQLITE_USE_MSIZE |
| 1849 | 1848 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1838,11 +1838,10 @@ | |
| 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | -DSQLITE_DEFAULT_WORKER_THREADS=1 \ |
| 1844 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1845 | -DSQLITE_WIN32_NO_ANSI \ |
| 1846 | -D_HAVE__MINGW_H \ |
| 1847 | -DSQLITE_USE_MALLOC_H \ |
| 1848 | -DSQLITE_USE_MSIZE |
| 1849 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1838,11 +1838,10 @@ | |
| 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1844 | -DSQLITE_WIN32_NO_ANSI \ |
| 1845 | -D_HAVE__MINGW_H \ |
| 1846 | -DSQLITE_USE_MALLOC_H \ |
| 1847 | -DSQLITE_USE_MSIZE |
| 1848 |
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -1838,11 +1838,10 @@ | ||
| 1838 | 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | - -DSQLITE_DEFAULT_WORKER_THREADS=1 \ | |
| 1844 | 1843 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1845 | 1844 | -DSQLITE_WIN32_NO_ANSI \ |
| 1846 | 1845 | -D_HAVE__MINGW_H \ |
| 1847 | 1846 | -DSQLITE_USE_MALLOC_H \ |
| 1848 | 1847 | -DSQLITE_USE_MSIZE |
| 1849 | 1848 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1838,11 +1838,10 @@ | |
| 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | -DSQLITE_DEFAULT_WORKER_THREADS=1 \ |
| 1844 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1845 | -DSQLITE_WIN32_NO_ANSI \ |
| 1846 | -D_HAVE__MINGW_H \ |
| 1847 | -DSQLITE_USE_MALLOC_H \ |
| 1848 | -DSQLITE_USE_MSIZE |
| 1849 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1838,11 +1838,10 @@ | |
| 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1844 | -DSQLITE_WIN32_NO_ANSI \ |
| 1845 | -D_HAVE__MINGW_H \ |
| 1846 | -DSQLITE_USE_MALLOC_H \ |
| 1847 | -DSQLITE_USE_MSIZE |
| 1848 |
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -1838,11 +1838,10 @@ | ||
| 1838 | 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | - -DSQLITE_DEFAULT_WORKER_THREADS=1 \ | |
| 1844 | 1843 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1845 | 1844 | -DSQLITE_WIN32_NO_ANSI \ |
| 1846 | 1845 | -D_HAVE__MINGW_H \ |
| 1847 | 1846 | -DSQLITE_USE_MALLOC_H \ |
| 1848 | 1847 | -DSQLITE_USE_MSIZE |
| 1849 | 1848 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1838,11 +1838,10 @@ | |
| 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | -DSQLITE_DEFAULT_WORKER_THREADS=1 \ |
| 1844 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1845 | -DSQLITE_WIN32_NO_ANSI \ |
| 1846 | -D_HAVE__MINGW_H \ |
| 1847 | -DSQLITE_USE_MALLOC_H \ |
| 1848 | -DSQLITE_USE_MSIZE |
| 1849 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1838,11 +1838,10 @@ | |
| 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1844 | -DSQLITE_WIN32_NO_ANSI \ |
| 1845 | -D_HAVE__MINGW_H \ |
| 1846 | -DSQLITE_USE_MALLOC_H \ |
| 1847 | -DSQLITE_USE_MSIZE |
| 1848 |
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -1838,11 +1838,10 @@ | ||
| 1838 | 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | - -DSQLITE_DEFAULT_WORKER_THREADS=1 \ | |
| 1844 | 1843 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1845 | 1844 | -DSQLITE_WIN32_NO_ANSI \ |
| 1846 | 1845 | -D_HAVE__MINGW_H \ |
| 1847 | 1846 | -DSQLITE_USE_MALLOC_H \ |
| 1848 | 1847 | -DSQLITE_USE_MSIZE |
| 1849 | 1848 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1838,11 +1838,10 @@ | |
| 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | -DSQLITE_DEFAULT_WORKER_THREADS=1 \ |
| 1844 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1845 | -DSQLITE_WIN32_NO_ANSI \ |
| 1846 | -D_HAVE__MINGW_H \ |
| 1847 | -DSQLITE_USE_MALLOC_H \ |
| 1848 | -DSQLITE_USE_MSIZE |
| 1849 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1838,11 +1838,10 @@ | |
| 1838 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1839 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1840 | -DSQLITE_THREADSAFE=2 \ |
| 1841 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1842 | -DSQLITE_OMIT_DEPRECATED \ |
| 1843 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1844 | -DSQLITE_WIN32_NO_ANSI \ |
| 1845 | -D_HAVE__MINGW_H \ |
| 1846 | -DSQLITE_USE_MALLOC_H \ |
| 1847 | -DSQLITE_USE_MSIZE |
| 1848 |
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -125,11 +125,10 @@ | ||
| 125 | 125 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 126 | 126 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 127 | 127 | /DSQLITE_THREADSAFE=2 \ |
| 128 | 128 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 129 | 129 | /DSQLITE_OMIT_DEPRECATED \ |
| 130 | - /DSQLITE_DEFAULT_WORKER_THREADS=1 \ | |
| 131 | 130 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 132 | 131 | /DSQLITE_WIN32_NO_ANSI |
| 133 | 132 | |
| 134 | 133 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 135 | 134 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 136 | 135 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -125,11 +125,10 @@ | |
| 125 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 126 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 127 | /DSQLITE_THREADSAFE=2 \ |
| 128 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 129 | /DSQLITE_OMIT_DEPRECATED \ |
| 130 | /DSQLITE_DEFAULT_WORKER_THREADS=1 \ |
| 131 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 132 | /DSQLITE_WIN32_NO_ANSI |
| 133 | |
| 134 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 135 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 136 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -125,11 +125,10 @@ | |
| 125 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 126 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 127 | /DSQLITE_THREADSAFE=2 \ |
| 128 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 129 | /DSQLITE_OMIT_DEPRECATED \ |
| 130 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 131 | /DSQLITE_WIN32_NO_ANSI |
| 132 | |
| 133 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 134 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 135 |
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -125,11 +125,10 @@ | ||
| 125 | 125 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 126 | 126 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 127 | 127 | /DSQLITE_THREADSAFE=2 \ |
| 128 | 128 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 129 | 129 | /DSQLITE_OMIT_DEPRECATED \ |
| 130 | - /DSQLITE_DEFAULT_WORKER_THREADS=1 \ | |
| 131 | 130 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 132 | 131 | /DSQLITE_WIN32_NO_ANSI |
| 133 | 132 | |
| 134 | 133 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 135 | 134 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 136 | 135 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -125,11 +125,10 @@ | |
| 125 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 126 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 127 | /DSQLITE_THREADSAFE=2 \ |
| 128 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 129 | /DSQLITE_OMIT_DEPRECATED \ |
| 130 | /DSQLITE_DEFAULT_WORKER_THREADS=1 \ |
| 131 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 132 | /DSQLITE_WIN32_NO_ANSI |
| 133 | |
| 134 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 135 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 136 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -125,11 +125,10 @@ | |
| 125 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 126 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 127 | /DSQLITE_THREADSAFE=2 \ |
| 128 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 129 | /DSQLITE_OMIT_DEPRECATED \ |
| 130 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 131 | /DSQLITE_WIN32_NO_ANSI |
| 132 | |
| 133 | SHELL_OPTIONS = /Dmain=sqlite3_shell \ |
| 134 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 135 |
+31
-14
| --- win/buildmsvc.bat | ||
| +++ win/buildmsvc.bat | ||
| @@ -13,10 +13,33 @@ | ||
| 13 | 13 | REM SET __ECHO=ECHO |
| 14 | 14 | REM SET __ECHO2=ECHO |
| 15 | 15 | IF NOT DEFINED _AECHO (SET _AECHO=REM) |
| 16 | 16 | IF NOT DEFINED _CECHO (SET _CECHO=REM) |
| 17 | 17 | IF NOT DEFINED _VECHO (SET _VECHO=REM) |
| 18 | + | |
| 19 | +REM | |
| 20 | +REM NOTE: Setup local environment variables that point to the root directory | |
| 21 | +REM of the Fossil source checkout and to the directory containing this | |
| 22 | +REM build tool. | |
| 23 | +REM | |
| 24 | +SET ROOT=%~dp0\.. | |
| 25 | +SET ROOT=%ROOT:\\=\% | |
| 26 | + | |
| 27 | +%_VECHO% Root = '%ROOT%' | |
| 28 | + | |
| 29 | +SET TOOLS=%~dp0 | |
| 30 | +SET TOOLS=%TOOLS:~0,-1% | |
| 31 | + | |
| 32 | +%_VECHO% Tools = '%TOOLS%' | |
| 33 | + | |
| 34 | +REM | |
| 35 | +REM Visual C++ ???? | |
| 36 | +REM | |
| 37 | +IF DEFINED VCINSTALLDIR IF EXIST "%VCINSTALLDIR%" ( | |
| 38 | + %_AECHO% Build environment appears to be setup. | |
| 39 | + GOTO skip_setupVisualStudio | |
| 40 | +) | |
| 18 | 41 | |
| 19 | 42 | REM |
| 20 | 43 | REM Visual Studio ???? |
| 21 | 44 | REM |
| 22 | 45 | IF DEFINED VSVARS32 IF EXIST "%VSVARS32%" ( |
| @@ -121,24 +144,10 @@ | ||
| 121 | 144 | REM |
| 122 | 145 | SET VSVARS32=%VSVARS32:\\=\% |
| 123 | 146 | |
| 124 | 147 | %_VECHO% VsVars32 = '%VSVARS32%' |
| 125 | 148 | |
| 126 | -REM | |
| 127 | -REM NOTE: Setup local environment variables that point to the root directory | |
| 128 | -REM of the Fossil source checkout and to the directory containing this | |
| 129 | -REM build tool. | |
| 130 | -REM | |
| 131 | -SET ROOT=%~dp0\.. | |
| 132 | -SET ROOT=%ROOT:\\=\% | |
| 133 | - | |
| 134 | -SET TOOLS=%~dp0 | |
| 135 | -SET TOOLS=%TOOLS:~0,-1% | |
| 136 | - | |
| 137 | -%_VECHO% Root = '%ROOT%' | |
| 138 | -%_VECHO% Tools = '%TOOLS%' | |
| 139 | - | |
| 140 | 149 | REM |
| 141 | 150 | REM NOTE: After this point, a clean ERRORLEVEL is required; therefore, make |
| 142 | 151 | REM sure it is reset now. |
| 143 | 152 | REM |
| 144 | 153 | CALL :fn_ResetErrorLevel |
| @@ -152,10 +161,18 @@ | ||
| 152 | 161 | IF ERRORLEVEL 1 ( |
| 153 | 162 | ECHO Visual Studio build environment batch file "%VSVARS32%" failed. |
| 154 | 163 | GOTO errors |
| 155 | 164 | ) |
| 156 | 165 | |
| 166 | +REM | |
| 167 | +REM NOTE: After this point, the environment should already be setup for | |
| 168 | +REM building with MSVC. | |
| 169 | +REM | |
| 170 | +:skip_setupVisualStudio | |
| 171 | + | |
| 172 | +%_VECHO% VcInstallDir = '%VCINSTALLDIR%' | |
| 173 | + | |
| 157 | 174 | REM |
| 158 | 175 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 159 | 176 | REM |
| 160 | 177 | IF NOT EXIST "%ROOT%\msvcbld" ( |
| 161 | 178 | %__ECHO% MKDIR "%ROOT%\msvcbld" |
| 162 | 179 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -13,10 +13,33 @@ | |
| 13 | REM SET __ECHO=ECHO |
| 14 | REM SET __ECHO2=ECHO |
| 15 | IF NOT DEFINED _AECHO (SET _AECHO=REM) |
| 16 | IF NOT DEFINED _CECHO (SET _CECHO=REM) |
| 17 | IF NOT DEFINED _VECHO (SET _VECHO=REM) |
| 18 | |
| 19 | REM |
| 20 | REM Visual Studio ???? |
| 21 | REM |
| 22 | IF DEFINED VSVARS32 IF EXIST "%VSVARS32%" ( |
| @@ -121,24 +144,10 @@ | |
| 121 | REM |
| 122 | SET VSVARS32=%VSVARS32:\\=\% |
| 123 | |
| 124 | %_VECHO% VsVars32 = '%VSVARS32%' |
| 125 | |
| 126 | REM |
| 127 | REM NOTE: Setup local environment variables that point to the root directory |
| 128 | REM of the Fossil source checkout and to the directory containing this |
| 129 | REM build tool. |
| 130 | REM |
| 131 | SET ROOT=%~dp0\.. |
| 132 | SET ROOT=%ROOT:\\=\% |
| 133 | |
| 134 | SET TOOLS=%~dp0 |
| 135 | SET TOOLS=%TOOLS:~0,-1% |
| 136 | |
| 137 | %_VECHO% Root = '%ROOT%' |
| 138 | %_VECHO% Tools = '%TOOLS%' |
| 139 | |
| 140 | REM |
| 141 | REM NOTE: After this point, a clean ERRORLEVEL is required; therefore, make |
| 142 | REM sure it is reset now. |
| 143 | REM |
| 144 | CALL :fn_ResetErrorLevel |
| @@ -152,10 +161,18 @@ | |
| 152 | IF ERRORLEVEL 1 ( |
| 153 | ECHO Visual Studio build environment batch file "%VSVARS32%" failed. |
| 154 | GOTO errors |
| 155 | ) |
| 156 | |
| 157 | REM |
| 158 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 159 | REM |
| 160 | IF NOT EXIST "%ROOT%\msvcbld" ( |
| 161 | %__ECHO% MKDIR "%ROOT%\msvcbld" |
| 162 |
| --- win/buildmsvc.bat | |
| +++ win/buildmsvc.bat | |
| @@ -13,10 +13,33 @@ | |
| 13 | REM SET __ECHO=ECHO |
| 14 | REM SET __ECHO2=ECHO |
| 15 | IF NOT DEFINED _AECHO (SET _AECHO=REM) |
| 16 | IF NOT DEFINED _CECHO (SET _CECHO=REM) |
| 17 | IF NOT DEFINED _VECHO (SET _VECHO=REM) |
| 18 | |
| 19 | REM |
| 20 | REM NOTE: Setup local environment variables that point to the root directory |
| 21 | REM of the Fossil source checkout and to the directory containing this |
| 22 | REM build tool. |
| 23 | REM |
| 24 | SET ROOT=%~dp0\.. |
| 25 | SET ROOT=%ROOT:\\=\% |
| 26 | |
| 27 | %_VECHO% Root = '%ROOT%' |
| 28 | |
| 29 | SET TOOLS=%~dp0 |
| 30 | SET TOOLS=%TOOLS:~0,-1% |
| 31 | |
| 32 | %_VECHO% Tools = '%TOOLS%' |
| 33 | |
| 34 | REM |
| 35 | REM Visual C++ ???? |
| 36 | REM |
| 37 | IF DEFINED VCINSTALLDIR IF EXIST "%VCINSTALLDIR%" ( |
| 38 | %_AECHO% Build environment appears to be setup. |
| 39 | GOTO skip_setupVisualStudio |
| 40 | ) |
| 41 | |
| 42 | REM |
| 43 | REM Visual Studio ???? |
| 44 | REM |
| 45 | IF DEFINED VSVARS32 IF EXIST "%VSVARS32%" ( |
| @@ -121,24 +144,10 @@ | |
| 144 | REM |
| 145 | SET VSVARS32=%VSVARS32:\\=\% |
| 146 | |
| 147 | %_VECHO% VsVars32 = '%VSVARS32%' |
| 148 | |
| 149 | REM |
| 150 | REM NOTE: After this point, a clean ERRORLEVEL is required; therefore, make |
| 151 | REM sure it is reset now. |
| 152 | REM |
| 153 | CALL :fn_ResetErrorLevel |
| @@ -152,10 +161,18 @@ | |
| 161 | IF ERRORLEVEL 1 ( |
| 162 | ECHO Visual Studio build environment batch file "%VSVARS32%" failed. |
| 163 | GOTO errors |
| 164 | ) |
| 165 | |
| 166 | REM |
| 167 | REM NOTE: After this point, the environment should already be setup for |
| 168 | REM building with MSVC. |
| 169 | REM |
| 170 | :skip_setupVisualStudio |
| 171 | |
| 172 | %_VECHO% VcInstallDir = '%VCINSTALLDIR%' |
| 173 | |
| 174 | REM |
| 175 | REM NOTE: Attempt to create the build output directory, if necessary. |
| 176 | REM |
| 177 | IF NOT EXIST "%ROOT%\msvcbld" ( |
| 178 | %__ECHO% MKDIR "%ROOT%\msvcbld" |
| 179 |