Fossil SCM

Don't replace sqlite3_strglob with sqlglob: It's wrong because the return value is different. Since SQLite 3.8.2 is guaranteed to have sqlite3_strglob anyway, no need to worry.

jan.nijtmans 2014-01-11 18:29 branch-1.28 merge
Commit ddc93368e5e99b73435a750fac6b8ceb09432899
Parent 6fce6fc256863d3…
11 files changed +30 +1 -2 +1 -2 -1 -1 +1 -1 +1 -1 -1 -1 -1 +22 -2
~ src/main.c ~ src/main.mk ~ src/main.mk ~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki
M src/main.c
+30
--- src/main.c
+++ src/main.c
@@ -1084,10 +1084,40 @@
10841084
 if( aCmdHelp[i].zText && *aCmdHelp[i].zText ){
10851085
 @ <li><a href="%s(g.zTop)/help?cmd=%s(z)">%s(z+1)</a></li>
10861086
 }else{
10871087
 @ <li>%s(z+1)</li>
10881088
 }
1089
+ j++;
1090
+ if( j>=n ){
1091
+ @ </ul></td>
1092
+ j = 0;
1093
+ }
1094
+ }
1095
+ if( j>0 ){
1096
+ @ </ul></td>
1097
+ }
1098
+ @ </tr></table>
1099
+
1100
+ @ <h1>Unsupported commands:</h1>
1101
+ @ <table border="0"><tr>
1102
+ for(i=j=0; i<count(aCommand); i++){
1103
+ const char *z = aCommand[i].zName;
1104
+ if( strncmp(z,"test",4)!=0 ) continue;
1105
+ j++;
1106
+ }
1107
+ n = (j+3)/4;
1108
+ for(i=j=0; i<count(aCommand); i++){
1109
+ const char *z = aCommand[i].zName;
1110
+ if( strncmp(z,"test",4)!=0 ) continue;
1111
+ if( j==0 ){
1112
+ @ <td valign="top"><ul>
1113
+ }
1114
+ if( aCmdHelp[i].zText && *aCmdHelp[i].zText ){
1115
+ @ <li><a href="%s(g.zTop)/help?cmd=%s(z)">%s(z)</a></li>
1116
+ }else{
1117
+ @ <li>%s(z)</li>
1118
+ }
10891119
 j++;
10901120
 if( j>=n ){
10911121
 @ </ul></td>
10921122
 j = 0;
10931123
 }
10941124
--- src/main.c
+++ src/main.c
@@ -1084,10 +1084,40 @@
1084 if( aCmdHelp[i].zText && *aCmdHelp[i].zText ){
1085 @ <li><a href="%s(g.zTop)/help?cmd=%s(z)">%s(z+1)</a></li>
1086 }else{
1087 @ <li>%s(z+1)</li>
1088 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1089 j++;
1090 if( j>=n ){
1091 @ </ul></td>
1092 j = 0;
1093 }
1094
--- src/main.c
+++ src/main.c
@@ -1084,10 +1084,40 @@
1084 if( aCmdHelp[i].zText && *aCmdHelp[i].zText ){
1085 @ <li><a href="%s(g.zTop)/help?cmd=%s(z)">%s(z+1)</a></li>
1086 }else{
1087 @ <li>%s(z+1)</li>
1088 }
1089 j++;
1090 if( j>=n ){
1091 @ </ul></td>
1092 j = 0;
1093 }
1094 }
1095 if( j>0 ){
1096 @ </ul></td>
1097 }
1098 @ </tr></table>
1099
1100 @ <h1>Unsupported commands:</h1>
1101 @ <table border="0"><tr>
1102 for(i=j=0; i<count(aCommand); i++){
1103 const char *z = aCommand[i].zName;
1104 if( strncmp(z,"test",4)!=0 ) continue;
1105 j++;
1106 }
1107 n = (j+3)/4;
1108 for(i=j=0; i<count(aCommand); i++){
1109 const char *z = aCommand[i].zName;
1110 if( strncmp(z,"test",4)!=0 ) continue;
1111 if( j==0 ){
1112 @ <td valign="top"><ul>
1113 }
1114 if( aCmdHelp[i].zText && *aCmdHelp[i].zText ){
1115 @ <li><a href="%s(g.zTop)/help?cmd=%s(z)">%s(z)</a></li>
1116 }else{
1117 @ <li>%s(z)</li>
1118 }
1119 j++;
1120 if( j>=n ){
1121 @ </ul></td>
1122 j = 0;
1123 }
1124
M src/main.mk
+1 -2
--- src/main.mk
+++ src/main.mk
@@ -385,12 +385,11 @@
385385
 -DSQLITE_OMIT_DEPRECATED \
386386
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
387387
388388
 # Setup the options used to compile the included SQLite shell.
389389
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
390
- -DSQLITE_OMIT_LOAD_EXTENSION=1 \
391
- -Dsqlite3_strglob=strglob
390
+ -DSQLITE_OMIT_LOAD_EXTENSION=1
392391
393392
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
394393
 # to 1. If it is set to 1, then there is no need to build or link
395394
 # the sqlite3.o object. Instead, the system sqlite will be linked
396395
 # using -lsqlite3.
397396
--- src/main.mk
+++ src/main.mk
@@ -385,12 +385,11 @@
385 -DSQLITE_OMIT_DEPRECATED \
386 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
387
388 # Setup the options used to compile the included SQLite shell.
389 SHELL_OPTIONS = -Dmain=sqlite3_shell \
390 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
391 -Dsqlite3_strglob=strglob
392
393 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
394 # to 1. If it is set to 1, then there is no need to build or link
395 # the sqlite3.o object. Instead, the system sqlite will be linked
396 # using -lsqlite3.
397
--- src/main.mk
+++ src/main.mk
@@ -385,12 +385,11 @@
385 -DSQLITE_OMIT_DEPRECATED \
386 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
387
388 # Setup the options used to compile the included SQLite shell.
389 SHELL_OPTIONS = -Dmain=sqlite3_shell \
390 -DSQLITE_OMIT_LOAD_EXTENSION=1
 
391
392 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
393 # to 1. If it is set to 1, then there is no need to build or link
394 # the sqlite3.o object. Instead, the system sqlite will be linked
395 # using -lsqlite3.
396
M src/main.mk
+1 -2
--- src/main.mk
+++ src/main.mk
@@ -385,12 +385,11 @@
385385
 -DSQLITE_OMIT_DEPRECATED \
386386
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
387387
388388
 # Setup the options used to compile the included SQLite shell.
389389
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
390
- -DSQLITE_OMIT_LOAD_EXTENSION=1 \
391
- -Dsqlite3_strglob=strglob
390
+ -DSQLITE_OMIT_LOAD_EXTENSION=1
392391
393392
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
394393
 # to 1. If it is set to 1, then there is no need to build or link
395394
 # the sqlite3.o object. Instead, the system sqlite will be linked
396395
 # using -lsqlite3.
397396
--- src/main.mk
+++ src/main.mk
@@ -385,12 +385,11 @@
385 -DSQLITE_OMIT_DEPRECATED \
386 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
387
388 # Setup the options used to compile the included SQLite shell.
389 SHELL_OPTIONS = -Dmain=sqlite3_shell \
390 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
391 -Dsqlite3_strglob=strglob
392
393 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
394 # to 1. If it is set to 1, then there is no need to build or link
395 # the sqlite3.o object. Instead, the system sqlite will be linked
396 # using -lsqlite3.
397
--- src/main.mk
+++ src/main.mk
@@ -385,12 +385,11 @@
385 -DSQLITE_OMIT_DEPRECATED \
386 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
387
388 # Setup the options used to compile the included SQLite shell.
389 SHELL_OPTIONS = -Dmain=sqlite3_shell \
390 -DSQLITE_OMIT_LOAD_EXTENSION=1
 
391
392 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
393 # to 1. If it is set to 1, then there is no need to build or link
394 # the sqlite3.o object. Instead, the system sqlite will be linked
395 # using -lsqlite3.
396
M src/makemake.tcl
-1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -146,11 +146,10 @@
146146
 # Options used to compile the included SQLite shell.
147147
 #
148148
 set SHELL_OPTIONS {
149149
 -Dmain=sqlite3_shell
150150
 -DSQLITE_OMIT_LOAD_EXTENSION=1
151
- -Dsqlite3_strglob=strglob
152151
 }
153152
154153
 # Options used to compile the included SQLite shell on Windows.
155154
 #
156155
 set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
157156
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -146,11 +146,10 @@
146 # Options used to compile the included SQLite shell.
147 #
148 set SHELL_OPTIONS {
149 -Dmain=sqlite3_shell
150 -DSQLITE_OMIT_LOAD_EXTENSION=1
151 -Dsqlite3_strglob=strglob
152 }
153
154 # Options used to compile the included SQLite shell on Windows.
155 #
156 set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
157
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -146,11 +146,10 @@
146 # Options used to compile the included SQLite shell.
147 #
148 set SHELL_OPTIONS {
149 -Dmain=sqlite3_shell
150 -DSQLITE_OMIT_LOAD_EXTENSION=1
 
151 }
152
153 # Options used to compile the included SQLite shell on Windows.
154 #
155 set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
156
M src/makemake.tcl
-1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -146,11 +146,10 @@
146146
 # Options used to compile the included SQLite shell.
147147
 #
148148
 set SHELL_OPTIONS {
149149
 -Dmain=sqlite3_shell
150150
 -DSQLITE_OMIT_LOAD_EXTENSION=1
151
- -Dsqlite3_strglob=strglob
152151
 }
153152
154153
 # Options used to compile the included SQLite shell on Windows.
155154
 #
156155
 set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
157156
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -146,11 +146,10 @@
146 # Options used to compile the included SQLite shell.
147 #
148 set SHELL_OPTIONS {
149 -Dmain=sqlite3_shell
150 -DSQLITE_OMIT_LOAD_EXTENSION=1
151 -Dsqlite3_strglob=strglob
152 }
153
154 # Options used to compile the included SQLite shell on Windows.
155 #
156 set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
157
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -146,11 +146,10 @@
146 # Options used to compile the included SQLite shell.
147 #
148 set SHELL_OPTIONS {
149 -Dmain=sqlite3_shell
150 -DSQLITE_OMIT_LOAD_EXTENSION=1
 
151 }
152
153 # Options used to compile the included SQLite shell on Windows.
154 #
155 set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
156
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -89,11 +89,11 @@
8989
9090
 # define the sqlite shell files, which need special flags on compile
9191
 SQLITESHELLSRC=shell.c
9292
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
9393
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94
-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
94
+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
9595
9696
 # define the th scripting files, which need special flags on compile
9797
 THSRC=th.c th_lang.c
9898
 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
9999
 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100100
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -89,11 +89,11 @@
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 SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
95
96 # define the th scripting files, which need special flags on compile
97 THSRC=th.c th_lang.c
98 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -89,11 +89,11 @@
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 SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
95
96 # define the th scripting files, which need special flags on compile
97 THSRC=th.c th_lang.c
98 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
2626
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
2727
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
2828
2929
 SQLITE_OPTIONS = -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
3030
31
-SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
31
+SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
3232
3333
 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.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 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 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
3434
3535
 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
3636
3737
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
26 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29 SQLITE_OPTIONS = -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 -Dsqlite3_strglob=strglob -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 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 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 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 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
26 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29 SQLITE_OPTIONS = -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 -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 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 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 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 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37
M win/Makefile.mingw
-1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1710,11 +1710,10 @@
17101710
 -DSQLITE_USE_MALLOC_H \
17111711
 -DSQLITE_USE_MSIZE
17121712
17131713
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17141714
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715
- -Dsqlite3_strglob=strglob \
17161715
 -Dgetenv=fossil_getenv \
17171716
 -Dfopen=fossil_fopen
17181717
17191718
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw
17201719
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
17211720
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1710,11 +1710,10 @@
1710 -DSQLITE_USE_MALLOC_H \
1711 -DSQLITE_USE_MSIZE
1712
1713 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715 -Dsqlite3_strglob=strglob \
1716 -Dgetenv=fossil_getenv \
1717 -Dfopen=fossil_fopen
1718
1719 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw
1720 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1710,11 +1710,10 @@
1710 -DSQLITE_USE_MALLOC_H \
1711 -DSQLITE_USE_MSIZE
1712
1713 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
 
1715 -Dgetenv=fossil_getenv \
1716 -Dfopen=fossil_fopen
1717
1718 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw
1719 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1720
M win/Makefile.mingw.mistachkin
-1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1710,11 +1710,10 @@
17101710
 -DSQLITE_USE_MALLOC_H \
17111711
 -DSQLITE_USE_MSIZE
17121712
17131713
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17141714
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715
- -Dsqlite3_strglob=strglob \
17161715
 -Dgetenv=fossil_getenv \
17171716
 -Dfopen=fossil_fopen
17181717
17191718
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw.mistachkin
17201719
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
17211720
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1710,11 +1710,10 @@
1710 -DSQLITE_USE_MALLOC_H \
1711 -DSQLITE_USE_MSIZE
1712
1713 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715 -Dsqlite3_strglob=strglob \
1716 -Dgetenv=fossil_getenv \
1717 -Dfopen=fossil_fopen
1718
1719 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw.mistachkin
1720 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1710,11 +1710,10 @@
1710 -DSQLITE_USE_MALLOC_H \
1711 -DSQLITE_USE_MSIZE
1712
1713 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
 
1715 -Dgetenv=fossil_getenv \
1716 -Dfopen=fossil_fopen
1717
1718 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw.mistachkin
1719 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1720
M win/Makefile.msc
-1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -74,11 +74,10 @@
7474
 /DSQLITE_OMIT_DEPRECATED \
7575
 /DSQLITE_ENABLE_EXPLAIN_COMMENTS
7676
7777
 SHELL_OPTIONS = /Dmain=sqlite3_shell \
7878
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
79
- /Dsqlite3_strglob=strglob \
8079
 /Dgetenv=fossil_getenv \
8180
 /Dfopen=fossil_fopen
8281
8382
 SRC = add_.c \
8483
 allrepo_.c \
8584
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -74,11 +74,10 @@
74 /DSQLITE_OMIT_DEPRECATED \
75 /DSQLITE_ENABLE_EXPLAIN_COMMENTS
76
77 SHELL_OPTIONS = /Dmain=sqlite3_shell \
78 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
79 /Dsqlite3_strglob=strglob \
80 /Dgetenv=fossil_getenv \
81 /Dfopen=fossil_fopen
82
83 SRC = add_.c \
84 allrepo_.c \
85
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -74,11 +74,10 @@
74 /DSQLITE_OMIT_DEPRECATED \
75 /DSQLITE_ENABLE_EXPLAIN_COMMENTS
76
77 SHELL_OPTIONS = /Dmain=sqlite3_shell \
78 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
 
79 /Dgetenv=fossil_getenv \
80 /Dfopen=fossil_fopen
81
82 SRC = add_.c \
83 allrepo_.c \
84
M www/build.wiki
+22 -2
--- www/build.wiki
+++ www/build.wiki
@@ -17,12 +17,12 @@
1717
 <p>Building and installing is very simple. Three steps:</p>
1818
1919
 <ol>
2020
 <li> Download and unpack a source tarball or ZIP.
2121
 <li> <b>./configure; make</b>
22
-<li> Move or copy the resulting "fossil" executable to someplace
23
- on your $PATH.
22
+<li> Move the resulting "fossil" or "fossil.exe" executable to someplace on
23
+your $PATH.
2424
 </ol>
2525
2626
 <p><hr>
2727
2828
 <h2>1.0 Obtaining The Source Code</h2>
@@ -50,10 +50,30 @@
5050
 <li><p>Finally, click on one of the
5151
 "Zip Archive" or "Tarball" links, according to your preference.
5252
 These link will build a ZIP archive or a gzip-compressed tarball of the
5353
 complete source code and download it to your browser.
5454
 </ol>
55
+
56
+<h2>Aside: Is it really safe to use an unreleased development version of
57
+the Fossil source code?</h2>
58
+
59
+Yes! Any check-in on the
60
+[/timeline?t=trunk | trunk branch] of the Fossil
61
+[http://www.sqlite.org/src/timeline | Fossil self-hosting repository]
62
+will work fine. (Dodgy code is always on a branch.) In the unlikely
63
+event that you pick a version with a serious bug, it still won't
64
+clobber your files. Fossil uses several
65
+[./selfcheck.wiki | self-checks] prior to committing any
66
+repository change that prevent loss-of-work due to bugs.
67
+
68
+The Fossil [./selfhost.wiki | self-hosting repositories], especially
69
+the one at [http://www.fossil-scm.org/fossil], usually run a version
70
+of trunk that is less than a week or two old. Look at the bottom
71
+right-hand corner of this screen (to the right of "This page was
72
+generated in...") to see exactly which version of Fossil is
73
+rendering this page. It is always safe to use whatever version
74
+of the Fossil code you find running on the main Fossil website.
5575
5676
 <h2>2.0 Compiling</h2>
5777
5878
 <ol>
5979
 <li value="5">
6080
--- www/build.wiki
+++ www/build.wiki
@@ -17,12 +17,12 @@
17 <p>Building and installing is very simple. Three steps:</p>
18
19 <ol>
20 <li> Download and unpack a source tarball or ZIP.
21 <li> <b>./configure; make</b>
22 <li> Move or copy the resulting "fossil" executable to someplace
23 on your $PATH.
24 </ol>
25
26 <p><hr>
27
28 <h2>1.0 Obtaining The Source Code</h2>
@@ -50,10 +50,30 @@
50 <li><p>Finally, click on one of the
51 "Zip Archive" or "Tarball" links, according to your preference.
52 These link will build a ZIP archive or a gzip-compressed tarball of the
53 complete source code and download it to your browser.
54 </ol>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
56 <h2>2.0 Compiling</h2>
57
58 <ol>
59 <li value="5">
60
--- www/build.wiki
+++ www/build.wiki
@@ -17,12 +17,12 @@
17 <p>Building and installing is very simple. Three steps:</p>
18
19 <ol>
20 <li> Download and unpack a source tarball or ZIP.
21 <li> <b>./configure; make</b>
22 <li> Move the resulting "fossil" or "fossil.exe" executable to someplace on
23 your $PATH.
24 </ol>
25
26 <p><hr>
27
28 <h2>1.0 Obtaining The Source Code</h2>
@@ -50,10 +50,30 @@
50 <li><p>Finally, click on one of the
51 "Zip Archive" or "Tarball" links, according to your preference.
52 These link will build a ZIP archive or a gzip-compressed tarball of the
53 complete source code and download it to your browser.
54 </ol>
55
56 <h2>Aside: Is it really safe to use an unreleased development version of
57 the Fossil source code?</h2>
58
59 Yes! Any check-in on the
60 [/timeline?t=trunk | trunk branch] of the Fossil
61 [http://www.sqlite.org/src/timeline | Fossil self-hosting repository]
62 will work fine. (Dodgy code is always on a branch.) In the unlikely
63 event that you pick a version with a serious bug, it still won't
64 clobber your files. Fossil uses several
65 [./selfcheck.wiki | self-checks] prior to committing any
66 repository change that prevent loss-of-work due to bugs.
67
68 The Fossil [./selfhost.wiki | self-hosting repositories], especially
69 the one at [http://www.fossil-scm.org/fossil], usually run a version
70 of trunk that is less than a week or two old. Look at the bottom
71 right-hand corner of this screen (to the right of "This page was
72 generated in...") to see exactly which version of Fossil is
73 rendering this page. It is always safe to use whatever version
74 of the Fossil code you find running on the main Fossil website.
75
76 <h2>2.0 Compiling</h2>
77
78 <ol>
79 <li value="5">
80

Keyboard Shortcuts

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