Fossil SCM
Merge trunk. Only enable max-worker-threads setting when fossil is compiled with --disable-internal-sqlite and SQLite is compiled with multi-thread support
Commit
c5ec6abdba5ac76166a5514edc71a8f9e5c612b4
Parent
d5a00a15218ce37…
19 files changed
+7
-4
-3
+3
+17
-1
+17
-1
+10
+8
-8
+1
-1
+3
+3
+1
-1
+19
-1
+6
+1
-1
+1
-1
+11
-1
+11
-1
+9
-1
+5
~
auto.def
~
src/branch.c
~
src/configure.c
~
src/db.c
~
src/db.c
~
src/doc.c
~
src/json.c
~
src/json_detail.h
~
src/main.c
~
src/main.c
~
src/main.mk
~
src/makemake.tcl
~
src/th_main.c
~
win/Makefile.PellesCGMake
~
win/Makefile.dmc
~
win/Makefile.mingw
~
win/Makefile.mingw.mistachkin
~
win/Makefile.msc
~
win/fossil.rc
M
auto.def
+7
-4
| --- auto.def | ||
| +++ auto.def | ||
| @@ -5,10 +5,11 @@ | ||
| 5 | 5 | options { |
| 6 | 6 | with-openssl:path|auto|none |
| 7 | 7 | => {Look for OpenSSL in the given path, or auto or none} |
| 8 | 8 | with-miniz=0 => {Use miniz from the source tree} |
| 9 | 9 | with-zlib:path => {Look for zlib in the given path} |
| 10 | + with-th1-docs=0 => {Enable TH1 for embedded documentation pages} | |
| 10 | 11 | with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages} |
| 11 | 12 | with-tcl:path => {Enable Tcl integration, with Tcl in the specified path} |
| 12 | 13 | with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism} |
| 13 | 14 | with-tcl-private-stubs=0 |
| 14 | 15 | => {Enable Tcl integration via private stubs mechanism} |
| @@ -84,10 +85,16 @@ | ||
| 84 | 85 | # reading config.h first. |
| 85 | 86 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON |
| 86 | 87 | define FOSSIL_ENABLE_JSON |
| 87 | 88 | msg-result "JSON support enabled" |
| 88 | 89 | } |
| 90 | + | |
| 91 | +if {[opt-bool with-th1-docs]} { | |
| 92 | + define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_DOCS | |
| 93 | + define FOSSIL_ENABLE_TH1_DOCS | |
| 94 | + msg-result "TH1 embedded documentation support enabled" | |
| 95 | +} | |
| 89 | 96 | |
| 90 | 97 | if {[opt-bool with-th1-hooks]} { |
| 91 | 98 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_HOOKS |
| 92 | 99 | define FOSSIL_ENABLE_TH1_HOOKS |
| 93 | 100 | msg-result "TH1 hooks support enabled" |
| @@ -292,11 +299,7 @@ | ||
| 292 | 299 | define-append LIBS -lfuse |
| 293 | 300 | msg-result "FuseFS support enabled" |
| 294 | 301 | } |
| 295 | 302 | } |
| 296 | 303 | |
| 297 | -if {[cc-check-function-in-lib pthread_create pthread]} { | |
| 298 | - define-append LIBS -lpthread | |
| 299 | -} | |
| 300 | - | |
| 301 | 304 | make-template Makefile.in |
| 302 | 305 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 303 | 306 |
| --- auto.def | |
| +++ auto.def | |
| @@ -5,10 +5,11 @@ | |
| 5 | options { |
| 6 | with-openssl:path|auto|none |
| 7 | => {Look for OpenSSL in the given path, or auto or none} |
| 8 | with-miniz=0 => {Use miniz from the source tree} |
| 9 | with-zlib:path => {Look for zlib in the given path} |
| 10 | with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages} |
| 11 | with-tcl:path => {Enable Tcl integration, with Tcl in the specified path} |
| 12 | with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism} |
| 13 | with-tcl-private-stubs=0 |
| 14 | => {Enable Tcl integration via private stubs mechanism} |
| @@ -84,10 +85,16 @@ | |
| 84 | # reading config.h first. |
| 85 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON |
| 86 | define FOSSIL_ENABLE_JSON |
| 87 | msg-result "JSON support enabled" |
| 88 | } |
| 89 | |
| 90 | if {[opt-bool with-th1-hooks]} { |
| 91 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_HOOKS |
| 92 | define FOSSIL_ENABLE_TH1_HOOKS |
| 93 | msg-result "TH1 hooks support enabled" |
| @@ -292,11 +299,7 @@ | |
| 292 | define-append LIBS -lfuse |
| 293 | msg-result "FuseFS support enabled" |
| 294 | } |
| 295 | } |
| 296 | |
| 297 | if {[cc-check-function-in-lib pthread_create pthread]} { |
| 298 | define-append LIBS -lpthread |
| 299 | } |
| 300 | |
| 301 | make-template Makefile.in |
| 302 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 303 |
| --- auto.def | |
| +++ auto.def | |
| @@ -5,10 +5,11 @@ | |
| 5 | options { |
| 6 | with-openssl:path|auto|none |
| 7 | => {Look for OpenSSL in the given path, or auto or none} |
| 8 | with-miniz=0 => {Use miniz from the source tree} |
| 9 | with-zlib:path => {Look for zlib in the given path} |
| 10 | with-th1-docs=0 => {Enable TH1 for embedded documentation pages} |
| 11 | with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages} |
| 12 | with-tcl:path => {Enable Tcl integration, with Tcl in the specified path} |
| 13 | with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism} |
| 14 | with-tcl-private-stubs=0 |
| 15 | => {Enable Tcl integration via private stubs mechanism} |
| @@ -84,10 +85,16 @@ | |
| 85 | # reading config.h first. |
| 86 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON |
| 87 | define FOSSIL_ENABLE_JSON |
| 88 | msg-result "JSON support enabled" |
| 89 | } |
| 90 | |
| 91 | if {[opt-bool with-th1-docs]} { |
| 92 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_DOCS |
| 93 | define FOSSIL_ENABLE_TH1_DOCS |
| 94 | msg-result "TH1 embedded documentation support enabled" |
| 95 | } |
| 96 | |
| 97 | if {[opt-bool with-th1-hooks]} { |
| 98 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_HOOKS |
| 99 | define FOSSIL_ENABLE_TH1_HOOKS |
| 100 | msg-result "TH1 hooks support enabled" |
| @@ -292,11 +299,7 @@ | |
| 299 | define-append LIBS -lfuse |
| 300 | msg-result "FuseFS support enabled" |
| 301 | } |
| 302 | } |
| 303 | |
| 304 | make-template Makefile.in |
| 305 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 306 |
-3
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -252,13 +252,10 @@ | ||
| 252 | 252 | */ |
| 253 | 253 | void branch_cmd(void){ |
| 254 | 254 | int n; |
| 255 | 255 | const char *zCmd = "list"; |
| 256 | 256 | db_find_and_open_repository(0, 0); |
| 257 | - if( g.argc<2 ){ | |
| 258 | - usage("new|list|ls ..."); | |
| 259 | - } | |
| 260 | 257 | if( g.argc>=3 ) zCmd = g.argv[2]; |
| 261 | 258 | n = strlen(zCmd); |
| 262 | 259 | if( strncmp(zCmd,"new",n)==0 ){ |
| 263 | 260 | branch_new(); |
| 264 | 261 | }else if( (strncmp(zCmd,"list",n)==0)||(strncmp(zCmd, "ls", n)==0) ){ |
| 265 | 262 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -252,13 +252,10 @@ | |
| 252 | */ |
| 253 | void branch_cmd(void){ |
| 254 | int n; |
| 255 | const char *zCmd = "list"; |
| 256 | db_find_and_open_repository(0, 0); |
| 257 | if( g.argc<2 ){ |
| 258 | usage("new|list|ls ..."); |
| 259 | } |
| 260 | if( g.argc>=3 ) zCmd = g.argv[2]; |
| 261 | n = strlen(zCmd); |
| 262 | if( strncmp(zCmd,"new",n)==0 ){ |
| 263 | branch_new(); |
| 264 | }else if( (strncmp(zCmd,"list",n)==0)||(strncmp(zCmd, "ls", n)==0) ){ |
| 265 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -252,13 +252,10 @@ | |
| 252 | */ |
| 253 | void branch_cmd(void){ |
| 254 | int n; |
| 255 | const char *zCmd = "list"; |
| 256 | db_find_and_open_repository(0, 0); |
| 257 | if( g.argc>=3 ) zCmd = g.argv[2]; |
| 258 | n = strlen(zCmd); |
| 259 | if( strncmp(zCmd,"new",n)==0 ){ |
| 260 | branch_new(); |
| 261 | }else if( (strncmp(zCmd,"list",n)==0)||(strncmp(zCmd, "ls", n)==0) ){ |
| 262 |
+3
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -97,10 +97,13 @@ | ||
| 97 | 97 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 98 | 98 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 99 | 99 | { "adunit", CONFIGSET_SKIN }, |
| 100 | 100 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 101 | 101 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 102 | +#ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 103 | + { "th1-docs", CONFIGSET_TH1 }, | |
| 104 | +#endif | |
| 102 | 105 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 103 | 106 | { "th1-hooks", CONFIGSET_TH1 }, |
| 104 | 107 | #endif |
| 105 | 108 | { "th1-setup", CONFIGSET_TH1 }, |
| 106 | 109 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 107 | 110 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -97,10 +97,13 @@ | |
| 97 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 98 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 99 | { "adunit", CONFIGSET_SKIN }, |
| 100 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 101 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 102 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 103 | { "th1-hooks", CONFIGSET_TH1 }, |
| 104 | #endif |
| 105 | { "th1-setup", CONFIGSET_TH1 }, |
| 106 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 107 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -97,10 +97,13 @@ | |
| 97 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 98 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 99 | { "adunit", CONFIGSET_SKIN }, |
| 100 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 101 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 102 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 103 | { "th1-docs", CONFIGSET_TH1 }, |
| 104 | #endif |
| 105 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 106 | { "th1-hooks", CONFIGSET_TH1 }, |
| 107 | #endif |
| 108 | { "th1-setup", CONFIGSET_TH1 }, |
| 109 | { "th1-uri-regexp", CONFIGSET_TH1 }, |
| 110 |
M
src/db.c
+17
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2190,11 +2190,13 @@ | ||
| 2190 | 2190 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2191 | 2191 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2192 | 2192 | { "manifest", 0, 0, 1, 0, "off" }, |
| 2193 | 2193 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2194 | 2194 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2195 | +#if USE_SYSTEM_SQLITE+0==1 | |
| 2195 | 2196 | { "max-worker-threads", 0, 16, 0, 0, "0" }, |
| 2197 | +#endif | |
| 2196 | 2198 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2197 | 2199 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2198 | 2200 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2199 | 2201 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2200 | 2202 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2204,10 +2206,13 @@ | ||
| 2204 | 2206 | { "ssl-identity", 0, 40, 0, 0, "" }, |
| 2205 | 2207 | #ifdef FOSSIL_ENABLE_TCL |
| 2206 | 2208 | { "tcl", 0, 0, 0, 0, "off" }, |
| 2207 | 2209 | { "tcl-setup", 0, 40, 1, 1, "" }, |
| 2208 | 2210 | #endif |
| 2211 | +#ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 2212 | + { "th1-docs", 0, 0, 0, 0, "off" }, | |
| 2213 | +#endif | |
| 2209 | 2214 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 2210 | 2215 | { "th1-hooks", 0, 0, 0, 0, "off" }, |
| 2211 | 2216 | #endif |
| 2212 | 2217 | { "th1-setup", 0, 40, 1, 1, "" }, |
| 2213 | 2218 | { "th1-uri-regexp", 0, 40, 1, 0, "" }, |
| @@ -2359,11 +2364,12 @@ | ||
| 2359 | 2364 | ** |
| 2360 | 2365 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2361 | 2366 | ** default is 250000 bytes. |
| 2362 | 2367 | ** |
| 2363 | 2368 | ** max-worker-threads The maximum number of auxiliary worker threads that a |
| 2364 | -** single prepared statement may start. | |
| 2369 | +** single prepared statement may start. Only works when | |
| 2370 | +** SQLite is compiled with multi-thread support. | |
| 2365 | 2371 | ** |
| 2366 | 2372 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2367 | 2373 | ** files have been modified. (Default "on".) |
| 2368 | 2374 | ** |
| 2369 | 2375 | ** pgp-command Command used to clear-sign manifests at check-in. |
| @@ -2416,10 +2422,20 @@ | ||
| 2416 | 2422 | ** expressions and scripts. Default: off. |
| 2417 | 2423 | ** |
| 2418 | 2424 | ** tcl-setup This is the setup script to be evaluated after creating |
| 2419 | 2425 | ** (versionable) and initializing the Tcl interpreter. By default, this |
| 2420 | 2426 | ** is empty and no extra setup is performed. |
| 2427 | +** | |
| 2428 | +** th1-docs WARNING: If enabled (and Fossil was compiled with TH1 | |
| 2429 | +** support for embedded documentation files), this allows | |
| 2430 | +** embedded documentation files to contain arbitrary TH1 | |
| 2431 | +** scripts that are evaluated on the server. If native | |
| 2432 | +** Tcl integration is also enabled, this setting has the | |
| 2433 | +** potential to allow anybody with check-in privileges to | |
| 2434 | +** do almost anything that the associated operating system | |
| 2435 | +** user account could do. Extreme caution should be used | |
| 2436 | +** when enabling this setting. Default: off. | |
| 2421 | 2437 | ** |
| 2422 | 2438 | ** th1-hooks If enabled (and Fossil was compiled with support for TH1 |
| 2423 | 2439 | ** hooks), special TH1 commands will be called before and |
| 2424 | 2440 | ** after any Fossil command or web page. Default: off. |
| 2425 | 2441 | ** |
| 2426 | 2442 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2190,11 +2190,13 @@ | |
| 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" }, |
| @@ -2204,10 +2206,13 @@ | |
| 2204 | { "ssl-identity", 0, 40, 0, 0, "" }, |
| 2205 | #ifdef FOSSIL_ENABLE_TCL |
| 2206 | { "tcl", 0, 0, 0, 0, "off" }, |
| 2207 | { "tcl-setup", 0, 40, 1, 1, "" }, |
| 2208 | #endif |
| 2209 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 2210 | { "th1-hooks", 0, 0, 0, 0, "off" }, |
| 2211 | #endif |
| 2212 | { "th1-setup", 0, 40, 1, 1, "" }, |
| 2213 | { "th1-uri-regexp", 0, 40, 1, 0, "" }, |
| @@ -2359,11 +2364,12 @@ | |
| 2359 | ** |
| 2360 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2361 | ** default is 250000 bytes. |
| 2362 | ** |
| 2363 | ** max-worker-threads The maximum number of auxiliary worker threads that a |
| 2364 | ** single prepared statement may start. |
| 2365 | ** |
| 2366 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2367 | ** files have been modified. (Default "on".) |
| 2368 | ** |
| 2369 | ** pgp-command Command used to clear-sign manifests at check-in. |
| @@ -2416,10 +2422,20 @@ | |
| 2416 | ** expressions and scripts. Default: off. |
| 2417 | ** |
| 2418 | ** tcl-setup This is the setup script to be evaluated after creating |
| 2419 | ** (versionable) and initializing the Tcl interpreter. By default, this |
| 2420 | ** is empty and no extra setup is performed. |
| 2421 | ** |
| 2422 | ** th1-hooks If enabled (and Fossil was compiled with support for TH1 |
| 2423 | ** hooks), special TH1 commands will be called before and |
| 2424 | ** after any Fossil command or web page. Default: off. |
| 2425 | ** |
| 2426 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2190,11 +2190,13 @@ | |
| 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 | #if USE_SYSTEM_SQLITE+0==1 |
| 2196 | { "max-worker-threads", 0, 16, 0, 0, "0" }, |
| 2197 | #endif |
| 2198 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2199 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2200 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2201 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2202 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2204,10 +2206,13 @@ | |
| 2206 | { "ssl-identity", 0, 40, 0, 0, "" }, |
| 2207 | #ifdef FOSSIL_ENABLE_TCL |
| 2208 | { "tcl", 0, 0, 0, 0, "off" }, |
| 2209 | { "tcl-setup", 0, 40, 1, 1, "" }, |
| 2210 | #endif |
| 2211 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 2212 | { "th1-docs", 0, 0, 0, 0, "off" }, |
| 2213 | #endif |
| 2214 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 2215 | { "th1-hooks", 0, 0, 0, 0, "off" }, |
| 2216 | #endif |
| 2217 | { "th1-setup", 0, 40, 1, 1, "" }, |
| 2218 | { "th1-uri-regexp", 0, 40, 1, 0, "" }, |
| @@ -2359,11 +2364,12 @@ | |
| 2364 | ** |
| 2365 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2366 | ** default is 250000 bytes. |
| 2367 | ** |
| 2368 | ** max-worker-threads The maximum number of auxiliary worker threads that a |
| 2369 | ** single prepared statement may start. Only works when |
| 2370 | ** SQLite is compiled with multi-thread support. |
| 2371 | ** |
| 2372 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2373 | ** files have been modified. (Default "on".) |
| 2374 | ** |
| 2375 | ** pgp-command Command used to clear-sign manifests at check-in. |
| @@ -2416,10 +2422,20 @@ | |
| 2422 | ** expressions and scripts. Default: off. |
| 2423 | ** |
| 2424 | ** tcl-setup This is the setup script to be evaluated after creating |
| 2425 | ** (versionable) and initializing the Tcl interpreter. By default, this |
| 2426 | ** is empty and no extra setup is performed. |
| 2427 | ** |
| 2428 | ** th1-docs WARNING: If enabled (and Fossil was compiled with TH1 |
| 2429 | ** support for embedded documentation files), this allows |
| 2430 | ** embedded documentation files to contain arbitrary TH1 |
| 2431 | ** scripts that are evaluated on the server. If native |
| 2432 | ** Tcl integration is also enabled, this setting has the |
| 2433 | ** potential to allow anybody with check-in privileges to |
| 2434 | ** do almost anything that the associated operating system |
| 2435 | ** user account could do. Extreme caution should be used |
| 2436 | ** when enabling this setting. Default: off. |
| 2437 | ** |
| 2438 | ** th1-hooks If enabled (and Fossil was compiled with support for TH1 |
| 2439 | ** hooks), special TH1 commands will be called before and |
| 2440 | ** after any Fossil command or web page. Default: off. |
| 2441 | ** |
| 2442 |
M
src/db.c
+17
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2190,11 +2190,13 @@ | ||
| 2190 | 2190 | { "localauth", 0, 0, 0, 0, "off" }, |
| 2191 | 2191 | { "main-branch", 0, 40, 0, 0, "trunk" }, |
| 2192 | 2192 | { "manifest", 0, 0, 1, 0, "off" }, |
| 2193 | 2193 | { "max-loadavg", 0, 25, 0, 0, "0.0" }, |
| 2194 | 2194 | { "max-upload", 0, 25, 0, 0, "250000" }, |
| 2195 | +#if USE_SYSTEM_SQLITE+0==1 | |
| 2195 | 2196 | { "max-worker-threads", 0, 16, 0, 0, "0" }, |
| 2197 | +#endif | |
| 2196 | 2198 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2197 | 2199 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2198 | 2200 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2199 | 2201 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2200 | 2202 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2204,10 +2206,13 @@ | ||
| 2204 | 2206 | { "ssl-identity", 0, 40, 0, 0, "" }, |
| 2205 | 2207 | #ifdef FOSSIL_ENABLE_TCL |
| 2206 | 2208 | { "tcl", 0, 0, 0, 0, "off" }, |
| 2207 | 2209 | { "tcl-setup", 0, 40, 1, 1, "" }, |
| 2208 | 2210 | #endif |
| 2211 | +#ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 2212 | + { "th1-docs", 0, 0, 0, 0, "off" }, | |
| 2213 | +#endif | |
| 2209 | 2214 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 2210 | 2215 | { "th1-hooks", 0, 0, 0, 0, "off" }, |
| 2211 | 2216 | #endif |
| 2212 | 2217 | { "th1-setup", 0, 40, 1, 1, "" }, |
| 2213 | 2218 | { "th1-uri-regexp", 0, 40, 1, 0, "" }, |
| @@ -2359,11 +2364,12 @@ | ||
| 2359 | 2364 | ** |
| 2360 | 2365 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2361 | 2366 | ** default is 250000 bytes. |
| 2362 | 2367 | ** |
| 2363 | 2368 | ** max-worker-threads The maximum number of auxiliary worker threads that a |
| 2364 | -** single prepared statement may start. | |
| 2369 | +** single prepared statement may start. Only works when | |
| 2370 | +** SQLite is compiled with multi-thread support. | |
| 2365 | 2371 | ** |
| 2366 | 2372 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2367 | 2373 | ** files have been modified. (Default "on".) |
| 2368 | 2374 | ** |
| 2369 | 2375 | ** pgp-command Command used to clear-sign manifests at check-in. |
| @@ -2416,10 +2422,20 @@ | ||
| 2416 | 2422 | ** expressions and scripts. Default: off. |
| 2417 | 2423 | ** |
| 2418 | 2424 | ** tcl-setup This is the setup script to be evaluated after creating |
| 2419 | 2425 | ** (versionable) and initializing the Tcl interpreter. By default, this |
| 2420 | 2426 | ** is empty and no extra setup is performed. |
| 2427 | +** | |
| 2428 | +** th1-docs WARNING: If enabled (and Fossil was compiled with TH1 | |
| 2429 | +** support for embedded documentation files), this allows | |
| 2430 | +** embedded documentation files to contain arbitrary TH1 | |
| 2431 | +** scripts that are evaluated on the server. If native | |
| 2432 | +** Tcl integration is also enabled, this setting has the | |
| 2433 | +** potential to allow anybody with check-in privileges to | |
| 2434 | +** do almost anything that the associated operating system | |
| 2435 | +** user account could do. Extreme caution should be used | |
| 2436 | +** when enabling this setting. Default: off. | |
| 2421 | 2437 | ** |
| 2422 | 2438 | ** th1-hooks If enabled (and Fossil was compiled with support for TH1 |
| 2423 | 2439 | ** hooks), special TH1 commands will be called before and |
| 2424 | 2440 | ** after any Fossil command or web page. Default: off. |
| 2425 | 2441 | ** |
| 2426 | 2442 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2190,11 +2190,13 @@ | |
| 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" }, |
| @@ -2204,10 +2206,13 @@ | |
| 2204 | { "ssl-identity", 0, 40, 0, 0, "" }, |
| 2205 | #ifdef FOSSIL_ENABLE_TCL |
| 2206 | { "tcl", 0, 0, 0, 0, "off" }, |
| 2207 | { "tcl-setup", 0, 40, 1, 1, "" }, |
| 2208 | #endif |
| 2209 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 2210 | { "th1-hooks", 0, 0, 0, 0, "off" }, |
| 2211 | #endif |
| 2212 | { "th1-setup", 0, 40, 1, 1, "" }, |
| 2213 | { "th1-uri-regexp", 0, 40, 1, 0, "" }, |
| @@ -2359,11 +2364,12 @@ | |
| 2359 | ** |
| 2360 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2361 | ** default is 250000 bytes. |
| 2362 | ** |
| 2363 | ** max-worker-threads The maximum number of auxiliary worker threads that a |
| 2364 | ** single prepared statement may start. |
| 2365 | ** |
| 2366 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2367 | ** files have been modified. (Default "on".) |
| 2368 | ** |
| 2369 | ** pgp-command Command used to clear-sign manifests at check-in. |
| @@ -2416,10 +2422,20 @@ | |
| 2416 | ** expressions and scripts. Default: off. |
| 2417 | ** |
| 2418 | ** tcl-setup This is the setup script to be evaluated after creating |
| 2419 | ** (versionable) and initializing the Tcl interpreter. By default, this |
| 2420 | ** is empty and no extra setup is performed. |
| 2421 | ** |
| 2422 | ** th1-hooks If enabled (and Fossil was compiled with support for TH1 |
| 2423 | ** hooks), special TH1 commands will be called before and |
| 2424 | ** after any Fossil command or web page. Default: off. |
| 2425 | ** |
| 2426 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2190,11 +2190,13 @@ | |
| 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 | #if USE_SYSTEM_SQLITE+0==1 |
| 2196 | { "max-worker-threads", 0, 16, 0, 0, "0" }, |
| 2197 | #endif |
| 2198 | { "mtime-changes", 0, 0, 0, 0, "on" }, |
| 2199 | { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " }, |
| 2200 | { "proxy", 0, 32, 0, 0, "off" }, |
| 2201 | { "relative-paths", 0, 0, 0, 0, "on" }, |
| 2202 | { "repo-cksum", 0, 0, 0, 0, "on" }, |
| @@ -2204,10 +2206,13 @@ | |
| 2206 | { "ssl-identity", 0, 40, 0, 0, "" }, |
| 2207 | #ifdef FOSSIL_ENABLE_TCL |
| 2208 | { "tcl", 0, 0, 0, 0, "off" }, |
| 2209 | { "tcl-setup", 0, 40, 1, 1, "" }, |
| 2210 | #endif |
| 2211 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 2212 | { "th1-docs", 0, 0, 0, 0, "off" }, |
| 2213 | #endif |
| 2214 | #ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 2215 | { "th1-hooks", 0, 0, 0, 0, "off" }, |
| 2216 | #endif |
| 2217 | { "th1-setup", 0, 40, 1, 1, "" }, |
| 2218 | { "th1-uri-regexp", 0, 40, 1, 0, "" }, |
| @@ -2359,11 +2364,12 @@ | |
| 2364 | ** |
| 2365 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2366 | ** default is 250000 bytes. |
| 2367 | ** |
| 2368 | ** max-worker-threads The maximum number of auxiliary worker threads that a |
| 2369 | ** single prepared statement may start. Only works when |
| 2370 | ** SQLite is compiled with multi-thread support. |
| 2371 | ** |
| 2372 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2373 | ** files have been modified. (Default "on".) |
| 2374 | ** |
| 2375 | ** pgp-command Command used to clear-sign manifests at check-in. |
| @@ -2416,10 +2422,20 @@ | |
| 2422 | ** expressions and scripts. Default: off. |
| 2423 | ** |
| 2424 | ** tcl-setup This is the setup script to be evaluated after creating |
| 2425 | ** (versionable) and initializing the Tcl interpreter. By default, this |
| 2426 | ** is empty and no extra setup is performed. |
| 2427 | ** |
| 2428 | ** th1-docs WARNING: If enabled (and Fossil was compiled with TH1 |
| 2429 | ** support for embedded documentation files), this allows |
| 2430 | ** embedded documentation files to contain arbitrary TH1 |
| 2431 | ** scripts that are evaluated on the server. If native |
| 2432 | ** Tcl integration is also enabled, this setting has the |
| 2433 | ** potential to allow anybody with check-in privileges to |
| 2434 | ** do almost anything that the associated operating system |
| 2435 | ** user account could do. Extreme caution should be used |
| 2436 | ** when enabling this setting. Default: off. |
| 2437 | ** |
| 2438 | ** th1-hooks If enabled (and Fossil was compiled with support for TH1 |
| 2439 | ** hooks), special TH1 commands will be called before and |
| 2440 | ** after any Fossil command or web page. Default: off. |
| 2441 | ** |
| 2442 |
+10
| --- src/doc.c | ||
| +++ src/doc.c | ||
| @@ -256,10 +256,11 @@ | ||
| 256 | 256 | { "tcl", 3, "application/x-tcl" }, |
| 257 | 257 | { "tex", 3, "application/x-tex" }, |
| 258 | 258 | { "texi", 4, "application/x-texinfo" }, |
| 259 | 259 | { "texinfo", 7, "application/x-texinfo" }, |
| 260 | 260 | { "tgz", 3, "application/x-tar-gz" }, |
| 261 | + { "th1", 3, "application/x-th1" }, | |
| 261 | 262 | { "tif", 3, "image/tiff" }, |
| 262 | 263 | { "tiff", 4, "image/tiff" }, |
| 263 | 264 | { "tr", 2, "application/x-troff" }, |
| 264 | 265 | { "tsi", 3, "audio/TSP-audio" }, |
| 265 | 266 | { "tsp", 3, "application/dsptype" }, |
| @@ -524,10 +525,19 @@ | ||
| 524 | 525 | style_header("Documentation"); |
| 525 | 526 | @ <blockquote><pre> |
| 526 | 527 | @ %h(blob_str(&filebody)) |
| 527 | 528 | @ </pre></blockquote> |
| 528 | 529 | style_footer(); |
| 530 | +#ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 531 | + }else if( db_get_boolean("th1-docs", 0) && | |
| 532 | + fossil_strcmp(zMime, "application/x-th1")==0 ){ | |
| 533 | + char *zHtml = htmlize(zName, -1); | |
| 534 | + style_header(zHtml); | |
| 535 | + Th_Render(blob_str(&filebody)); | |
| 536 | + style_footer(); | |
| 537 | + fossil_free(zHtml); | |
| 538 | +#endif | |
| 529 | 539 | }else{ |
| 530 | 540 | cgi_set_content_type(zMime); |
| 531 | 541 | cgi_set_content(&filebody); |
| 532 | 542 | } |
| 533 | 543 | return; |
| 534 | 544 |
| --- src/doc.c | |
| +++ src/doc.c | |
| @@ -256,10 +256,11 @@ | |
| 256 | { "tcl", 3, "application/x-tcl" }, |
| 257 | { "tex", 3, "application/x-tex" }, |
| 258 | { "texi", 4, "application/x-texinfo" }, |
| 259 | { "texinfo", 7, "application/x-texinfo" }, |
| 260 | { "tgz", 3, "application/x-tar-gz" }, |
| 261 | { "tif", 3, "image/tiff" }, |
| 262 | { "tiff", 4, "image/tiff" }, |
| 263 | { "tr", 2, "application/x-troff" }, |
| 264 | { "tsi", 3, "audio/TSP-audio" }, |
| 265 | { "tsp", 3, "application/dsptype" }, |
| @@ -524,10 +525,19 @@ | |
| 524 | style_header("Documentation"); |
| 525 | @ <blockquote><pre> |
| 526 | @ %h(blob_str(&filebody)) |
| 527 | @ </pre></blockquote> |
| 528 | style_footer(); |
| 529 | }else{ |
| 530 | cgi_set_content_type(zMime); |
| 531 | cgi_set_content(&filebody); |
| 532 | } |
| 533 | return; |
| 534 |
| --- src/doc.c | |
| +++ src/doc.c | |
| @@ -256,10 +256,11 @@ | |
| 256 | { "tcl", 3, "application/x-tcl" }, |
| 257 | { "tex", 3, "application/x-tex" }, |
| 258 | { "texi", 4, "application/x-texinfo" }, |
| 259 | { "texinfo", 7, "application/x-texinfo" }, |
| 260 | { "tgz", 3, "application/x-tar-gz" }, |
| 261 | { "th1", 3, "application/x-th1" }, |
| 262 | { "tif", 3, "image/tiff" }, |
| 263 | { "tiff", 4, "image/tiff" }, |
| 264 | { "tr", 2, "application/x-troff" }, |
| 265 | { "tsi", 3, "audio/TSP-audio" }, |
| 266 | { "tsp", 3, "application/dsptype" }, |
| @@ -524,10 +525,19 @@ | |
| 525 | style_header("Documentation"); |
| 526 | @ <blockquote><pre> |
| 527 | @ %h(blob_str(&filebody)) |
| 528 | @ </pre></blockquote> |
| 529 | style_footer(); |
| 530 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 531 | }else if( db_get_boolean("th1-docs", 0) && |
| 532 | fossil_strcmp(zMime, "application/x-th1")==0 ){ |
| 533 | char *zHtml = htmlize(zName, -1); |
| 534 | style_header(zHtml); |
| 535 | Th_Render(blob_str(&filebody)); |
| 536 | style_footer(); |
| 537 | fossil_free(zHtml); |
| 538 | #endif |
| 539 | }else{ |
| 540 | cgi_set_content_type(zMime); |
| 541 | cgi_set_content(&filebody); |
| 542 | } |
| 543 | return; |
| 544 |
+8
-8
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -18,11 +18,11 @@ | ||
| 18 | 18 | ** |
| 19 | 19 | ** Code for the JSON API. |
| 20 | 20 | ** |
| 21 | 21 | ** For notes regarding the public JSON interface, please see: |
| 22 | 22 | ** |
| 23 | -** https://docs.google.com/document/d/1fXViveNhDbiXgCuE7QDXQOKeFzf2qNUkBEgiUvoqFN4/edit | |
| 23 | +** https://docs.google.com/document/d/1fXViveNhDbiXgCuE7QDXQOKeFzf2qNUkBEgiUvoqFN4/view | |
| 24 | 24 | ** |
| 25 | 25 | ** |
| 26 | 26 | ** Notes for hackers... |
| 27 | 27 | ** |
| 28 | 28 | ** Here's how command/page dispatching works: json_page_top() (in HTTP mode) or |
| @@ -57,11 +57,11 @@ | ||
| 57 | 57 | |
| 58 | 58 | |
| 59 | 59 | /* |
| 60 | 60 | ** Returns true (non-0) if fossil appears to be running in JSON mode. |
| 61 | 61 | */ |
| 62 | -char fossil_has_json(){ | |
| 62 | +int fossil_has_json(){ | |
| 63 | 63 | return g.json.isJsonMode && (g.isHTTP || g.json.post.o); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /* |
| 67 | 67 | ** Placeholder /json/XXX page impl for NYI (Not Yet Implemented) |
| @@ -384,11 +384,11 @@ | ||
| 384 | 384 | ** either 0 or 1, as opposed to "0 or non-zero", so that clients can |
| 385 | 385 | ** pass a different value as dflt. Thus they can use, e.g. -1 to know |
| 386 | 386 | ** whether or not this function found a match (it will return -1 in |
| 387 | 387 | ** that case). |
| 388 | 388 | */ |
| 389 | -char json_getenv_bool(char const * pKey, char dflt ){ | |
| 389 | +int json_getenv_bool(char const * pKey, int dflt ){ | |
| 390 | 390 | cson_value const * v = json_getenv(pKey); |
| 391 | 391 | const cson_type_id type = v ? cson_value_type_id(v) : CSON_TYPE_UNDEF; |
| 392 | 392 | switch(type){ |
| 393 | 393 | case CSON_TYPE_INTEGER: |
| 394 | 394 | case CSON_TYPE_DOUBLE: |
| @@ -475,15 +475,15 @@ | ||
| 475 | 475 | |
| 476 | 476 | /* |
| 477 | 477 | ** The boolean equivalent of json_find_option_cstr(). |
| 478 | 478 | ** If the option is not found, dftl is returned. |
| 479 | 479 | */ |
| 480 | -char json_find_option_bool(char const * zKey, | |
| 481 | - char const * zCLILong, | |
| 482 | - char const * zCLIShort, | |
| 483 | - char dflt ){ | |
| 484 | - char rc = -1; | |
| 480 | +int json_find_option_bool(char const * zKey, | |
| 481 | + char const * zCLILong, | |
| 482 | + char const * zCLIShort, | |
| 483 | + char dflt ){ | |
| 484 | + int rc = -1; | |
| 485 | 485 | if(!g.isHTTP){ |
| 486 | 486 | if(NULL != find_option(zCLILong ? zCLILong : zKey, |
| 487 | 487 | zCLIShort, 0)){ |
| 488 | 488 | rc = 1; |
| 489 | 489 | } |
| 490 | 490 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -18,11 +18,11 @@ | |
| 18 | ** |
| 19 | ** Code for the JSON API. |
| 20 | ** |
| 21 | ** For notes regarding the public JSON interface, please see: |
| 22 | ** |
| 23 | ** https://docs.google.com/document/d/1fXViveNhDbiXgCuE7QDXQOKeFzf2qNUkBEgiUvoqFN4/edit |
| 24 | ** |
| 25 | ** |
| 26 | ** Notes for hackers... |
| 27 | ** |
| 28 | ** Here's how command/page dispatching works: json_page_top() (in HTTP mode) or |
| @@ -57,11 +57,11 @@ | |
| 57 | |
| 58 | |
| 59 | /* |
| 60 | ** Returns true (non-0) if fossil appears to be running in JSON mode. |
| 61 | */ |
| 62 | char fossil_has_json(){ |
| 63 | return g.json.isJsonMode && (g.isHTTP || g.json.post.o); |
| 64 | } |
| 65 | |
| 66 | /* |
| 67 | ** Placeholder /json/XXX page impl for NYI (Not Yet Implemented) |
| @@ -384,11 +384,11 @@ | |
| 384 | ** either 0 or 1, as opposed to "0 or non-zero", so that clients can |
| 385 | ** pass a different value as dflt. Thus they can use, e.g. -1 to know |
| 386 | ** whether or not this function found a match (it will return -1 in |
| 387 | ** that case). |
| 388 | */ |
| 389 | char json_getenv_bool(char const * pKey, char dflt ){ |
| 390 | cson_value const * v = json_getenv(pKey); |
| 391 | const cson_type_id type = v ? cson_value_type_id(v) : CSON_TYPE_UNDEF; |
| 392 | switch(type){ |
| 393 | case CSON_TYPE_INTEGER: |
| 394 | case CSON_TYPE_DOUBLE: |
| @@ -475,15 +475,15 @@ | |
| 475 | |
| 476 | /* |
| 477 | ** The boolean equivalent of json_find_option_cstr(). |
| 478 | ** If the option is not found, dftl is returned. |
| 479 | */ |
| 480 | char json_find_option_bool(char const * zKey, |
| 481 | char const * zCLILong, |
| 482 | char const * zCLIShort, |
| 483 | char dflt ){ |
| 484 | char rc = -1; |
| 485 | if(!g.isHTTP){ |
| 486 | if(NULL != find_option(zCLILong ? zCLILong : zKey, |
| 487 | zCLIShort, 0)){ |
| 488 | rc = 1; |
| 489 | } |
| 490 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -18,11 +18,11 @@ | |
| 18 | ** |
| 19 | ** Code for the JSON API. |
| 20 | ** |
| 21 | ** For notes regarding the public JSON interface, please see: |
| 22 | ** |
| 23 | ** https://docs.google.com/document/d/1fXViveNhDbiXgCuE7QDXQOKeFzf2qNUkBEgiUvoqFN4/view |
| 24 | ** |
| 25 | ** |
| 26 | ** Notes for hackers... |
| 27 | ** |
| 28 | ** Here's how command/page dispatching works: json_page_top() (in HTTP mode) or |
| @@ -57,11 +57,11 @@ | |
| 57 | |
| 58 | |
| 59 | /* |
| 60 | ** Returns true (non-0) if fossil appears to be running in JSON mode. |
| 61 | */ |
| 62 | int fossil_has_json(){ |
| 63 | return g.json.isJsonMode && (g.isHTTP || g.json.post.o); |
| 64 | } |
| 65 | |
| 66 | /* |
| 67 | ** Placeholder /json/XXX page impl for NYI (Not Yet Implemented) |
| @@ -384,11 +384,11 @@ | |
| 384 | ** either 0 or 1, as opposed to "0 or non-zero", so that clients can |
| 385 | ** pass a different value as dflt. Thus they can use, e.g. -1 to know |
| 386 | ** whether or not this function found a match (it will return -1 in |
| 387 | ** that case). |
| 388 | */ |
| 389 | int json_getenv_bool(char const * pKey, int dflt ){ |
| 390 | cson_value const * v = json_getenv(pKey); |
| 391 | const cson_type_id type = v ? cson_value_type_id(v) : CSON_TYPE_UNDEF; |
| 392 | switch(type){ |
| 393 | case CSON_TYPE_INTEGER: |
| 394 | case CSON_TYPE_DOUBLE: |
| @@ -475,15 +475,15 @@ | |
| 475 | |
| 476 | /* |
| 477 | ** The boolean equivalent of json_find_option_cstr(). |
| 478 | ** If the option is not found, dftl is returned. |
| 479 | */ |
| 480 | int json_find_option_bool(char const * zKey, |
| 481 | char const * zCLILong, |
| 482 | char const * zCLIShort, |
| 483 | char dflt ){ |
| 484 | int rc = -1; |
| 485 | if(!g.isHTTP){ |
| 486 | if(NULL != find_option(zCLILong ? zCLILong : zKey, |
| 487 | zCLIShort, 0)){ |
| 488 | rc = 1; |
| 489 | } |
| 490 |
+1
-1
| --- src/json_detail.h | ||
| +++ src/json_detail.h | ||
| @@ -257,11 +257,11 @@ | ||
| 257 | 257 | ** |
| 258 | 258 | ** Whether or not we need to take args from CLI or POST data makes a |
| 259 | 259 | ** difference in argument/parameter handling in many JSON routines, |
| 260 | 260 | ** and thus this distinction. |
| 261 | 261 | */ |
| 262 | -char fossil_has_json(); | |
| 262 | +int fossil_has_json(); | |
| 263 | 263 | |
| 264 | 264 | enum json_get_changed_files_flags { |
| 265 | 265 | json_get_changed_files_ELIDE_PARENT = 1 << 0 |
| 266 | 266 | }; |
| 267 | 267 | |
| 268 | 268 |
| --- src/json_detail.h | |
| +++ src/json_detail.h | |
| @@ -257,11 +257,11 @@ | |
| 257 | ** |
| 258 | ** Whether or not we need to take args from CLI or POST data makes a |
| 259 | ** difference in argument/parameter handling in many JSON routines, |
| 260 | ** and thus this distinction. |
| 261 | */ |
| 262 | char fossil_has_json(); |
| 263 | |
| 264 | enum json_get_changed_files_flags { |
| 265 | json_get_changed_files_ELIDE_PARENT = 1 << 0 |
| 266 | }; |
| 267 | |
| 268 |
| --- src/json_detail.h | |
| +++ src/json_detail.h | |
| @@ -257,11 +257,11 @@ | |
| 257 | ** |
| 258 | ** Whether or not we need to take args from CLI or POST data makes a |
| 259 | ** difference in argument/parameter handling in many JSON routines, |
| 260 | ** and thus this distinction. |
| 261 | */ |
| 262 | int fossil_has_json(); |
| 263 | |
| 264 | enum json_get_changed_files_flags { |
| 265 | json_get_changed_files_ELIDE_PARENT = 1 << 0 |
| 266 | }; |
| 267 | |
| 268 |
+3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -976,10 +976,13 @@ | ||
| 976 | 976 | #else |
| 977 | 977 | fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); |
| 978 | 978 | #endif |
| 979 | 979 | #if defined(FOSSIL_ENABLE_SSL) |
| 980 | 980 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 981 | +#endif | |
| 982 | +#if defined(FOSSIL_ENABLE_TH1_DOCS) | |
| 983 | + fossil_print("TH1_DOCS\n"); | |
| 981 | 984 | #endif |
| 982 | 985 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 983 | 986 | fossil_print("TH1_HOOKS\n"); |
| 984 | 987 | #endif |
| 985 | 988 | #if defined(FOSSIL_ENABLE_TCL) |
| 986 | 989 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -976,10 +976,13 @@ | |
| 976 | #else |
| 977 | fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); |
| 978 | #endif |
| 979 | #if defined(FOSSIL_ENABLE_SSL) |
| 980 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 981 | #endif |
| 982 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 983 | fossil_print("TH1_HOOKS\n"); |
| 984 | #endif |
| 985 | #if defined(FOSSIL_ENABLE_TCL) |
| 986 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -976,10 +976,13 @@ | |
| 976 | #else |
| 977 | fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); |
| 978 | #endif |
| 979 | #if defined(FOSSIL_ENABLE_SSL) |
| 980 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 981 | #endif |
| 982 | #if defined(FOSSIL_ENABLE_TH1_DOCS) |
| 983 | fossil_print("TH1_DOCS\n"); |
| 984 | #endif |
| 985 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 986 | fossil_print("TH1_HOOKS\n"); |
| 987 | #endif |
| 988 | #if defined(FOSSIL_ENABLE_TCL) |
| 989 |
+3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -976,10 +976,13 @@ | ||
| 976 | 976 | #else |
| 977 | 977 | fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); |
| 978 | 978 | #endif |
| 979 | 979 | #if defined(FOSSIL_ENABLE_SSL) |
| 980 | 980 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 981 | +#endif | |
| 982 | +#if defined(FOSSIL_ENABLE_TH1_DOCS) | |
| 983 | + fossil_print("TH1_DOCS\n"); | |
| 981 | 984 | #endif |
| 982 | 985 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 983 | 986 | fossil_print("TH1_HOOKS\n"); |
| 984 | 987 | #endif |
| 985 | 988 | #if defined(FOSSIL_ENABLE_TCL) |
| 986 | 989 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -976,10 +976,13 @@ | |
| 976 | #else |
| 977 | fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); |
| 978 | #endif |
| 979 | #if defined(FOSSIL_ENABLE_SSL) |
| 980 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 981 | #endif |
| 982 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 983 | fossil_print("TH1_HOOKS\n"); |
| 984 | #endif |
| 985 | #if defined(FOSSIL_ENABLE_TCL) |
| 986 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -976,10 +976,13 @@ | |
| 976 | #else |
| 977 | fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); |
| 978 | #endif |
| 979 | #if defined(FOSSIL_ENABLE_SSL) |
| 980 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 981 | #endif |
| 982 | #if defined(FOSSIL_ENABLE_TH1_DOCS) |
| 983 | fossil_print("TH1_DOCS\n"); |
| 984 | #endif |
| 985 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 986 | fossil_print("TH1_HOOKS\n"); |
| 987 | #endif |
| 988 | #if defined(FOSSIL_ENABLE_TCL) |
| 989 |
+1
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -388,11 +388,11 @@ | ||
| 388 | 388 | |
| 389 | 389 | # Setup the options used to compile the included SQLite library. |
| 390 | 390 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 391 | 391 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 392 | 392 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 393 | - -DSQLITE_THREADSAFE=2 \ | |
| 393 | + -DSQLITE_THREADSAFE=0 \ | |
| 394 | 394 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 395 | 395 | -DSQLITE_OMIT_DEPRECATED \ |
| 396 | 396 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 397 | 397 | |
| 398 | 398 | # Setup the options used to compile the included SQLite shell. |
| 399 | 399 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -388,11 +388,11 @@ | |
| 388 | |
| 389 | # Setup the options used to compile the included SQLite library. |
| 390 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 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 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -388,11 +388,11 @@ | |
| 388 | |
| 389 | # Setup the options used to compile the included SQLite library. |
| 390 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 391 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 392 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 393 | -DSQLITE_THREADSAFE=0 \ |
| 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 |
+19
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -135,11 +135,11 @@ | ||
| 135 | 135 | # |
| 136 | 136 | set SQLITE_OPTIONS { |
| 137 | 137 | -DNDEBUG=1 |
| 138 | 138 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 139 | 139 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 140 | - -DSQLITE_THREADSAFE=2 | |
| 140 | + -DSQLITE_THREADSAFE=0 | |
| 141 | 141 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 142 | 142 | -DSQLITE_OMIT_DEPRECATED |
| 143 | 143 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 144 | 144 | } |
| 145 | 145 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| @@ -444,10 +444,14 @@ | ||
| 444 | 444 | |
| 445 | 445 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 446 | 446 | # issues when building incrementally). |
| 447 | 447 | # |
| 448 | 448 | # FOSSIL_BUILD_SSL = 1 |
| 449 | + | |
| 450 | +#### Enable TH1 scripts in embedded documentation files | |
| 451 | +# | |
| 452 | +# FOSSIL_ENABLE_TH1_DOCS = 1 | |
| 449 | 453 | |
| 450 | 454 | #### Enable hooks for commands and web pages via TH1 |
| 451 | 455 | # |
| 452 | 456 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 453 | 457 | |
| @@ -597,10 +601,16 @@ | ||
| 597 | 601 | # With HTTPS support |
| 598 | 602 | ifdef FOSSIL_ENABLE_SSL |
| 599 | 603 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 600 | 604 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 601 | 605 | endif |
| 606 | + | |
| 607 | +# With TH1 embedded docs support | |
| 608 | +ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 609 | +TCC += -DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 610 | +RCC += -DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 611 | +endif | |
| 602 | 612 | |
| 603 | 613 | # With TH1 hook support |
| 604 | 614 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 605 | 615 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 606 | 616 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1157,10 +1167,13 @@ | ||
| 1157 | 1167 | # Uncomment to enable miniz usage |
| 1158 | 1168 | # FOSSIL_ENABLE_MINIZ = 1 |
| 1159 | 1169 | |
| 1160 | 1170 | # Uncomment to enable SSL support |
| 1161 | 1171 | # FOSSIL_ENABLE_SSL = 1 |
| 1172 | + | |
| 1173 | +# Uncomment to enable TH1 scripts in embedded documentation files | |
| 1174 | +# FOSSIL_ENABLE_TH1_DOCS = 1 | |
| 1162 | 1175 | |
| 1163 | 1176 | # Uncomment to enable TH1 hooks |
| 1164 | 1177 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 1165 | 1178 | |
| 1166 | 1179 | # Uncomment to enable Tcl support |
| @@ -1233,10 +1246,15 @@ | ||
| 1233 | 1246 | TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1 |
| 1234 | 1247 | RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1 |
| 1235 | 1248 | LIBS = $(LIBS) $(SSLLIB) |
| 1236 | 1249 | LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR) |
| 1237 | 1250 | !endif |
| 1251 | + | |
| 1252 | +!ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 1253 | +TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 1254 | +RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 1255 | +!endif | |
| 1238 | 1256 | |
| 1239 | 1257 | !ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 1240 | 1258 | TCC = $(TCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 1241 | 1259 | RCC = $(RCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 1242 | 1260 | !endif |
| 1243 | 1261 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -135,11 +135,11 @@ | |
| 135 | # |
| 136 | set SQLITE_OPTIONS { |
| 137 | -DNDEBUG=1 |
| 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 |
| @@ -444,10 +444,14 @@ | |
| 444 | |
| 445 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 446 | # issues when building incrementally). |
| 447 | # |
| 448 | # FOSSIL_BUILD_SSL = 1 |
| 449 | |
| 450 | #### Enable hooks for commands and web pages via TH1 |
| 451 | # |
| 452 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 453 | |
| @@ -597,10 +601,16 @@ | |
| 597 | # With HTTPS support |
| 598 | ifdef FOSSIL_ENABLE_SSL |
| 599 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 600 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 601 | endif |
| 602 | |
| 603 | # With TH1 hook support |
| 604 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 605 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 606 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1157,10 +1167,13 @@ | |
| 1157 | # Uncomment to enable miniz usage |
| 1158 | # FOSSIL_ENABLE_MINIZ = 1 |
| 1159 | |
| 1160 | # Uncomment to enable SSL support |
| 1161 | # FOSSIL_ENABLE_SSL = 1 |
| 1162 | |
| 1163 | # Uncomment to enable TH1 hooks |
| 1164 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 1165 | |
| 1166 | # Uncomment to enable Tcl support |
| @@ -1233,10 +1246,15 @@ | |
| 1233 | TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1 |
| 1234 | RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1 |
| 1235 | LIBS = $(LIBS) $(SSLLIB) |
| 1236 | LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR) |
| 1237 | !endif |
| 1238 | |
| 1239 | !ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 1240 | TCC = $(TCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 1241 | RCC = $(RCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 1242 | !endif |
| 1243 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -135,11 +135,11 @@ | |
| 135 | # |
| 136 | set SQLITE_OPTIONS { |
| 137 | -DNDEBUG=1 |
| 138 | -DSQLITE_OMIT_LOAD_EXTENSION=1 |
| 139 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 140 | -DSQLITE_THREADSAFE=0 |
| 141 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 142 | -DSQLITE_OMIT_DEPRECATED |
| 143 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 144 | } |
| 145 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| @@ -444,10 +444,14 @@ | |
| 444 | |
| 445 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 446 | # issues when building incrementally). |
| 447 | # |
| 448 | # FOSSIL_BUILD_SSL = 1 |
| 449 | |
| 450 | #### Enable TH1 scripts in embedded documentation files |
| 451 | # |
| 452 | # FOSSIL_ENABLE_TH1_DOCS = 1 |
| 453 | |
| 454 | #### Enable hooks for commands and web pages via TH1 |
| 455 | # |
| 456 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 457 | |
| @@ -597,10 +601,16 @@ | |
| 601 | # With HTTPS support |
| 602 | ifdef FOSSIL_ENABLE_SSL |
| 603 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 604 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 605 | endif |
| 606 | |
| 607 | # With TH1 embedded docs support |
| 608 | ifdef FOSSIL_ENABLE_TH1_DOCS |
| 609 | TCC += -DFOSSIL_ENABLE_TH1_DOCS=1 |
| 610 | RCC += -DFOSSIL_ENABLE_TH1_DOCS=1 |
| 611 | endif |
| 612 | |
| 613 | # With TH1 hook support |
| 614 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 615 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 616 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1157,10 +1167,13 @@ | |
| 1167 | # Uncomment to enable miniz usage |
| 1168 | # FOSSIL_ENABLE_MINIZ = 1 |
| 1169 | |
| 1170 | # Uncomment to enable SSL support |
| 1171 | # FOSSIL_ENABLE_SSL = 1 |
| 1172 | |
| 1173 | # Uncomment to enable TH1 scripts in embedded documentation files |
| 1174 | # FOSSIL_ENABLE_TH1_DOCS = 1 |
| 1175 | |
| 1176 | # Uncomment to enable TH1 hooks |
| 1177 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 1178 | |
| 1179 | # Uncomment to enable Tcl support |
| @@ -1233,10 +1246,15 @@ | |
| 1246 | TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1 |
| 1247 | RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1 |
| 1248 | LIBS = $(LIBS) $(SSLLIB) |
| 1249 | LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR) |
| 1250 | !endif |
| 1251 | |
| 1252 | !ifdef FOSSIL_ENABLE_TH1_DOCS |
| 1253 | TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1 |
| 1254 | RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1 |
| 1255 | !endif |
| 1256 | |
| 1257 | !ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 1258 | TCC = $(TCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 1259 | RCC = $(RCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 1260 | !endif |
| 1261 |
+6
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -373,10 +373,11 @@ | ||
| 373 | 373 | ** |
| 374 | 374 | ** Return true if the fossil binary has the given compile-time feature |
| 375 | 375 | ** enabled. The set of features includes: |
| 376 | 376 | ** |
| 377 | 377 | ** "ssl" = FOSSIL_ENABLE_SSL |
| 378 | +** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS | |
| 378 | 379 | ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS |
| 379 | 380 | ** "tcl" = FOSSIL_ENABLE_TCL |
| 380 | 381 | ** "useTclStubs" = USE_TCL_STUBS |
| 381 | 382 | ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS |
| 382 | 383 | ** "tclPrivateStubs" = FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| @@ -402,10 +403,15 @@ | ||
| 402 | 403 | } |
| 403 | 404 | #if defined(FOSSIL_ENABLE_SSL) |
| 404 | 405 | else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){ |
| 405 | 406 | rc = 1; |
| 406 | 407 | } |
| 408 | +#endif | |
| 409 | +#if defined(FOSSIL_ENABLE_TH1_DOCS) | |
| 410 | + else if( 0 == fossil_strnicmp( zArg, "th1Docs\0", 8 ) ){ | |
| 411 | + rc = 1; | |
| 412 | + } | |
| 407 | 413 | #endif |
| 408 | 414 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 409 | 415 | else if( 0 == fossil_strnicmp( zArg, "th1Hooks\0", 9 ) ){ |
| 410 | 416 | rc = 1; |
| 411 | 417 | } |
| 412 | 418 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -373,10 +373,11 @@ | |
| 373 | ** |
| 374 | ** Return true if the fossil binary has the given compile-time feature |
| 375 | ** enabled. The set of features includes: |
| 376 | ** |
| 377 | ** "ssl" = FOSSIL_ENABLE_SSL |
| 378 | ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS |
| 379 | ** "tcl" = FOSSIL_ENABLE_TCL |
| 380 | ** "useTclStubs" = USE_TCL_STUBS |
| 381 | ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS |
| 382 | ** "tclPrivateStubs" = FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| @@ -402,10 +403,15 @@ | |
| 402 | } |
| 403 | #if defined(FOSSIL_ENABLE_SSL) |
| 404 | else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){ |
| 405 | rc = 1; |
| 406 | } |
| 407 | #endif |
| 408 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 409 | else if( 0 == fossil_strnicmp( zArg, "th1Hooks\0", 9 ) ){ |
| 410 | rc = 1; |
| 411 | } |
| 412 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -373,10 +373,11 @@ | |
| 373 | ** |
| 374 | ** Return true if the fossil binary has the given compile-time feature |
| 375 | ** enabled. The set of features includes: |
| 376 | ** |
| 377 | ** "ssl" = FOSSIL_ENABLE_SSL |
| 378 | ** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS |
| 379 | ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS |
| 380 | ** "tcl" = FOSSIL_ENABLE_TCL |
| 381 | ** "useTclStubs" = USE_TCL_STUBS |
| 382 | ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS |
| 383 | ** "tclPrivateStubs" = FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| @@ -402,10 +403,15 @@ | |
| 403 | } |
| 404 | #if defined(FOSSIL_ENABLE_SSL) |
| 405 | else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){ |
| 406 | rc = 1; |
| 407 | } |
| 408 | #endif |
| 409 | #if defined(FOSSIL_ENABLE_TH1_DOCS) |
| 410 | else if( 0 == fossil_strnicmp( zArg, "th1Docs\0", 8 ) ){ |
| 411 | rc = 1; |
| 412 | } |
| 413 | #endif |
| 414 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 415 | else if( 0 == fossil_strnicmp( zArg, "th1Hooks\0", 9 ) ){ |
| 416 | rc = 1; |
| 417 | } |
| 418 |
+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_ENABLE_EXPLAIN_COMMENTS -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_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_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=0 -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_ENABLE_EXPLAIN_COMMENTS | |
| 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 | |
| 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_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=0 -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 |
+11
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -52,10 +52,14 @@ | ||
| 52 | 52 | |
| 53 | 53 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 54 | 54 | # issues when building incrementally). |
| 55 | 55 | # |
| 56 | 56 | # FOSSIL_BUILD_SSL = 1 |
| 57 | + | |
| 58 | +#### Enable TH1 scripts in embedded documentation files | |
| 59 | +# | |
| 60 | +# FOSSIL_ENABLE_TH1_DOCS = 1 | |
| 57 | 61 | |
| 58 | 62 | #### Enable hooks for commands and web pages via TH1 |
| 59 | 63 | # |
| 60 | 64 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 61 | 65 | |
| @@ -205,10 +209,16 @@ | ||
| 205 | 209 | # With HTTPS support |
| 206 | 210 | ifdef FOSSIL_ENABLE_SSL |
| 207 | 211 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 208 | 212 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 209 | 213 | endif |
| 214 | + | |
| 215 | +# With TH1 embedded docs support | |
| 216 | +ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 217 | +TCC += -DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 218 | +RCC += -DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 219 | +endif | |
| 210 | 220 | |
| 211 | 221 | # With TH1 hook support |
| 212 | 222 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 213 | 223 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 214 | 224 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1840,11 +1850,11 @@ | ||
| 1840 | 1850 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1841 | 1851 | |
| 1842 | 1852 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 1843 | 1853 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1844 | 1854 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1845 | - -DSQLITE_THREADSAFE=2 \ | |
| 1855 | + -DSQLITE_THREADSAFE=0 \ | |
| 1846 | 1856 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1847 | 1857 | -DSQLITE_OMIT_DEPRECATED \ |
| 1848 | 1858 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1849 | 1859 | -DSQLITE_WIN32_NO_ANSI \ |
| 1850 | 1860 | -D_HAVE__MINGW_H \ |
| 1851 | 1861 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -52,10 +52,14 @@ | |
| 52 | |
| 53 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 54 | # issues when building incrementally). |
| 55 | # |
| 56 | # FOSSIL_BUILD_SSL = 1 |
| 57 | |
| 58 | #### Enable hooks for commands and web pages via TH1 |
| 59 | # |
| 60 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 61 | |
| @@ -205,10 +209,16 @@ | |
| 205 | # With HTTPS support |
| 206 | ifdef FOSSIL_ENABLE_SSL |
| 207 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 208 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 209 | endif |
| 210 | |
| 211 | # With TH1 hook support |
| 212 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 213 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 214 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1840,11 +1850,11 @@ | |
| 1840 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1841 | |
| 1842 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 1843 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1844 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1845 | -DSQLITE_THREADSAFE=2 \ |
| 1846 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1847 | -DSQLITE_OMIT_DEPRECATED \ |
| 1848 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1849 | -DSQLITE_WIN32_NO_ANSI \ |
| 1850 | -D_HAVE__MINGW_H \ |
| 1851 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -52,10 +52,14 @@ | |
| 52 | |
| 53 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 54 | # issues when building incrementally). |
| 55 | # |
| 56 | # FOSSIL_BUILD_SSL = 1 |
| 57 | |
| 58 | #### Enable TH1 scripts in embedded documentation files |
| 59 | # |
| 60 | # FOSSIL_ENABLE_TH1_DOCS = 1 |
| 61 | |
| 62 | #### Enable hooks for commands and web pages via TH1 |
| 63 | # |
| 64 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 65 | |
| @@ -205,10 +209,16 @@ | |
| 209 | # With HTTPS support |
| 210 | ifdef FOSSIL_ENABLE_SSL |
| 211 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 212 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 213 | endif |
| 214 | |
| 215 | # With TH1 embedded docs support |
| 216 | ifdef FOSSIL_ENABLE_TH1_DOCS |
| 217 | TCC += -DFOSSIL_ENABLE_TH1_DOCS=1 |
| 218 | RCC += -DFOSSIL_ENABLE_TH1_DOCS=1 |
| 219 | endif |
| 220 | |
| 221 | # With TH1 hook support |
| 222 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 223 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 224 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1840,11 +1850,11 @@ | |
| 1850 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1851 | |
| 1852 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 1853 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1854 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1855 | -DSQLITE_THREADSAFE=0 \ |
| 1856 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1857 | -DSQLITE_OMIT_DEPRECATED \ |
| 1858 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1859 | -DSQLITE_WIN32_NO_ANSI \ |
| 1860 | -D_HAVE__MINGW_H \ |
| 1861 |
+11
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -52,10 +52,14 @@ | ||
| 52 | 52 | |
| 53 | 53 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 54 | 54 | # issues when building incrementally). |
| 55 | 55 | # |
| 56 | 56 | # FOSSIL_BUILD_SSL = 1 |
| 57 | + | |
| 58 | +#### Enable TH1 scripts in embedded documentation files | |
| 59 | +# | |
| 60 | +# FOSSIL_ENABLE_TH1_DOCS = 1 | |
| 57 | 61 | |
| 58 | 62 | #### Enable hooks for commands and web pages via TH1 |
| 59 | 63 | # |
| 60 | 64 | FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 61 | 65 | |
| @@ -205,10 +209,16 @@ | ||
| 205 | 209 | # With HTTPS support |
| 206 | 210 | ifdef FOSSIL_ENABLE_SSL |
| 207 | 211 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 208 | 212 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 209 | 213 | endif |
| 214 | + | |
| 215 | +# With TH1 embedded docs support | |
| 216 | +ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 217 | +TCC += -DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 218 | +RCC += -DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 219 | +endif | |
| 210 | 220 | |
| 211 | 221 | # With TH1 hook support |
| 212 | 222 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 213 | 223 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 214 | 224 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1840,11 +1850,11 @@ | ||
| 1840 | 1850 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1841 | 1851 | |
| 1842 | 1852 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 1843 | 1853 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1844 | 1854 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1845 | - -DSQLITE_THREADSAFE=2 \ | |
| 1855 | + -DSQLITE_THREADSAFE=0 \ | |
| 1846 | 1856 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1847 | 1857 | -DSQLITE_OMIT_DEPRECATED \ |
| 1848 | 1858 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1849 | 1859 | -DSQLITE_WIN32_NO_ANSI \ |
| 1850 | 1860 | -D_HAVE__MINGW_H \ |
| 1851 | 1861 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -52,10 +52,14 @@ | |
| 52 | |
| 53 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 54 | # issues when building incrementally). |
| 55 | # |
| 56 | # FOSSIL_BUILD_SSL = 1 |
| 57 | |
| 58 | #### Enable hooks for commands and web pages via TH1 |
| 59 | # |
| 60 | FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 61 | |
| @@ -205,10 +209,16 @@ | |
| 205 | # With HTTPS support |
| 206 | ifdef FOSSIL_ENABLE_SSL |
| 207 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 208 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 209 | endif |
| 210 | |
| 211 | # With TH1 hook support |
| 212 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 213 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 214 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1840,11 +1850,11 @@ | |
| 1840 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1841 | |
| 1842 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 1843 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1844 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1845 | -DSQLITE_THREADSAFE=2 \ |
| 1846 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1847 | -DSQLITE_OMIT_DEPRECATED \ |
| 1848 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1849 | -DSQLITE_WIN32_NO_ANSI \ |
| 1850 | -D_HAVE__MINGW_H \ |
| 1851 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -52,10 +52,14 @@ | |
| 52 | |
| 53 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 54 | # issues when building incrementally). |
| 55 | # |
| 56 | # FOSSIL_BUILD_SSL = 1 |
| 57 | |
| 58 | #### Enable TH1 scripts in embedded documentation files |
| 59 | # |
| 60 | # FOSSIL_ENABLE_TH1_DOCS = 1 |
| 61 | |
| 62 | #### Enable hooks for commands and web pages via TH1 |
| 63 | # |
| 64 | FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 65 | |
| @@ -205,10 +209,16 @@ | |
| 209 | # With HTTPS support |
| 210 | ifdef FOSSIL_ENABLE_SSL |
| 211 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 212 | RCC += -DFOSSIL_ENABLE_SSL=1 |
| 213 | endif |
| 214 | |
| 215 | # With TH1 embedded docs support |
| 216 | ifdef FOSSIL_ENABLE_TH1_DOCS |
| 217 | TCC += -DFOSSIL_ENABLE_TH1_DOCS=1 |
| 218 | RCC += -DFOSSIL_ENABLE_TH1_DOCS=1 |
| 219 | endif |
| 220 | |
| 221 | # With TH1 hook support |
| 222 | ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 223 | TCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 224 | RCC += -DFOSSIL_ENABLE_TH1_HOOKS=1 |
| @@ -1840,11 +1850,11 @@ | |
| 1850 | $(OBJDIR)/zip.h: $(OBJDIR)/headers |
| 1851 | |
| 1852 | SQLITE_OPTIONS = -DNDEBUG=1 \ |
| 1853 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1854 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 1855 | -DSQLITE_THREADSAFE=0 \ |
| 1856 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 1857 | -DSQLITE_OMIT_DEPRECATED \ |
| 1858 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 1859 | -DSQLITE_WIN32_NO_ANSI \ |
| 1860 | -D_HAVE__MINGW_H \ |
| 1861 |
+9
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -26,10 +26,13 @@ | ||
| 26 | 26 | # Uncomment to enable miniz usage |
| 27 | 27 | # FOSSIL_ENABLE_MINIZ = 1 |
| 28 | 28 | |
| 29 | 29 | # Uncomment to enable SSL support |
| 30 | 30 | # FOSSIL_ENABLE_SSL = 1 |
| 31 | + | |
| 32 | +# Uncomment to enable TH1 scripts in embedded documentation files | |
| 33 | +# FOSSIL_ENABLE_TH1_DOCS = 1 | |
| 31 | 34 | |
| 32 | 35 | # Uncomment to enable TH1 hooks |
| 33 | 36 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 34 | 37 | |
| 35 | 38 | # Uncomment to enable Tcl support |
| @@ -102,10 +105,15 @@ | ||
| 102 | 105 | TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1 |
| 103 | 106 | RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1 |
| 104 | 107 | LIBS = $(LIBS) $(SSLLIB) |
| 105 | 108 | LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR) |
| 106 | 109 | !endif |
| 110 | + | |
| 111 | +!ifdef FOSSIL_ENABLE_TH1_DOCS | |
| 112 | +TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 113 | +RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1 | |
| 114 | +!endif | |
| 107 | 115 | |
| 108 | 116 | !ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 109 | 117 | TCC = $(TCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 110 | 118 | RCC = $(RCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 111 | 119 | !endif |
| @@ -122,11 +130,11 @@ | ||
| 122 | 130 | !endif |
| 123 | 131 | |
| 124 | 132 | SQLITE_OPTIONS = /DNDEBUG=1 \ |
| 125 | 133 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 126 | 134 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 127 | - /DSQLITE_THREADSAFE=2 \ | |
| 135 | + /DSQLITE_THREADSAFE=0 \ | |
| 128 | 136 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 129 | 137 | /DSQLITE_OMIT_DEPRECATED \ |
| 130 | 138 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 131 | 139 | /DSQLITE_WIN32_NO_ANSI |
| 132 | 140 | |
| 133 | 141 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -26,10 +26,13 @@ | |
| 26 | # Uncomment to enable miniz usage |
| 27 | # FOSSIL_ENABLE_MINIZ = 1 |
| 28 | |
| 29 | # Uncomment to enable SSL support |
| 30 | # FOSSIL_ENABLE_SSL = 1 |
| 31 | |
| 32 | # Uncomment to enable TH1 hooks |
| 33 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 34 | |
| 35 | # Uncomment to enable Tcl support |
| @@ -102,10 +105,15 @@ | |
| 102 | TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1 |
| 103 | RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1 |
| 104 | LIBS = $(LIBS) $(SSLLIB) |
| 105 | LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR) |
| 106 | !endif |
| 107 | |
| 108 | !ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 109 | TCC = $(TCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 110 | RCC = $(RCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 111 | !endif |
| @@ -122,11 +130,11 @@ | |
| 122 | !endif |
| 123 | |
| 124 | SQLITE_OPTIONS = /DNDEBUG=1 \ |
| 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 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -26,10 +26,13 @@ | |
| 26 | # Uncomment to enable miniz usage |
| 27 | # FOSSIL_ENABLE_MINIZ = 1 |
| 28 | |
| 29 | # Uncomment to enable SSL support |
| 30 | # FOSSIL_ENABLE_SSL = 1 |
| 31 | |
| 32 | # Uncomment to enable TH1 scripts in embedded documentation files |
| 33 | # FOSSIL_ENABLE_TH1_DOCS = 1 |
| 34 | |
| 35 | # Uncomment to enable TH1 hooks |
| 36 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 37 | |
| 38 | # Uncomment to enable Tcl support |
| @@ -102,10 +105,15 @@ | |
| 105 | TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1 |
| 106 | RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1 |
| 107 | LIBS = $(LIBS) $(SSLLIB) |
| 108 | LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR) |
| 109 | !endif |
| 110 | |
| 111 | !ifdef FOSSIL_ENABLE_TH1_DOCS |
| 112 | TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1 |
| 113 | RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1 |
| 114 | !endif |
| 115 | |
| 116 | !ifdef FOSSIL_ENABLE_TH1_HOOKS |
| 117 | TCC = $(TCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 118 | RCC = $(RCC) /DFOSSIL_ENABLE_TH1_HOOKS=1 |
| 119 | !endif |
| @@ -122,11 +130,11 @@ | |
| 130 | !endif |
| 131 | |
| 132 | SQLITE_OPTIONS = /DNDEBUG=1 \ |
| 133 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 134 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 135 | /DSQLITE_THREADSAFE=0 \ |
| 136 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 137 | /DSQLITE_OMIT_DEPRECATED \ |
| 138 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 139 | /DSQLITE_WIN32_NO_ANSI |
| 140 | |
| 141 |
+5
| --- win/fossil.rc | ||
| +++ win/fossil.rc | ||
| @@ -115,10 +115,15 @@ | ||
| 115 | 115 | VALUE "CommandLineIsUnicode", "Yes\0" |
| 116 | 116 | #endif /* defined(BROKEN_MINGW_CMDLINE) */ |
| 117 | 117 | #if defined(FOSSIL_ENABLE_SSL) |
| 118 | 118 | VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0" |
| 119 | 119 | #endif /* defined(FOSSIL_ENABLE_SSL) */ |
| 120 | +#if defined(FOSSIL_ENABLE_TH1_DOCS) | |
| 121 | + VALUE "Th1Docs", "Yes\0" | |
| 122 | +#else | |
| 123 | + VALUE "Th1Docs", "No\0" | |
| 124 | +#endif /* defined(FOSSIL_ENABLE_TH1_DOCS) */ | |
| 120 | 125 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 121 | 126 | VALUE "Th1Hooks", "Yes\0" |
| 122 | 127 | #else |
| 123 | 128 | VALUE "Th1Hooks", "No\0" |
| 124 | 129 | #endif /* defined(FOSSIL_ENABLE_TH1_HOOKS) */ |
| 125 | 130 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -115,10 +115,15 @@ | |
| 115 | VALUE "CommandLineIsUnicode", "Yes\0" |
| 116 | #endif /* defined(BROKEN_MINGW_CMDLINE) */ |
| 117 | #if defined(FOSSIL_ENABLE_SSL) |
| 118 | VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0" |
| 119 | #endif /* defined(FOSSIL_ENABLE_SSL) */ |
| 120 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 121 | VALUE "Th1Hooks", "Yes\0" |
| 122 | #else |
| 123 | VALUE "Th1Hooks", "No\0" |
| 124 | #endif /* defined(FOSSIL_ENABLE_TH1_HOOKS) */ |
| 125 |
| --- win/fossil.rc | |
| +++ win/fossil.rc | |
| @@ -115,10 +115,15 @@ | |
| 115 | VALUE "CommandLineIsUnicode", "Yes\0" |
| 116 | #endif /* defined(BROKEN_MINGW_CMDLINE) */ |
| 117 | #if defined(FOSSIL_ENABLE_SSL) |
| 118 | VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0" |
| 119 | #endif /* defined(FOSSIL_ENABLE_SSL) */ |
| 120 | #if defined(FOSSIL_ENABLE_TH1_DOCS) |
| 121 | VALUE "Th1Docs", "Yes\0" |
| 122 | #else |
| 123 | VALUE "Th1Docs", "No\0" |
| 124 | #endif /* defined(FOSSIL_ENABLE_TH1_DOCS) */ |
| 125 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 126 | VALUE "Th1Hooks", "Yes\0" |
| 127 | #else |
| 128 | VALUE "Th1Hooks", "No\0" |
| 129 | #endif /* defined(FOSSIL_ENABLE_TH1_HOOKS) */ |
| 130 |