Fossil SCM

Merge updates from trunk.

mistachkin 2013-12-18 00:17 win32-longpath merge
Commit ef9f707be189f8801b0fc45c9940c1504183ebc8
Parent 83087c8df3a2600…
9 files changed +2 -1 +6 -1 +6 -1 +1 -1 +1 -1 +1 +1 +7 -2 -1
~ 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/makefile.wiki
M src/main.mk
+2 -1
--- src/main.mk
+++ src/main.mk
@@ -381,11 +381,12 @@
381381
 SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
382382
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
383383
 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
384384
 -DSQLITE_THREADSAFE=0 \
385385
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
386
- -DSQLITE_OMIT_DEPRECATED
386
+ -DSQLITE_OMIT_DEPRECATED \
387
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS
387388
388389
 # Setup the options used to compile the included SQLite shell.
389390
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
390391
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
391392
 -Dsqlite3_strglob=strglob
392393
--- src/main.mk
+++ src/main.mk
@@ -381,11 +381,12 @@
381 SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
382 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
383 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
384 -DSQLITE_THREADSAFE=0 \
385 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
386 -DSQLITE_OMIT_DEPRECATED
 
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
--- src/main.mk
+++ src/main.mk
@@ -381,11 +381,12 @@
381 SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
382 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
383 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
384 -DSQLITE_THREADSAFE=0 \
385 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
386 -DSQLITE_OMIT_DEPRECATED \
387 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
388
389 # Setup the options used to compile the included SQLite shell.
390 SHELL_OPTIONS = -Dmain=sqlite3_shell \
391 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
392 -Dsqlite3_strglob=strglob
393
M src/makemake.tcl
+6 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -135,10 +135,11 @@
135135
 -DSQLITE_OMIT_LOAD_EXTENSION=1
136136
 -DSQLITE_ENABLE_LOCKING_STYLE=0
137137
 -DSQLITE_THREADSAFE=0
138138
 -DSQLITE_DEFAULT_FILE_FORMAT=4
139139
 -DSQLITE_OMIT_DEPRECATED
140
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS
140141
 }
141142
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_EXPLAIN_COMMENTS
142143
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143144
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144145
 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
@@ -1007,10 +1008,11 @@
10071008
 SRCDIR = $B\src
10081009
 OBJDIR = .
10091010
 OX = .
10101011
 O = .obj
10111012
 E = .exe
1013
+P = .pdb
10121014
10131015
 # Uncomment to enable debug symbols
10141016
 # DEBUG = 1
10151017
10161018
 # Uncomment to enable JSON API
@@ -1092,10 +1094,11 @@
10921094
 }
10931095
 writeln " \\"
10941096
 writeln -nonewline " \$(OX)\\fossil.res\n"
10951097
 writeln {
10961098
 APPNAME = $(OX)\fossil$(E)
1099
+PDBNAME = $(OX)\fossil$(P)
10971100
10981101
 all: $(OX) $(APPNAME)
10991102
11001103
 zlib:
11011104
 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1157,18 @@
11541157
 -del $(OX)\*.obj
11551158
 -del *.obj
11561159
 -del *_.c
11571160
 -del *.h
11581161
 -del *.map
1162
+ -del *.res
11591163
 -del headers
11601164
 -del linkopts
1161
- -del *.res
1165
+ -del vc*.pdb
11621166
11631167
 realclean: clean
11641168
 -del $(APPNAME)
1169
+ -del $(PDBNAME)
11651170
 -del translate$E
11661171
 -del mkindex$E
11671172
 -del makeheaders$E
11681173
 -del mkversion$E
11691174
11701175
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -135,10 +135,11 @@
135 -DSQLITE_OMIT_LOAD_EXTENSION=1
136 -DSQLITE_ENABLE_LOCKING_STYLE=0
137 -DSQLITE_THREADSAFE=0
138 -DSQLITE_DEFAULT_FILE_FORMAT=4
139 -DSQLITE_OMIT_DEPRECATED
 
140 }
141 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_EXPLAIN_COMMENTS
142 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
@@ -1007,10 +1008,11 @@
1007 SRCDIR = $B\src
1008 OBJDIR = .
1009 OX = .
1010 O = .obj
1011 E = .exe
 
