Fossil SCM

Add logic for generating SVG pie-charts based on SQL query results.

drh 2015-05-06 23:29 UTC trunk
Commit 6ebd853cb4dac46dd79dffd99038deb79cabefbb
Parent 8e44cf6f4df4f9f…
8 files changed +1 +14 -1 +2 +1 +1 -1 +11 -5 +13 +11
~ auto.def ~ src/main.mk ~ src/makemake.tcl + src/piechart.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
M auto.def
+1
--- auto.def
+++ auto.def
@@ -299,10 +299,11 @@
299299
 if {![cc-check-functions getpassphrase]} {
300300
 # Haiku needs this
301301
 cc-check-function-in-lib getpass bsd
302302
 }
303303
 cc-check-function-in-lib dlopen dl
304
+cc-check-function-in-lib sin m
304305
305306
 # Check for the FuseFS library
306307
 if {[opt-bool fusefs]} {
307308
 if {[cc-check-function-in-lib fuse_mount fuse]} {
308309
 define FOSSIL_HAVE_FUSEFS 1
309310
--- auto.def
+++ auto.def
@@ -299,10 +299,11 @@
299 if {![cc-check-functions getpassphrase]} {
300 # Haiku needs this
301 cc-check-function-in-lib getpass bsd
302 }
303 cc-check-function-in-lib dlopen dl
 
304
305 # Check for the FuseFS library
306 if {[opt-bool fusefs]} {
307 if {[cc-check-function-in-lib fuse_mount fuse]} {
308 define FOSSIL_HAVE_FUSEFS 1
309
--- auto.def
+++ auto.def
@@ -299,10 +299,11 @@
299 if {![cc-check-functions getpassphrase]} {
300 # Haiku needs this
301 cc-check-function-in-lib getpass bsd
302 }
303 cc-check-function-in-lib dlopen dl
304 cc-check-function-in-lib sin m
305
306 # Check for the FuseFS library
307 if {[opt-bool fusefs]} {
308 if {[cc-check-function-in-lib fuse_mount fuse]} {
309 define FOSSIL_HAVE_FUSEFS 1
310
M src/main.mk
+14 -1
--- src/main.mk
+++ src/main.mk
@@ -84,10 +84,11 @@
8484
 $(SRCDIR)/merge.c \
8585
 $(SRCDIR)/merge3.c \
8686
 $(SRCDIR)/moderate.c \
8787
 $(SRCDIR)/name.c \
8888
 $(SRCDIR)/path.c \
89
+ $(SRCDIR)/piechart.c \
8990
 $(SRCDIR)/pivot.c \
9091
 $(SRCDIR)/popen.c \
9192
 $(SRCDIR)/pqueue.c \
9293
 $(SRCDIR)/printf.c \
9394
 $(SRCDIR)/publish.c \
@@ -255,10 +256,11 @@
255256
 $(OBJDIR)/merge_.c \
256257
 $(OBJDIR)/merge3_.c \
257258
 $(OBJDIR)/moderate_.c \
258259
 $(OBJDIR)/name_.c \
259260
 $(OBJDIR)/path_.c \
261
+ $(OBJDIR)/piechart_.c \
260262
 $(OBJDIR)/pivot_.c \
261263
 $(OBJDIR)/popen_.c \
262264
 $(OBJDIR)/pqueue_.c \
263265
 $(OBJDIR)/printf_.c \
264266
 $(OBJDIR)/publish_.c \
@@ -375,10 +377,11 @@
375377
 $(OBJDIR)/merge.o \
376378
 $(OBJDIR)/merge3.o \
377379
 $(OBJDIR)/moderate.o \
378380
 $(OBJDIR)/name.o \
379381
 $(OBJDIR)/path.o \
382
+ $(OBJDIR)/piechart.o \
380383
 $(OBJDIR)/pivot.o \
381384
 $(OBJDIR)/popen.o \
382385
 $(OBJDIR)/pqueue.o \
383386
 $(OBJDIR)/printf.o \
384387
 $(OBJDIR)/publish.o \
@@ -474,11 +477,12 @@
474477
 -DSQLITE_THREADSAFE=0 \
475478
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
476479
 -DSQLITE_OMIT_DEPRECATED \
477480
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
478481
 -DSQLITE_ENABLE_FTS4 \
479
- -DSQLITE_ENABLE_FTS3_PARENTHESIS
482
+ -DSQLITE_ENABLE_FTS3_PARENTHESIS \
483
+ -DSQLITE_ENABLE_DBSTAT_VTAB
480484
481485
 # Setup the options used to compile the included SQLite shell.
482486
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
483487
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
484488
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
@@ -606,10 +610,11 @@
606610
 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
607611
 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
608612
 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
609613
 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
610614
 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
615
+ $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
611616
 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
612617
 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
613618
 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
614619
 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
615620
 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
@@ -1234,10 +1239,18 @@
12341239
12351240
 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
12361241
 $(XTCC) -o $(OBJDIR)/path.o -c $(OBJDIR)/path_.c
12371242
12381243
 $(OBJDIR)/path.h: $(OBJDIR)/headers
1244
+
1245
+$(OBJDIR)/piechart_.c: $(SRCDIR)/piechart.c $(OBJDIR)/translate
1246
+ $(OBJDIR)/translate $(SRCDIR)/piechart.c >$@
1247
+
1248
+$(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
1249
+ $(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
1250
+
1251
+$(OBJDIR)/piechart.h: $(OBJDIR)/headers
12391252
12401253
 $(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(OBJDIR)/translate
12411254
 $(OBJDIR)/translate $(SRCDIR)/pivot.c >$@
12421255
12431256
 $(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
12441257
--- src/main.mk
+++ src/main.mk
@@ -84,10 +84,11 @@
84 $(SRCDIR)/merge.c \
85 $(SRCDIR)/merge3.c \
86 $(SRCDIR)/moderate.c \
87 $(SRCDIR)/name.c \
88 $(SRCDIR)/path.c \
 
89 $(SRCDIR)/pivot.c \
90 $(SRCDIR)/popen.c \
91 $(SRCDIR)/pqueue.c \
92 $(SRCDIR)/printf.c \
93 $(SRCDIR)/publish.c \
@@ -255,10 +256,11 @@
255 $(OBJDIR)/merge_.c \
256 $(OBJDIR)/merge3_.c \
257 $(OBJDIR)/moderate_.c \
258 $(OBJDIR)/name_.c \
259 $(OBJDIR)/path_.c \
 
260 $(OBJDIR)/pivot_.c \
261 $(OBJDIR)/popen_.c \
262 $(OBJDIR)/pqueue_.c \
263 $(OBJDIR)/printf_.c \
264 $(OBJDIR)/publish_.c \
@@ -375,10 +377,11 @@
375 $(OBJDIR)/merge.o \
376 $(OBJDIR)/merge3.o \
377 $(OBJDIR)/moderate.o \
378 $(OBJDIR)/name.o \
379 $(OBJDIR)/path.o \
 
380 $(OBJDIR)/pivot.o \
381 $(OBJDIR)/popen.o \
382 $(OBJDIR)/pqueue.o \
383 $(OBJDIR)/printf.o \
384 $(OBJDIR)/publish.o \
@@ -474,11 +477,12 @@
474 -DSQLITE_THREADSAFE=0 \
475 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
476 -DSQLITE_OMIT_DEPRECATED \
477 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
478 -DSQLITE_ENABLE_FTS4 \
479 -DSQLITE_ENABLE_FTS3_PARENTHESIS
 
480
481 # Setup the options used to compile the included SQLite shell.
482 SHELL_OPTIONS = -Dmain=sqlite3_shell \
483 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
484 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
@@ -606,10 +610,11 @@
606 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
607 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
608 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
609 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
610 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
 
611 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
612 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
613 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
614 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
615 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
@@ -1234,10 +1239,18 @@
1234
1235 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
1236 $(XTCC) -o $(OBJDIR)/path.o -c $(OBJDIR)/path_.c
1237
1238 $(OBJDIR)/path.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
1239
1240 $(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(OBJDIR)/translate
1241 $(OBJDIR)/translate $(SRCDIR)/pivot.c >$@
1242
1243 $(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
1244
--- src/main.mk
+++ src/main.mk
@@ -84,10 +84,11 @@
84 $(SRCDIR)/merge.c \
85 $(SRCDIR)/merge3.c \
86 $(SRCDIR)/moderate.c \
87 $(SRCDIR)/name.c \
88 $(SRCDIR)/path.c \
89 $(SRCDIR)/piechart.c \
90 $(SRCDIR)/pivot.c \
91 $(SRCDIR)/popen.c \
92 $(SRCDIR)/pqueue.c \
93 $(SRCDIR)/printf.c \
94 $(SRCDIR)/publish.c \
@@ -255,10 +256,11 @@
256 $(OBJDIR)/merge_.c \
257 $(OBJDIR)/merge3_.c \
258 $(OBJDIR)/moderate_.c \
259 $(OBJDIR)/name_.c \
260 $(OBJDIR)/path_.c \
261 $(OBJDIR)/piechart_.c \
262 $(OBJDIR)/pivot_.c \
263 $(OBJDIR)/popen_.c \
264 $(OBJDIR)/pqueue_.c \
265 $(OBJDIR)/printf_.c \
266 $(OBJDIR)/publish_.c \
@@ -375,10 +377,11 @@
377 $(OBJDIR)/merge.o \
378 $(OBJDIR)/merge3.o \
379 $(OBJDIR)/moderate.o \
380 $(OBJDIR)/name.o \
381 $(OBJDIR)/path.o \
382 $(OBJDIR)/piechart.o \
383 $(OBJDIR)/pivot.o \
384 $(OBJDIR)/popen.o \
385 $(OBJDIR)/pqueue.o \
386 $(OBJDIR)/printf.o \
387 $(OBJDIR)/publish.o \
@@ -474,11 +477,12 @@
477 -DSQLITE_THREADSAFE=0 \
478 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
479 -DSQLITE_OMIT_DEPRECATED \
480 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
481 -DSQLITE_ENABLE_FTS4 \
482 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
483 -DSQLITE_ENABLE_DBSTAT_VTAB
484
485 # Setup the options used to compile the included SQLite shell.
486 SHELL_OPTIONS = -Dmain=sqlite3_shell \
487 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
488 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
@@ -606,10 +610,11 @@
610 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
611 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
612 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
613 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
614 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
615 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
616 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
617 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
618 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
619 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
620 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
@@ -1234,10 +1239,18 @@
1239
1240 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
1241 $(XTCC) -o $(OBJDIR)/path.o -c $(OBJDIR)/path_.c
1242
1243 $(OBJDIR)/path.h: $(OBJDIR)/headers
1244
1245 $(OBJDIR)/piechart_.c: $(SRCDIR)/piechart.c $(OBJDIR)/translate
1246 $(OBJDIR)/translate $(SRCDIR)/piechart.c >$@
1247
1248 $(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
1249 $(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
1250
1251 $(OBJDIR)/piechart.h: $(OBJDIR)/headers
1252
1253 $(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(OBJDIR)/translate
1254 $(OBJDIR)/translate $(SRCDIR)/pivot.c >$@
1255
1256 $(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
1257
M src/makemake.tcl
+2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -90,10 +90,11 @@
9090
 merge
9191
 merge3
9292
 moderate
9393
 name
9494
 path
95
+ piechart
9596
 pivot
9697
 popen
9798
 pqueue
9899
 printf
99100
 publish
@@ -159,10 +160,11 @@
159160
 -DSQLITE_DEFAULT_FILE_FORMAT=4
160161
 -DSQLITE_OMIT_DEPRECATED
161162
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
162163
 -DSQLITE_ENABLE_FTS4
163164
 -DSQLITE_ENABLE_FTS3_PARENTHESIS
165
+ -DSQLITE_ENABLE_DBSTAT_VTAB
164166
 }
165167
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
166168
 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
167169
 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
168170
 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
169171
170172
ADDED src/piechart.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -90,10 +90,11 @@
90 merge
91 merge3
92 moderate
93 name
94 path
 
95 pivot
96 popen
97 pqueue
98 printf
99 publish
@@ -159,10 +160,11 @@
159 -DSQLITE_DEFAULT_FILE_FORMAT=4
160 -DSQLITE_OMIT_DEPRECATED
161 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
162 -DSQLITE_ENABLE_FTS4
163 -DSQLITE_ENABLE_FTS3_PARENTHESIS
 
164 }
165 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
166 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
167 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
168 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
169
170 DDED src/piechart.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -90,10 +90,11 @@
90 merge
91 merge3
92 moderate
93 name
94 path
95 piechart
96 pivot
97 popen
98 pqueue
99 printf
100 publish
@@ -159,10 +160,11 @@
160 -DSQLITE_DEFAULT_FILE_FORMAT=4
161 -DSQLITE_OMIT_DEPRECATED
162 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
163 -DSQLITE_ENABLE_FTS4
164 -DSQLITE_ENABLE_FTS3_PARENTHESIS
165 -DSQLITE_ENABLE_DBSTAT_VTAB
166 }
167 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
168 #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
169 #lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
170 #lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
171
172 DDED src/piechart.c
A src/piechart.c
+1
--- a/src/piechart.c
+++ b/src/piechart.c
@@ -0,0 +1 @@
1
+/
--- a/src/piechart.c
+++ b/src/piechart.c
@@ -0,0 +1 @@
 
--- a/src/piechart.c
+++ b/src/piechart.c
@@ -0,0 +1 @@
1 /
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=-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_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -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_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_WIN32_NO_ANSI
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=-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_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -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_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -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
M win/Makefile.dmc
+11 -5
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,17 +24,17 @@
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 = -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_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS
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 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB
3030
3131
 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
3232
33
-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.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 foci_.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 publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c statrep_.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
33
+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.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 foci_.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 piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c statrep_.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
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)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$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)\foci$O $(OBJDIR)\fusefs$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)\loadctrl$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)\publish$O $(OBJDIR)\purge$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)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$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
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)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$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)\foci$O $(OBJDIR)\fusefs$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)\loadctrl$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)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$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)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$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
3838
 RC=$(DMDIR)\bin\rcc
3939
 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
4040
@@ -49,11 +49,11 @@
4949
5050
 $(OBJDIR)\fossil.res: $B\win\fossil.rc
5151
 $(RC) $(RCFLAGS) -o$@ $**
5252
5353
 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54
- +echo add allrepo attach bag bisect blob branch browse builtin bundle cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo foci fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf publish purge rebuild regexp report rss schema search setup sha1 shun sitemap skins sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
54
+ +echo add allrepo attach bag bisect blob branch browse builtin bundle cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo foci fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp report rss schema search setup sha1 shun sitemap skins sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
5555
 +echo fossil >> $@
5656
 +echo fossil >> $@
5757
 +echo $(LIBS) >> $@
5858
 +echo. >> $@
5959
 +echo fossil >> $@
@@ -554,10 +554,16 @@
554554
 $(OBJDIR)\path$O : path_.c path.h
555555
 $(TCC) -o$@ -c path_.c
556556
557557
 path_.c : $(SRCDIR)\path.c
558558
 +translate$E $** > $@
559
+
560
+$(OBJDIR)\piechart$O : piechart_.c piechart.h
561
+ $(TCC) -o$@ -c piechart_.c
562
+
563
+piechart_.c : $(SRCDIR)\piechart.c
564
+ +translate$E $** > $@
559565
560566
 $(OBJDIR)\pivot$O : pivot_.c pivot.h
561567
 $(TCC) -o$@ -c pivot_.c
562568
563569
 pivot_.c : $(SRCDIR)\pivot.c
@@ -832,7 +838,7 @@
832838
833839
 zip_.c : $(SRCDIR)\zip.c
834840
 +translate$E $** > $@
835841
836842
 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
837
- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
843
+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
838844
 @copy /Y nul: headers
839845
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,17 +24,17 @@
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 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS
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 builtin_.c bundle_.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 foci_.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 publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c statrep_.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)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$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)\foci$O $(OBJDIR)\fusefs$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)\loadctrl$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)\publish$O $(OBJDIR)\purge$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)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$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
38 RC=$(DMDIR)\bin\rcc
39 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40
@@ -49,11 +49,11 @@
49
50 $(OBJDIR)\fossil.res: $B\win\fossil.rc
51 $(RC) $(RCFLAGS) -o$@ $**
52
53 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54 +echo add allrepo attach bag bisect blob branch browse builtin bundle cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo foci fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf publish purge rebuild regexp report rss schema search setup sha1 shun sitemap skins sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
55 +echo fossil >> $@
56 +echo fossil >> $@
57 +echo $(LIBS) >> $@
58 +echo. >> $@
59 +echo fossil >> $@
@@ -554,10 +554,16 @@
554 $(OBJDIR)\path$O : path_.c path.h
555 $(TCC) -o$@ -c path_.c
556
557 path_.c : $(SRCDIR)\path.c
558 +translate$E $** > $@
 
 
 
 
 
 
559
560 $(OBJDIR)\pivot$O : pivot_.c pivot.h
561 $(TCC) -o$@ -c pivot_.c
562
563 pivot_.c : $(SRCDIR)\pivot.c
@@ -832,7 +838,7 @@
832
833 zip_.c : $(SRCDIR)\zip.c
834 +translate$E $** > $@
835
836 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
837 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
838 @copy /Y nul: headers
839
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,17 +24,17 @@
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 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB
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 builtin_.c bundle_.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 foci_.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 piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c statrep_.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)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$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)\foci$O $(OBJDIR)\fusefs$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)\loadctrl$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)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$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)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$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
38 RC=$(DMDIR)\bin\rcc
39 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40
@@ -49,11 +49,11 @@
49
50 $(OBJDIR)\fossil.res: $B\win\fossil.rc
51 $(RC) $(RCFLAGS) -o$@ $**
52
53 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54 +echo add allrepo attach bag bisect blob branch browse builtin bundle cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo foci fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp report rss schema search setup sha1 shun sitemap skins sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
55 +echo fossil >> $@
56 +echo fossil >> $@
57 +echo $(LIBS) >> $@
58 +echo. >> $@
59 +echo fossil >> $@
@@ -554,10 +554,16 @@
554 $(OBJDIR)\path$O : path_.c path.h
555 $(TCC) -o$@ -c path_.c
556
557 path_.c : $(SRCDIR)\path.c
558 +translate$E $** > $@
559
560 $(OBJDIR)\piechart$O : piechart_.c piechart.h
561 $(TCC) -o$@ -c piechart_.c
562
563 piechart_.c : $(SRCDIR)\piechart.c
564 +translate$E $** > $@
565
566 $(OBJDIR)\pivot$O : pivot_.c pivot.h
567 $(TCC) -o$@ -c pivot_.c
568
569 pivot_.c : $(SRCDIR)\pivot.c
@@ -832,7 +838,7 @@
838
839 zip_.c : $(SRCDIR)\zip.c
840 +translate$E $** > $@
841
842 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
843 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
844 @copy /Y nul: headers
845
M win/Makefile.mingw
+13
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -447,10 +447,11 @@
447447
 $(SRCDIR)/merge.c \