1012
1013 # Uncomment to enable debug symbols
1014 # DEBUG = 1
1015
1016 # Uncomment to enable JSON API
@@ -1092,10 +1094,11 @@
1092 }
1093 writeln " \\"
1094 writeln -nonewline " \$(OX)\\fossil.res\n"
1095 writeln {
1096 APPNAME = $(OX)\fossil$(E)
 
1097
1098 all: $(OX) $(APPNAME)
1099
1100 zlib:
1101 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1157,18 @@
1154 -del $(OX)\*.obj
1155 -del *.obj
1156 -del *_.c
1157 -del *.h
1158 -del *.map
 
1159 -del headers
1160 -del linkopts
1161 -del *.res
1162
1163 realclean: clean
1164 -del $(APPNAME)
 
1165 -del translate$E
1166 -del mkindex$E
1167 -del makeheaders$E
1168 -del mkversion$E
1169
1170
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -135,10 +135,11 @@
135 -DSQLITE_OMIT_LOAD_EXTENSION=1
136 -DSQLITE_ENABLE_LOCKING_STYLE=0
137 -DSQLITE_THREADSAFE=0
138 -DSQLITE_DEFAULT_FILE_FORMAT=4
139 -DSQLITE_OMIT_DEPRECATED
140 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
141 }
142 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_EXPLAIN_COMMENTS
143 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
144 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
145 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
@@ -1007,10 +1008,11 @@
1008 SRCDIR = $B\src
1009 OBJDIR = .
1010 OX = .
1011 O = .obj
1012 E = .exe
1013 P = .pdb
1014
1015 # Uncomment to enable debug symbols
1016 # DEBUG = 1
1017
1018 # Uncomment to enable JSON API
@@ -1092,10 +1094,11 @@
1094 }
1095 writeln " \\"
1096 writeln -nonewline " \$(OX)\\fossil.res\n"
1097 writeln {
1098 APPNAME = $(OX)\fossil$(E)
1099 PDBNAME = $(OX)\fossil$(P)
1100
1101 all: $(OX) $(APPNAME)
1102
1103 zlib:
1104 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1157,18 @@
1157 -del $(OX)\*.obj
1158 -del *.obj
1159 -del *_.c
1160 -del *.h
1161 -del *.map
1162 -del *.res
1163 -del headers
1164 -del linkopts
1165 -del vc*.pdb
1166
1167 realclean: clean
1168 -del $(APPNAME)
1169 -del $(PDBNAME)
1170 -del translate$E
1171 -del mkindex$E
1172 -del makeheaders$E
1173 -del mkversion$E
1174
1175
M src/makemake.tcl
+6 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -135,10 +135,11 @@
135135
 -DSQLITE_OMIT_LOAD_EXTENSION=1
136136
 -DSQLITE_ENABLE_LOCKING_STYLE=0
137137
 -DSQLITE_THREADSAFE=0
138138
 -DSQLITE_DEFAULT_FILE_FORMAT=4
139139
 -DSQLITE_OMIT_DEPRECATED
140
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS
140141
 }
141142
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_EXPLAIN_COMMENTS
142143
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143144
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144145
 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
@@ -1007,10 +1008,11 @@
10071008
 SRCDIR = $B\src
10081009
 OBJDIR = .
10091010
 OX = .
10101011
 O = .obj
10111012
 E = .exe
1013
+P = .pdb
10121014
10131015
 # Uncomment to enable debug symbols
10141016
 # DEBUG = 1
10151017
10161018
 # Uncomment to enable JSON API
@@ -1092,10 +1094,11 @@
10921094
 }
10931095
 writeln " \\"
10941096
 writeln -nonewline " \$(OX)\\fossil.res\n"
10951097
 writeln {
10961098
 APPNAME = $(OX)\fossil$(E)
1099
+PDBNAME = $(OX)\fossil$(P)
10971100
10981101
 all: $(OX) $(APPNAME)
10991102
11001103
 zlib:
11011104
 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1157,18 @@
11541157
 -del $(OX)\*.obj
11551158
 -del *.obj
11561159
 -del *_.c
11571160
 -del *.h
11581161
 -del *.map
1162
+ -del *.res
11591163
 -del headers
11601164
 -del linkopts
1161
- -del *.res
1165
+ -del vc*.pdb
11621166
11631167
 realclean: clean
11641168
 -del $(APPNAME)
1169
+ -del $(PDBNAME)
11651170
 -del translate$E
11661171
 -del mkindex$E
11671172
 -del makeheaders$E
11681173
 -del mkversion$E
11691174
11701175
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -135,10 +135,11 @@
135 -DSQLITE_OMIT_LOAD_EXTENSION=1
136 -DSQLITE_ENABLE_LOCKING_STYLE=0
137 -DSQLITE_THREADSAFE=0
138 -DSQLITE_DEFAULT_FILE_FORMAT=4
139 -DSQLITE_OMIT_DEPRECATED
 
140 }
141 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_EXPLAIN_COMMENTS
142 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
@@ -1007,10 +1008,11 @@
1007 SRCDIR = $B\src
1008 OBJDIR = .
1009 OX = .
1010 O = .obj
1011 E = .exe
 
1012
1013 # Uncomment to enable debug symbols
1014 # DEBUG = 1
1015
1016 # Uncomment to enable JSON API
@@ -1092,10 +1094,11 @@
1092 }
1093 writeln " \\"
1094 writeln -nonewline " \$(OX)\\fossil.res\n"
1095 writeln {
1096 APPNAME = $(OX)\fossil$(E)
 
1097
1098 all: $(OX) $(APPNAME)
1099
1100 zlib:
1101 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1157,18 @@
1154 -del $(OX)\*.obj
1155 -del *.obj
1156 -del *_.c
1157 -del *.h
1158 -del *.map
 
1159 -del headers
1160 -del linkopts
1161 -del *.res
1162
1163 realclean: clean
1164 -del $(APPNAME)
 
1165 -del translate$E
1166 -del mkindex$E
1167 -del makeheaders$E
1168 -del mkversion$E
1169
1170
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -135,10 +135,11 @@
135 -DSQLITE_OMIT_LOAD_EXTENSION=1
136 -DSQLITE_ENABLE_LOCKING_STYLE=0
137 -DSQLITE_THREADSAFE=0
138 -DSQLITE_DEFAULT_FILE_FORMAT=4
139 -DSQLITE_OMIT_DEPRECATED
140 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
141 }
142 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_EXPLAIN_COMMENTS
143 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
144 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
145 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
@@ -1007,10 +1008,11 @@
1008 SRCDIR = $B\src
1009 OBJDIR = .
1010 OX = .
1011 O = .obj
1012 E = .exe
1013 P = .pdb
1014
1015 # Uncomment to enable debug symbols
1016 # DEBUG = 1
1017
1018 # Uncomment to enable JSON API
@@ -1092,10 +1094,11 @@
1094 }
1095 writeln " \\"
1096 writeln -nonewline " \$(OX)\\fossil.res\n"
1097 writeln {
1098 APPNAME = $(OX)\fossil$(E)
1099 PDBNAME = $(OX)\fossil$(P)
1100
1101 all: $(OX) $(APPNAME)
1102
1103 zlib:
1104 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1154,16 +1157,18 @@
1157 -del $(OX)\*.obj
1158 -del *.obj
1159 -del *_.c
1160 -del *.h
1161 -del *.map
1162 -del *.res
1163 -del headers
1164 -del linkopts
1165 -del vc*.pdb
1166
1167 realclean: clean
1168 -del $(APPNAME)
1169 -del $(PDBNAME)
1170 -del translate$E
1171 -del mkindex$E
1172 -del makeheaders$E
1173 -del mkversion$E
1174
1175
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
8383
8484
 # define the sqlite files, which need special flags on compile
8585
 SQLITESRC=sqlite3.c
8686
 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
8787
 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88
-SQLITEDEFINES=-Dlocaltime=fossil_localtime -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED
88
+SQLITEDEFINES=-Dlocaltime=fossil_localtime -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
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))
9494
--- 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=-Dlocaltime=fossil_localtime -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED
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=-Dlocaltime=fossil_localtime -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
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
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,11 +24,11 @@
2424
 CFLAGS = -o
2525
 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
2626
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
2727
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
2828
29
-SQLITE_OPTIONS = -Dlocaltime=fossil_localtime -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED
29
+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime -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
3131
 SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -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
--- 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 = -Dlocaltime=fossil_localtime -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED
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
--- 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 = -Dlocaltime=fossil_localtime -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
M win/Makefile.mingw
+1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1704,10 +1704,11 @@
17041704
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
17051705
 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17061706
 -DSQLITE_THREADSAFE=0 \
17071707
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
17081708
 -DSQLITE_OMIT_DEPRECATED \
1709
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
17091710
 -D_HAVE_SQLITE_CONFIG_H \
17101711
 -DSQLITE_USE_MALLOC_H \
17111712
 -DSQLITE_USE_MSIZE
17121713
17131714
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17141715
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1704,10 +1704,11 @@
1704 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1706 -DSQLITE_THREADSAFE=0 \
1707 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1708 -DSQLITE_OMIT_DEPRECATED \
 