448448
 $(SRCDIR)/merge3.c \
449449
 $(SRCDIR)/moderate.c \
450450
 $(SRCDIR)/name.c \
451451
 $(SRCDIR)/path.c \
452
+ $(SRCDIR)/piechart.c \
452453
 $(SRCDIR)/pivot.c \
453454
 $(SRCDIR)/popen.c \
454455
 $(SRCDIR)/pqueue.c \
455456
 $(SRCDIR)/printf.c \
456457
 $(SRCDIR)/publish.c \
@@ -618,10 +619,11 @@
618619
 $(OBJDIR)/merge_.c \
619620
 $(OBJDIR)/merge3_.c \
620621
 $(OBJDIR)/moderate_.c \
621622
 $(OBJDIR)/name_.c \
622623
 $(OBJDIR)/path_.c \
624
+ $(OBJDIR)/piechart_.c \
623625
 $(OBJDIR)/pivot_.c \
624626
 $(OBJDIR)/popen_.c \
625627
 $(OBJDIR)/pqueue_.c \
626628
 $(OBJDIR)/printf_.c \
627629
 $(OBJDIR)/publish_.c \
@@ -738,10 +740,11 @@
738740
 $(OBJDIR)/merge.o \
739741
 $(OBJDIR)/merge3.o \
740742
 $(OBJDIR)/moderate.o \
741743
 $(OBJDIR)/name.o \
742744
 $(OBJDIR)/path.o \
745
+ $(OBJDIR)/piechart.o \
743746
 $(OBJDIR)/pivot.o \
744747
 $(OBJDIR)/popen.o \
745748
 $(OBJDIR)/pqueue.o \
746749
 $(OBJDIR)/printf.o \
747750
 $(OBJDIR)/publish.o \
@@ -1051,10 +1054,11 @@
10511054
 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
10521055
 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
10531056
 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
10541057
 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
10551058
 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1059
+ $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
10561060
 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
10571061
 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
10581062
 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
10591063
 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
10601064
 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
@@ -1681,10 +1685,18 @@
16811685
16821686
 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
16831687
 $(XTCC) -o $(OBJDIR)/path.o -c $(OBJDIR)/path_.c
16841688
16851689
 $(OBJDIR)/path.h: $(OBJDIR)/headers
1690
+
1691
+$(OBJDIR)/piechart_.c: $(SRCDIR)/piechart.c $(TRANSLATE)
1692
+ $(TRANSLATE) $(SRCDIR)/piechart.c >$@
1693
+
1694
+$(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
1695
+ $(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
1696
+
1697
+$(OBJDIR)/piechart.h: $(OBJDIR)/headers
16861698
16871699
 $(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
16881700
 $(TRANSLATE) $(SRCDIR)/pivot.c >$@
16891701
16901702
 $(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
@@ -2059,10 +2071,11 @@
20592071
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
20602072
 -DSQLITE_OMIT_DEPRECATED \
20612073
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
20622074
 -DSQLITE_ENABLE_FTS4 \
20632075
 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2076
+ -DSQLITE_ENABLE_DBSTAT_VTAB \
20642077
 -DSQLITE_WIN32_NO_ANSI \
20652078
 -D_HAVE__MINGW_H \
20662079
 -DSQLITE_USE_MALLOC_H \
20672080
 -DSQLITE_USE_MSIZE
20682081
20692082
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -447,10 +447,11 @@
447 $(SRCDIR)/merge.c \
448 $(SRCDIR)/merge3.c \
449 $(SRCDIR)/moderate.c \
450 $(SRCDIR)/name.c \
451 $(SRCDIR)/path.c \
 
452 $(SRCDIR)/pivot.c \
453 $(SRCDIR)/popen.c \
454 $(SRCDIR)/pqueue.c \
455 $(SRCDIR)/printf.c \
456 $(SRCDIR)/publish.c \
@@ -618,10 +619,11 @@
618 $(OBJDIR)/merge_.c \
619 $(OBJDIR)/merge3_.c \
620 $(OBJDIR)/moderate_.c \
621 $(OBJDIR)/name_.c \
622 $(OBJDIR)/path_.c \
 
623 $(OBJDIR)/pivot_.c \
624 $(OBJDIR)/popen_.c \
625 $(OBJDIR)/pqueue_.c \
626 $(OBJDIR)/printf_.c \
627 $(OBJDIR)/publish_.c \
@@ -738,10 +740,11 @@
738 $(OBJDIR)/merge.o \
739 $(OBJDIR)/merge3.o \
740 $(OBJDIR)/moderate.o \
741 $(OBJDIR)/name.o \
742 $(OBJDIR)/path.o \
 
743 $(OBJDIR)/pivot.o \
744 $(OBJDIR)/popen.o \
745 $(OBJDIR)/pqueue.o \
746 $(OBJDIR)/printf.o \
747 $(OBJDIR)/publish.o \
@@ -1051,10 +1054,11 @@
1051 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1052 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1053 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1054 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1055 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
 
1056 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1057 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1058 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1059 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1060 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
@@ -1681,10 +1685,18 @@
1681
1682 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
1683 $(XTCC) -o $(OBJDIR)/path.o -c $(OBJDIR)/path_.c
1684
1685 $(OBJDIR)/path.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
1686
1687 $(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
1688 $(TRANSLATE) $(SRCDIR)/pivot.c >$@
1689
1690 $(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
@@ -2059,10 +2071,11 @@
2059 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2060 -DSQLITE_OMIT_DEPRECATED \
2061 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2062 -DSQLITE_ENABLE_FTS4 \
2063 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
 
2064 -DSQLITE_WIN32_NO_ANSI \
2065 -D_HAVE__MINGW_H \
2066 -DSQLITE_USE_MALLOC_H \
2067 -DSQLITE_USE_MSIZE
2068
2069
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -447,10 +447,11 @@
447 $(SRCDIR)/merge.c \
448 $(SRCDIR)/merge3.c \
449 $(SRCDIR)/moderate.c \
450 $(SRCDIR)/name.c \
451 $(SRCDIR)/path.c \
452 $(SRCDIR)/piechart.c \
453 $(SRCDIR)/pivot.c \
454 $(SRCDIR)/popen.c \
455 $(SRCDIR)/pqueue.c \
456 $(SRCDIR)/printf.c \
457 $(SRCDIR)/publish.c \
@@ -618,10 +619,11 @@
619 $(OBJDIR)/merge_.c \
620 $(OBJDIR)/merge3_.c \
621 $(OBJDIR)/moderate_.c \
622 $(OBJDIR)/name_.c \
623 $(OBJDIR)/path_.c \
624 $(OBJDIR)/piechart_.c \
625 $(OBJDIR)/pivot_.c \
626 $(OBJDIR)/popen_.c \
627 $(OBJDIR)/pqueue_.c \
628 $(OBJDIR)/printf_.c \
629 $(OBJDIR)/publish_.c \
@@ -738,10 +740,11 @@
740 $(OBJDIR)/merge.o \
741 $(OBJDIR)/merge3.o \
742 $(OBJDIR)/moderate.o \
743 $(OBJDIR)/name.o \
744 $(OBJDIR)/path.o \
745 $(OBJDIR)/piechart.o \
746 $(OBJDIR)/pivot.o \
747 $(OBJDIR)/popen.o \
748 $(OBJDIR)/pqueue.o \
749 $(OBJDIR)/printf.o \
750 $(OBJDIR)/publish.o \
@@ -1051,10 +1054,11 @@
1054 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1055 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1056 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1057 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1058 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1059 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1060 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1061 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1062 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1063 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1064 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
@@ -1681,10 +1685,18 @@
1685
1686 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
1687 $(XTCC) -o $(OBJDIR)/path.o -c $(OBJDIR)/path_.c
1688
1689 $(OBJDIR)/path.h: $(OBJDIR)/headers
1690
1691 $(OBJDIR)/piechart_.c: $(SRCDIR)/piechart.c $(TRANSLATE)
1692 $(TRANSLATE) $(SRCDIR)/piechart.c >$@
1693
1694 $(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
1695 $(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
1696
1697 $(OBJDIR)/piechart.h: $(OBJDIR)/headers
1698
1699 $(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
1700 $(TRANSLATE) $(SRCDIR)/pivot.c >$@
1701
1702 $(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
@@ -2059,10 +2071,11 @@
2071 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
2072 -DSQLITE_OMIT_DEPRECATED \
2073 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2074 -DSQLITE_ENABLE_FTS4 \
2075 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2076 -DSQLITE_ENABLE_DBSTAT_VTAB \
2077 -DSQLITE_WIN32_NO_ANSI \
2078 -D_HAVE__MINGW_H \
2079 -DSQLITE_USE_MALLOC_H \
2080 -DSQLITE_USE_MSIZE
2081
2082
M win/Makefile.msc
+11
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -199,10 +199,11 @@
199199
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
200200
 /DSQLITE_OMIT_DEPRECATED \
201201
 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
202202
 /DSQLITE_ENABLE_FTS4 \
203203
 /DSQLITE_ENABLE_FTS3_PARENTHESIS \
204
+ /DSQLITE_ENABLE_DBSTAT_VTAB \
204205
 /DSQLITE_WIN32_NO_ANSI
205206
206207
 SHELL_OPTIONS = /Dmain=sqlite3_shell \
207208
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
208209
 /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
@@ -286,10 +287,11 @@
286287
 merge_.c \
287288
 merge3_.c \
288289
 moderate_.c \
289290
 name_.c \
290291
 path_.c \
292
+ piechart_.c \
291293
 pivot_.c \
292294
 popen_.c \
293295
 pqueue_.c \
294296
 printf_.c \
295297
 publish_.c \
@@ -456,10 +458,11 @@
456458
 $(OX)\merge$O \
457459
 $(OX)\merge3$O \
458460
 $(OX)\moderate$O \
459461
 $(OX)\name$O \
460462
 $(OX)\path$O \
463
+ $(OX)\piechart$O \
461464
 $(OX)\pivot$O \
462465
 $(OX)\popen$O \
463466
 $(OX)\pqueue$O \
464467
 $(OX)\printf$O \
465468
 $(OX)\publish$O \
@@ -631,10 +634,11 @@
631634
 echo $(OX)\merge.obj >> $@
632635
 echo $(OX)\merge3.obj >> $@
633636
 echo $(OX)\moderate.obj >> $@
634637
 echo $(OX)\name.obj >> $@
635638
 echo $(OX)\path.obj >> $@
639
+ echo $(OX)\piechart.obj >> $@
636640
 echo $(OX)\pivot.obj >> $@
637641
 echo $(OX)\popen.obj >> $@
638642
 echo $(OX)\pqueue.obj >> $@
639643
 echo $(OX)\printf.obj >> $@
640644
 echo $(OX)\publish.obj >> $@
@@ -1212,10 +1216,16 @@
12121216
 $(OX)\path$O : path_.c path.h
12131217
 $(TCC) /Fo$@ -c path_.c
12141218
12151219
 path_.c : $(SRCDIR)\path.c
12161220
 translate$E $** > $@
1221
+
1222
+$(OX)\piechart$O : piechart_.c piechart.h
1223
+ $(TCC) /Fo$@ -c piechart_.c
1224
+
1225
+piechart_.c : $(SRCDIR)\piechart.c
1226
+ translate$E $** > $@
12171227
12181228
 $(OX)\pivot$O : pivot_.c pivot.h
12191229
 $(TCC) /Fo$@ -c pivot_.c
12201230
12211231
 pivot_.c : $(SRCDIR)\pivot.c
@@ -1565,10 +1575,11 @@
15651575
 merge_.c:merge.h \
15661576
 merge3_.c:merge3.h \
15671577
 moderate_.c:moderate.h \
15681578
 name_.c:name.h \
15691579
 path_.c:path.h \
1580
+ piechart_.c:piechart.h \
15701581
 pivot_.c:pivot.h \
15711582
 popen_.c:popen.h \
15721583
 pqueue_.c:pqueue.h \
15731584
 printf_.c:printf.h \
15741585
 publish_.c:publish.h \
15751586
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -199,10 +199,11 @@
199 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
200 /DSQLITE_OMIT_DEPRECATED \
201 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
202 /DSQLITE_ENABLE_FTS4 \
203 /DSQLITE_ENABLE_FTS3_PARENTHESIS \
 
204 /DSQLITE_WIN32_NO_ANSI
205
206 SHELL_OPTIONS = /Dmain=sqlite3_shell \
207 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
208 /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
@@ -286,10 +287,11 @@
286 merge_.c \
287 merge3_.c \
288 moderate_.c \
289 name_.c \
290 path_.c \
 
291 pivot_.c \
292 popen_.c \
293 pqueue_.c \
294 printf_.c \
295 publish_.c \
@@ -456,10 +458,11 @@
456 $(OX)\merge$O \
457 $(OX)\merge3$O \
458 $(OX)\moderate$O \
459 $(OX)\name$O \
460 $(OX)\path$O \
 
461 $(OX)\pivot$O \
462 $(OX)\popen$O \
463 $(OX)\pqueue$O \
464 $(OX)\printf$O \
465 $(OX)\publish$O \
@@ -631,10 +634,11 @@
631 echo $(OX)\merge.obj >> $@
632 echo $(OX)\merge3.obj >> $@
633 echo $(OX)\moderate.obj >> $@
634 echo $(OX)\name.obj >> $@
635 echo $(OX)\path.obj >> $@
 
636 echo $(OX)\pivot.obj >> $@
637 echo $(OX)\popen.obj >> $@
638 echo $(OX)\pqueue.obj >> $@
639 echo $(OX)\printf.obj >> $@
640 echo $(OX)\publish.obj >> $@
@@ -1212,10 +1216,16 @@
1212 $(OX)\path$O : path_.c path.h
1213 $(TCC) /Fo$@ -c path_.c
1214
1215 path_.c : $(SRCDIR)\path.c
1216 translate$E $** > $@
 
 
 
 
 
 
1217
1218 $(OX)\pivot$O : pivot_.c pivot.h
1219 $(TCC) /Fo$@ -c pivot_.c
1220
1221 pivot_.c : $(SRCDIR)\pivot.c
@@ -1565,10 +1575,11 @@
1565 merge_.c:merge.h \
1566 merge3_.c:merge3.h \
1567 moderate_.c:moderate.h \
1568 name_.c:name.h \
1569 path_.c:path.h \
 
1570 pivot_.c:pivot.h \
1571 popen_.c:popen.h \
1572 pqueue_.c:pqueue.h \
1573 printf_.c:printf.h \
1574 publish_.c:publish.h \
1575
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -199,10 +199,11 @@
199 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
200 /DSQLITE_OMIT_DEPRECATED \
201 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
202 /DSQLITE_ENABLE_FTS4 \
203 /DSQLITE_ENABLE_FTS3_PARENTHESIS \
204 /DSQLITE_ENABLE_DBSTAT_VTAB \
205 /DSQLITE_WIN32_NO_ANSI
206
207 SHELL_OPTIONS = /Dmain=sqlite3_shell \
208 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
209 /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
@@ -286,10 +287,11 @@
287 merge_.c \
288 merge3_.c \
289 moderate_.c \
290 name_.c \
291 path_.c \
292 piechart_.c \
293 pivot_.c \
294 popen_.c \
295 pqueue_.c \
296 printf_.c \
297 publish_.c \
@@ -456,10 +458,11 @@
458 $(OX)\merge$O \
459 $(OX)\merge3$O \
460 $(OX)\moderate$O \
461 $(OX)\name$O \
462 $(OX)\path$O \
463 $(OX)\piechart$O \
464 $(OX)\pivot$O \
465 $(OX)\popen$O \
466 $(OX)\pqueue$O \
467 $(OX)\printf$O \
468 $(OX)\publish$O \
@@ -631,10 +634,11 @@
634 echo $(OX)\merge.obj >> $@
635 echo $(OX)\merge3.obj >> $@
636 echo $(OX)\moderate.obj >> $@
637 echo $(OX)\name.obj >> $@
638 echo $(OX)\path.obj >> $@
639 echo $(OX)\piechart.obj >> $@
640 echo $(OX)\pivot.obj >> $@
641 echo $(OX)\popen.obj >> $@
642 echo $(OX)\pqueue.obj >> $@
643 echo $(OX)\printf.obj >> $@
644 echo $(OX)\publish.obj >> $@
@@ -1212,10 +1216,16 @@
1216 $(OX)\path$O : path_.c path.h
1217 $(TCC) /Fo$@ -c path_.c
1218
1219 path_.c : $(SRCDIR)\path.c
1220 translate$E $** > $@
1221
1222 $(OX)\piechart$O : piechart_.c piechart.h
1223 $(TCC) /Fo$@ -c piechart_.c
1224
1225 piechart_.c : $(SRCDIR)\piechart.c
1226 translate$E $** > $@
1227
1228 $(OX)\pivot$O : pivot_.c pivot.h
1229 $(TCC) /Fo$@ -c pivot_.c
1230
1231 pivot_.c : $(SRCDIR)\pivot.c
@@ -1565,10 +1575,11 @@
1575 merge_.c:merge.h \
1576 merge3_.c:merge3.h \
1577 moderate_.c:moderate.h \
1578 name_.c:name.h \
1579 path_.c:path.h \
1580 piechart_.c:piechart.h \
1581 pivot_.c:pivot.h \
1582 popen_.c:popen.h \
1583 pqueue_.c:pqueue.h \
1584 printf_.c:printf.h \
1585 publish_.c:publish.h \
1586

Keyboard Shortcuts

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