1709 -D_HAVE_SQLITE_CONFIG_H \
1710 -DSQLITE_USE_MALLOC_H \
1711 -DSQLITE_USE_MSIZE
1712
1713 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1704,10 +1704,11 @@
1704 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1706 -DSQLITE_THREADSAFE=0 \
1707 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1708 -DSQLITE_OMIT_DEPRECATED \
1709 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1710 -D_HAVE_SQLITE_CONFIG_H \
1711 -DSQLITE_USE_MALLOC_H \
1712 -DSQLITE_USE_MSIZE
1713
1714 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715
M win/Makefile.mingw.mistachkin
+1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1704,10 +1704,11 @@
17041704
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
17051705
 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17061706
 -DSQLITE_THREADSAFE=0 \
17071707
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
17081708
 -DSQLITE_OMIT_DEPRECATED \
1709
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
17091710
 -D_HAVE_SQLITE_CONFIG_H \
17101711
 -DSQLITE_USE_MALLOC_H \
17111712
 -DSQLITE_USE_MSIZE
17121713
17131714
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17141715
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1704,10 +1704,11 @@
1704 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1706 -DSQLITE_THREADSAFE=0 \
1707 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1708 -DSQLITE_OMIT_DEPRECATED \
 
1709 -D_HAVE_SQLITE_CONFIG_H \
1710 -DSQLITE_USE_MALLOC_H \
1711 -DSQLITE_USE_MSIZE
1712
1713 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1704,10 +1704,11 @@
1704 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1706 -DSQLITE_THREADSAFE=0 \
1707 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1708 -DSQLITE_OMIT_DEPRECATED \
1709 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1710 -D_HAVE_SQLITE_CONFIG_H \
1711 -DSQLITE_USE_MALLOC_H \
1712 -DSQLITE_USE_MSIZE
1713
1714 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715
M win/Makefile.msc
+7 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,11 @@
1111
 SRCDIR = $B\src
1212
 OBJDIR = .
1313
 OX = .
1414
 O = .obj
1515
 E = .exe
16
+P = .pdb
1617
1718
 # Uncomment to enable debug symbols
1819
 # DEBUG = 1
1920
2021
 # Uncomment to enable JSON API
@@ -69,11 +70,12 @@
6970
 SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
7071
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
7172
 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
7273
 /DSQLITE_THREADSAFE=0 \
7374
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
74
- /DSQLITE_OMIT_DEPRECATED
75
+ /DSQLITE_OMIT_DEPRECATED \
76
+ /DSQLITE_ENABLE_EXPLAIN_COMMENTS
7577
7678
 SHELL_OPTIONS = /Dmain=sqlite3_shell \
7779
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
7880
 /Dsqlite3_strglob=strglob \
7981
 /Dgetenv=fossil_getenv \
@@ -302,10 +304,11 @@
302304
 $(OX)\xfersetup$O \
303305
 $(OX)\zip$O \
304306
 $(OX)\fossil.res
305307
306308
 APPNAME = $(OX)\fossil$(E)
309
+PDBNAME = $(OX)\fossil$(P)
307310
308311
 all: $(OX) $(APPNAME)
309312
310313
 zlib:
311314
 @echo Building zlib from "$(ZLIBDIR)"...
@@ -473,16 +476,18 @@
473476
 -del $(OX)\*.obj
474477
 -del *.obj
475478
 -del *_.c
476479
 -del *.h
477480
 -del *.map
481
+ -del *.res
478482
 -del headers
479483
 -del linkopts
480
- -del *.res
484
+ -del vc*.pdb
481485
482486
 realclean: clean
483487
 -del $(APPNAME)
488
+ -del $(PDBNAME)
484489
 -del translate$E
485490
 -del mkindex$E
486491
 -del makeheaders$E
487492
 -del mkversion$E
488493
489494
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,11 @@
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
 
16
17 # Uncomment to enable debug symbols
18 # DEBUG = 1
19
20 # Uncomment to enable JSON API
@@ -69,11 +70,12 @@
69 SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
70 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
71 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
72 /DSQLITE_THREADSAFE=0 \
73 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
74 /DSQLITE_OMIT_DEPRECATED
 
75
76 SHELL_OPTIONS = /Dmain=sqlite3_shell \
77 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
78 /Dsqlite3_strglob=strglob \
79 /Dgetenv=fossil_getenv \
@@ -302,10 +304,11 @@
302 $(OX)\xfersetup$O \
303 $(OX)\zip$O \
304 $(OX)\fossil.res
305
306 APPNAME = $(OX)\fossil$(E)
 
307
308 all: $(OX) $(APPNAME)
309
310 zlib:
311 @echo Building zlib from "$(ZLIBDIR)"...
@@ -473,16 +476,18 @@
473 -del $(OX)\*.obj
474 -del *.obj
475 -del *_.c
476 -del *.h
477 -del *.map
 
478 -del headers
479 -del linkopts
480 -del *.res
481
482 realclean: clean
483 -del $(APPNAME)
 
484 -del translate$E
485 -del mkindex$E
486 -del makeheaders$E
487 -del mkversion$E
488
489
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -11,10 +11,11 @@
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16 P = .pdb
17
18 # Uncomment to enable debug symbols
19 # DEBUG = 1
20
21 # Uncomment to enable JSON API
@@ -69,11 +70,12 @@
70 SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
71 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
72 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
73 /DSQLITE_THREADSAFE=0 \
74 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
75 /DSQLITE_OMIT_DEPRECATED \
76 /DSQLITE_ENABLE_EXPLAIN_COMMENTS
77
78 SHELL_OPTIONS = /Dmain=sqlite3_shell \
79 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
80 /Dsqlite3_strglob=strglob \
81 /Dgetenv=fossil_getenv \
@@ -302,10 +304,11 @@
304 $(OX)\xfersetup$O \
305 $(OX)\zip$O \
306 $(OX)\fossil.res
307
308 APPNAME = $(OX)\fossil$(E)
309 PDBNAME = $(OX)\fossil$(P)
310
311 all: $(OX) $(APPNAME)
312
313 zlib:
314 @echo Building zlib from "$(ZLIBDIR)"...
@@ -473,16 +476,18 @@
476 -del $(OX)\*.obj
477 -del *.obj
478 -del *_.c
479 -del *.h
480 -del *.map
481 -del *.res
482 -del headers
483 -del linkopts
484 -del vc*.pdb
485
486 realclean: clean
487 -del $(APPNAME)
488 -del $(PDBNAME)
489 -del translate$E
490 -del mkindex$E
491 -del makeheaders$E
492 -del mkversion$E
493
494
M www/makefile.wiki
-1
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -208,11 +208,10 @@
208208
 * -Dlocaltime=fossil_localtime
209209
 * -DSQLITE_OMIT_LOAD_EXTENSION=1
210210
 * -DSQLITE_ENABLE_LOCKING_STYLE=0
211211
 * -DSQLITE_THREADSAFE=0
212212
 * -DSQLITE_DEFAULT_FILE_FORMAT=4
213
- * -DSQLITE_OMIT_DEPRECATED
214213
215214
 The first and second symbol definitions above are required; the others
216215
 are merely recommended. The "localtime()" library function in SQLite must
217216
 be redefined to invoke fossil_localtime() instead. The fossil_localtime()
218217
 routine will invoke either gmtime() or localtime() depending on the
219218
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -208,11 +208,10 @@
208 * -Dlocaltime=fossil_localtime
209 * -DSQLITE_OMIT_LOAD_EXTENSION=1
210 * -DSQLITE_ENABLE_LOCKING_STYLE=0
211 * -DSQLITE_THREADSAFE=0
212 * -DSQLITE_DEFAULT_FILE_FORMAT=4
213 * -DSQLITE_OMIT_DEPRECATED
214
215 The first and second symbol definitions above are required; the others
216 are merely recommended. The "localtime()" library function in SQLite must
217 be redefined to invoke fossil_localtime() instead. The fossil_localtime()
218 routine will invoke either gmtime() or localtime() depending on the
219
--- www/makefile.wiki
+++ www/makefile.wiki
@@ -208,11 +208,10 @@
208 * -Dlocaltime=fossil_localtime
209 * -DSQLITE_OMIT_LOAD_EXTENSION=1
210 * -DSQLITE_ENABLE_LOCKING_STYLE=0
211 * -DSQLITE_THREADSAFE=0
212 * -DSQLITE_DEFAULT_FILE_FORMAT=4
 
213
214 The first and second symbol definitions above are required; the others
215 are merely recommended. The "localtime()" library function in SQLite must
216 be redefined to invoke fossil_localtime() instead. The fossil_localtime()
217 routine will invoke either gmtime() or localtime() depending on the
218

Keyboard Shortcuts

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