Fossil SCM

Add the "fossil patch" command.

drh 2021-06-22 13:33 trunk merge
Commit e0d61109e114511acd69b965a72cb4169fb2f6ff58ba67e805d5771bbbbd393f
--- src/http_transport.c
+++ src/http_transport.c
@@ -97,25 +97,32 @@
9797
#ifdef _WIN32
9898
static const char zDefaultSshCmd[] = "plink -ssh -T";
9999
#else
100100
static const char zDefaultSshCmd[] = "ssh -e none -T";
101101
#endif
102
+
103
+/*
104
+** Initialize a Blob to the name of the configured SSH command.
105
+*/
106
+void transport_ssh_command(Blob *p){
107
+ char *zSsh; /* The base SSH command */
108
+ zSsh = db_get("ssh-command", zDefaultSshCmd);
109
+ blob_init(p, zSsh, -1);
110
+}
102111
103112
/*
104113
** SSH initialization of the transport layer
105114
*/
106115
int transport_ssh_open(UrlData *pUrlData){
107116
/* For SSH we need to create and run SSH fossil http
108117
** to talk to the remote machine.
109118
*/
110
- char *zSsh; /* The base SSH command */
111119
Blob zCmd; /* The SSH command */
112120
char *zHost; /* The host name to contact */
113121
114122
socket_ssh_resolve_addr(pUrlData);
115
- zSsh = db_get("ssh-command", zDefaultSshCmd);
116
- blob_init(&zCmd, zSsh, -1);
123
+ transport_ssh_command(&zCmd);
117124
if( pUrlData->port!=pUrlData->dfltPort && pUrlData->port ){
118125
#ifdef _WIN32
119126
blob_appendf(&zCmd, " -P %d", pUrlData->port);
120127
#else
121128
blob_appendf(&zCmd, " -p %d", pUrlData->port);
122129
--- src/http_transport.c
+++ src/http_transport.c
@@ -97,25 +97,32 @@
97 #ifdef _WIN32
98 static const char zDefaultSshCmd[] = "plink -ssh -T";
99 #else
100 static const char zDefaultSshCmd[] = "ssh -e none -T";
101 #endif
 
 
 
 
 
 
 
 
 
102
103 /*
104 ** SSH initialization of the transport layer
105 */
106 int transport_ssh_open(UrlData *pUrlData){
107 /* For SSH we need to create and run SSH fossil http
108 ** to talk to the remote machine.
109 */
110 char *zSsh; /* The base SSH command */
111 Blob zCmd; /* The SSH command */
112 char *zHost; /* The host name to contact */
113
114 socket_ssh_resolve_addr(pUrlData);
115 zSsh = db_get("ssh-command", zDefaultSshCmd);
116 blob_init(&zCmd, zSsh, -1);
117 if( pUrlData->port!=pUrlData->dfltPort && pUrlData->port ){
118 #ifdef _WIN32
119 blob_appendf(&zCmd, " -P %d", pUrlData->port);
120 #else
121 blob_appendf(&zCmd, " -p %d", pUrlData->port);
122
--- src/http_transport.c
+++ src/http_transport.c
@@ -97,25 +97,32 @@
97 #ifdef _WIN32
98 static const char zDefaultSshCmd[] = "plink -ssh -T";
99 #else
100 static const char zDefaultSshCmd[] = "ssh -e none -T";
101 #endif
102
103 /*
104 ** Initialize a Blob to the name of the configured SSH command.
105 */
106 void transport_ssh_command(Blob *p){
107 char *zSsh; /* The base SSH command */
108 zSsh = db_get("ssh-command", zDefaultSshCmd);
109 blob_init(p, zSsh, -1);
110 }
111
112 /*
113 ** SSH initialization of the transport layer
114 */
115 int transport_ssh_open(UrlData *pUrlData){
116 /* For SSH we need to create and run SSH fossil http
117 ** to talk to the remote machine.
118 */
 
119 Blob zCmd; /* The SSH command */
120 char *zHost; /* The host name to contact */
121
122 socket_ssh_resolve_addr(pUrlData);
123 transport_ssh_command(&zCmd);
 
124 if( pUrlData->port!=pUrlData->dfltPort && pUrlData->port ){
125 #ifdef _WIN32
126 blob_appendf(&zCmd, " -P %d", pUrlData->port);
127 #else
128 blob_appendf(&zCmd, " -p %d", pUrlData->port);
129
+12
--- src/main.mk
+++ src/main.mk
@@ -104,10 +104,11 @@
104104
$(SRCDIR)/md5.c \
105105
$(SRCDIR)/merge.c \
106106
$(SRCDIR)/merge3.c \
107107
$(SRCDIR)/moderate.c \
108108
$(SRCDIR)/name.c \
109
+ $(SRCDIR)/patch.c \
109110
$(SRCDIR)/path.c \
110111
$(SRCDIR)/piechart.c \
111112
$(SRCDIR)/pikchr.c \
112113
$(SRCDIR)/pikchrshow.c \
113114
$(SRCDIR)/pivot.c \
@@ -361,10 +362,11 @@
361362
$(OBJDIR)/md5_.c \
362363
$(OBJDIR)/merge_.c \
363364
$(OBJDIR)/merge3_.c \
364365
$(OBJDIR)/moderate_.c \
365366
$(OBJDIR)/name_.c \
367
+ $(OBJDIR)/patch_.c \
366368
$(OBJDIR)/path_.c \
367369
$(OBJDIR)/piechart_.c \
368370
$(OBJDIR)/pikchr_.c \
369371
$(OBJDIR)/pikchrshow_.c \
370372
$(OBJDIR)/pivot_.c \
@@ -510,10 +512,11 @@
510512
$(OBJDIR)/md5.o \
511513
$(OBJDIR)/merge.o \
512514
$(OBJDIR)/merge3.o \
513515
$(OBJDIR)/moderate.o \
514516
$(OBJDIR)/name.o \
517
+ $(OBJDIR)/patch.o \
515518
$(OBJDIR)/path.o \
516519
$(OBJDIR)/piechart.o \
517520
$(OBJDIR)/pikchr.o \
518521
$(OBJDIR)/pikchrshow.o \
519522
$(OBJDIR)/pivot.o \
@@ -849,10 +852,11 @@
849852
$(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
850853
$(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
851854
$(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
852855
$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
853856
$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
857
+ $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
854858
$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
855859
$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
856860
$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
857861
$(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
858862
$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
@@ -1632,10 +1636,18 @@
16321636
16331637
$(OBJDIR)/name.o: $(OBJDIR)/name_.c $(OBJDIR)/name.h $(SRCDIR)/config.h
16341638
$(XTCC) -o $(OBJDIR)/name.o -c $(OBJDIR)/name_.c
16351639
16361640
$(OBJDIR)/name.h: $(OBJDIR)/headers
1641
+
1642
+$(OBJDIR)/patch_.c: $(SRCDIR)/patch.c $(OBJDIR)/translate
1643
+ $(OBJDIR)/translate $(SRCDIR)/patch.c >$@
1644
+
1645
+$(OBJDIR)/patch.o: $(OBJDIR)/patch_.c $(OBJDIR)/patch.h $(SRCDIR)/config.h
1646
+ $(XTCC) -o $(OBJDIR)/patch.o -c $(OBJDIR)/patch_.c
1647
+
1648
+$(OBJDIR)/patch.h: $(OBJDIR)/headers
16371649
16381650
$(OBJDIR)/path_.c: $(SRCDIR)/path.c $(OBJDIR)/translate
16391651
$(OBJDIR)/translate $(SRCDIR)/path.c >$@
16401652
16411653
$(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
16421654
--- src/main.mk
+++ src/main.mk
@@ -104,10 +104,11 @@
104 $(SRCDIR)/md5.c \
105 $(SRCDIR)/merge.c \
106 $(SRCDIR)/merge3.c \
107 $(SRCDIR)/moderate.c \
108 $(SRCDIR)/name.c \
 
109 $(SRCDIR)/path.c \
110 $(SRCDIR)/piechart.c \
111 $(SRCDIR)/pikchr.c \
112 $(SRCDIR)/pikchrshow.c \
113 $(SRCDIR)/pivot.c \
@@ -361,10 +362,11 @@
361 $(OBJDIR)/md5_.c \
362 $(OBJDIR)/merge_.c \
363 $(OBJDIR)/merge3_.c \
364 $(OBJDIR)/moderate_.c \
365 $(OBJDIR)/name_.c \
 
366 $(OBJDIR)/path_.c \
367 $(OBJDIR)/piechart_.c \
368 $(OBJDIR)/pikchr_.c \
369 $(OBJDIR)/pikchrshow_.c \
370 $(OBJDIR)/pivot_.c \
@@ -510,10 +512,11 @@
510 $(OBJDIR)/md5.o \
511 $(OBJDIR)/merge.o \
512 $(OBJDIR)/merge3.o \
513 $(OBJDIR)/moderate.o \
514 $(OBJDIR)/name.o \
 
515 $(OBJDIR)/path.o \
516 $(OBJDIR)/piechart.o \
517 $(OBJDIR)/pikchr.o \
518 $(OBJDIR)/pikchrshow.o \
519 $(OBJDIR)/pivot.o \
@@ -849,10 +852,11 @@
849 $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
850 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
851 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
852 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
853 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
 
854 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
855 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
856 $(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
857 $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
858 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
@@ -1632,10 +1636,18 @@
1632
1633 $(OBJDIR)/name.o: $(OBJDIR)/name_.c $(OBJDIR)/name.h $(SRCDIR)/config.h
1634 $(XTCC) -o $(OBJDIR)/name.o -c $(OBJDIR)/name_.c
1635
1636 $(OBJDIR)/name.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
1637
1638 $(OBJDIR)/path_.c: $(SRCDIR)/path.c $(OBJDIR)/translate
1639 $(OBJDIR)/translate $(SRCDIR)/path.c >$@
1640
1641 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
1642
--- src/main.mk
+++ src/main.mk
@@ -104,10 +104,11 @@
104 $(SRCDIR)/md5.c \
105 $(SRCDIR)/merge.c \
106 $(SRCDIR)/merge3.c \
107 $(SRCDIR)/moderate.c \
108 $(SRCDIR)/name.c \
109 $(SRCDIR)/patch.c \
110 $(SRCDIR)/path.c \
111 $(SRCDIR)/piechart.c \
112 $(SRCDIR)/pikchr.c \
113 $(SRCDIR)/pikchrshow.c \
114 $(SRCDIR)/pivot.c \
@@ -361,10 +362,11 @@
362 $(OBJDIR)/md5_.c \
363 $(OBJDIR)/merge_.c \
364 $(OBJDIR)/merge3_.c \
365 $(OBJDIR)/moderate_.c \
366 $(OBJDIR)/name_.c \
367 $(OBJDIR)/patch_.c \
368 $(OBJDIR)/path_.c \
369 $(OBJDIR)/piechart_.c \
370 $(OBJDIR)/pikchr_.c \
371 $(OBJDIR)/pikchrshow_.c \
372 $(OBJDIR)/pivot_.c \
@@ -510,10 +512,11 @@
512 $(OBJDIR)/md5.o \
513 $(OBJDIR)/merge.o \
514 $(OBJDIR)/merge3.o \
515 $(OBJDIR)/moderate.o \
516 $(OBJDIR)/name.o \
517 $(OBJDIR)/patch.o \
518 $(OBJDIR)/path.o \
519 $(OBJDIR)/piechart.o \
520 $(OBJDIR)/pikchr.o \
521 $(OBJDIR)/pikchrshow.o \
522 $(OBJDIR)/pivot.o \
@@ -849,10 +852,11 @@
852 $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
853 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
854 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
855 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
856 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
857 $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
858 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
859 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
860 $(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
861 $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
862 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
@@ -1632,10 +1636,18 @@
1636
1637 $(OBJDIR)/name.o: $(OBJDIR)/name_.c $(OBJDIR)/name.h $(SRCDIR)/config.h
1638 $(XTCC) -o $(OBJDIR)/name.o -c $(OBJDIR)/name_.c
1639
1640 $(OBJDIR)/name.h: $(OBJDIR)/headers
1641
1642 $(OBJDIR)/patch_.c: $(SRCDIR)/patch.c $(OBJDIR)/translate
1643 $(OBJDIR)/translate $(SRCDIR)/patch.c >$@
1644
1645 $(OBJDIR)/patch.o: $(OBJDIR)/patch_.c $(OBJDIR)/patch.h $(SRCDIR)/config.h
1646 $(XTCC) -o $(OBJDIR)/patch.o -c $(OBJDIR)/patch_.c
1647
1648 $(OBJDIR)/patch.h: $(OBJDIR)/headers
1649
1650 $(OBJDIR)/path_.c: $(SRCDIR)/path.c $(OBJDIR)/translate
1651 $(OBJDIR)/translate $(SRCDIR)/path.c >$@
1652
1653 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
1654
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -125,10 +125,11 @@
125125
md5
126126
merge
127127
merge3
128128
moderate
129129
name
130
+ patch
130131
path
131132
piechart
132133
pikchr
133134
pikchrshow
134135
pivot
135136
136137
ADDED src/patch.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -125,10 +125,11 @@
125 md5
126 merge
127 merge3
128 moderate
129 name
 
130 path
131 piechart
132 pikchr
133 pikchrshow
134 pivot
135
136 DDED src/patch.c
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -125,10 +125,11 @@
125 md5
126 merge
127 merge3
128 moderate
129 name
130 patch
131 path
132 piechart
133 pikchr
134 pikchrshow
135 pivot
136
137 DDED src/patch.c
+15
--- a/src/patch.c
+++ b/src/patch.c
@@ -0,0 +1,15 @@
1
+/*
2
+** patch_create('project-code'='project-code'/*
3
+** patch_create(void"SELECT value FROM patch.cfg W//Orig 2)N/*
4
+** patch_create('projecdiff(/*
5
+** patch_create('project-code'='project-code'/*
6
+** patch_create(void"SELECT value FROM patch.cfg WNULL
7
+**Delta. NULL if file deleted orLECT value FROM patch.cfg W//Orig 2)N/*
8
+** patch_create('projecdiff(/*
9
+** patch_create('project-code'='project-code'/*
10
+** patch_create(void"SELECT value FROM patch.cfg W/*
11
+** patch_create('projectdelete if origname NULLorigname"
12
+ " columnFind
13
+**
14
+** Otherwise, itranslate the name in tpush/*
15
+", vid);
--- a/src/patch.c
+++ b/src/patch.c
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/src/patch.c
+++ b/src/patch.c
@@ -0,0 +1,15 @@
1 /*
2 ** patch_create('project-code'='project-code'/*
3 ** patch_create(void"SELECT value FROM patch.cfg W//Orig 2)N/*
4 ** patch_create('projecdiff(/*
5 ** patch_create('project-code'='project-code'/*
6 ** patch_create(void"SELECT value FROM patch.cfg WNULL
7 **Delta. NULL if file deleted orLECT value FROM patch.cfg W//Orig 2)N/*
8 ** patch_create('projecdiff(/*
9 ** patch_create('project-code'='project-code'/*
10 ** patch_create(void"SELECT value FROM patch.cfg W/*
11 ** patch_create('projectdelete if origname NULLorigname"
12 " columnFind
13 **
14 ** Otherwise, itranslate the name in tpush/*
15 ", vid);
+10 -4
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -28,13 +28,13 @@
2828
2929
SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
3030
3131
SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
3232
33
-SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
33
+SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 patch_.c path_.c piechart_.c pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
3434
35
-OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$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)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\pikchr$O $(OBJDIR)\pikchrshow$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)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$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)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$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)\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)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$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)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\patch$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pikchrshow$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)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$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)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$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)\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 ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi chat checkin checkout clearsign clone color comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki 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 pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
54
+ +echo add ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi chat checkin checkout clearsign clone color comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki 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 patch path piechart pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
5555
+echo fossil >> $@
5656
+echo fossil >> $@
5757
+echo $(LIBS) >> $@
5858
+echo. >> $@
5959
+echo fossil >> $@
@@ -661,10 +661,16 @@
661661
$(OBJDIR)\name$O : name_.c name.h
662662
$(TCC) -o$@ -c name_.c
663663
664664
name_.c : $(SRCDIR)\name.c
665665
+translate$E $** > $@
666
+
667
+$(OBJDIR)\patch$O : patch_.c patch.h
668
+ $(TCC) -o$@ -c patch_.c
669
+
670
+patch_.c : $(SRCDIR)\patch.c
671
+ +translate$E $** > $@
666672
667673
$(OBJDIR)\path$O : path_.c path.h
668674
$(TCC) -o$@ -c path_.c
669675
670676
path_.c : $(SRCDIR)\path.c
@@ -1005,7 +1011,7 @@
10051011
10061012
zip_.c : $(SRCDIR)\zip.c
10071013
+translate$E $** > $@
10081014
10091015
headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1010
- +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.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 capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.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 interwiki_.c:interwiki.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 pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.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 repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.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 terminal_.c:terminal.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 unversioned_.c:unversioned.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 xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
1016
+ +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.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 capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.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 interwiki_.c:interwiki.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 patch_.c:patch.h path_.c:path.h piechart_.c:piechart.h pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.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 repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.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 terminal_.c:terminal.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 unversioned_.c:unversioned.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 xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
10111017
@copy /Y nul: headers
10121018
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -28,13 +28,13 @@
28
29 SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
30
31 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33 SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
34
35 OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$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)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\pikchr$O $(OBJDIR)\pikchrshow$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)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$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)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$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)\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 ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi chat checkin checkout clearsign clone color comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki 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 pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
55 +echo fossil >> $@
56 +echo fossil >> $@
57 +echo $(LIBS) >> $@
58 +echo. >> $@
59 +echo fossil >> $@
@@ -661,10 +661,16 @@
661 $(OBJDIR)\name$O : name_.c name.h
662 $(TCC) -o$@ -c name_.c
663
664 name_.c : $(SRCDIR)\name.c
665 +translate$E $** > $@
 
 
 
 
 
 
666
667 $(OBJDIR)\path$O : path_.c path.h
668 $(TCC) -o$@ -c path_.c
669
670 path_.c : $(SRCDIR)\path.c
@@ -1005,7 +1011,7 @@
1005
1006 zip_.c : $(SRCDIR)\zip.c
1007 +translate$E $** > $@
1008
1009 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1010 +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.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 capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.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 interwiki_.c:interwiki.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 pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.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 repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.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 terminal_.c:terminal.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 unversioned_.c:unversioned.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 xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
1011 @copy /Y nul: headers
1012
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -28,13 +28,13 @@
28
29 SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0
30
31 SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33 SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 patch_.c path_.c piechart_.c pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
34
35 OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$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)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\patch$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pikchrshow$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)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$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)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$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)\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 ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi chat checkin checkout clearsign clone color comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki 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 patch path piechart pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
55 +echo fossil >> $@
56 +echo fossil >> $@
57 +echo $(LIBS) >> $@
58 +echo. >> $@
59 +echo fossil >> $@
@@ -661,10 +661,16 @@
661 $(OBJDIR)\name$O : name_.c name.h
662 $(TCC) -o$@ -c name_.c
663
664 name_.c : $(SRCDIR)\name.c
665 +translate$E $** > $@
666
667 $(OBJDIR)\patch$O : patch_.c patch.h
668 $(TCC) -o$@ -c patch_.c
669
670 patch_.c : $(SRCDIR)\patch.c
671 +translate$E $** > $@
672
673 $(OBJDIR)\path$O : path_.c path.h
674 $(TCC) -o$@ -c path_.c
675
676 path_.c : $(SRCDIR)\path.c
@@ -1005,7 +1011,7 @@
1011
1012 zip_.c : $(SRCDIR)\zip.c
1013 +translate$E $** > $@
1014
1015 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1016 +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.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 capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.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 interwiki_.c:interwiki.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 patch_.c:patch.h path_.c:path.h piechart_.c:piechart.h pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.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 repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.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 terminal_.c:terminal.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 unversioned_.c:unversioned.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 xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
1017 @copy /Y nul: headers
1018
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -513,10 +513,11 @@
513513
$(SRCDIR)/md5.c \
514514
$(SRCDIR)/merge.c \
515515
$(SRCDIR)/merge3.c \
516516
$(SRCDIR)/moderate.c \
517517
$(SRCDIR)/name.c \
518
+ $(SRCDIR)/patch.c \
518519
$(SRCDIR)/path.c \
519520
$(SRCDIR)/piechart.c \
520521
$(SRCDIR)/pikchr.c \
521522
$(SRCDIR)/pikchrshow.c \
522523
$(SRCDIR)/pivot.c \
@@ -770,10 +771,11 @@
770771
$(OBJDIR)/md5_.c \
771772
$(OBJDIR)/merge_.c \
772773
$(OBJDIR)/merge3_.c \
773774
$(OBJDIR)/moderate_.c \
774775
$(OBJDIR)/name_.c \
776
+ $(OBJDIR)/patch_.c \
775777
$(OBJDIR)/path_.c \
776778
$(OBJDIR)/piechart_.c \
777779
$(OBJDIR)/pikchr_.c \
778780
$(OBJDIR)/pikchrshow_.c \
779781
$(OBJDIR)/pivot_.c \
@@ -919,10 +921,11 @@
919921
$(OBJDIR)/md5.o \
920922
$(OBJDIR)/merge.o \
921923
$(OBJDIR)/merge3.o \
922924
$(OBJDIR)/moderate.o \
923925
$(OBJDIR)/name.o \
926
+ $(OBJDIR)/patch.o \
924927
$(OBJDIR)/path.o \
925928
$(OBJDIR)/piechart.o \
926929
$(OBJDIR)/pikchr.o \
927930
$(OBJDIR)/pikchrshow.o \
928931
$(OBJDIR)/pivot.o \
@@ -1283,10 +1286,11 @@
12831286
$(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
12841287
$(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
12851288
$(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
12861289
$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
12871290
$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1291
+ $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
12881292
$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
12891293
$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
12901294
$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
12911295
$(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
12921296
$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
@@ -2068,10 +2072,18 @@
20682072
20692073
$(OBJDIR)/name.o: $(OBJDIR)/name_.c $(OBJDIR)/name.h $(SRCDIR)/config.h
20702074
$(XTCC) -o $(OBJDIR)/name.o -c $(OBJDIR)/name_.c
20712075
20722076
$(OBJDIR)/name.h: $(OBJDIR)/headers
2077
+
2078
+$(OBJDIR)/patch_.c: $(SRCDIR)/patch.c $(TRANSLATE)
2079
+ $(TRANSLATE) $(SRCDIR)/patch.c >$@
2080
+
2081
+$(OBJDIR)/patch.o: $(OBJDIR)/patch_.c $(OBJDIR)/patch.h $(SRCDIR)/config.h
2082
+ $(XTCC) -o $(OBJDIR)/patch.o -c $(OBJDIR)/patch_.c
2083
+
2084
+$(OBJDIR)/patch.h: $(OBJDIR)/headers
20732085
20742086
$(OBJDIR)/path_.c: $(SRCDIR)/path.c $(TRANSLATE)
20752087
$(TRANSLATE) $(SRCDIR)/path.c >$@
20762088
20772089
$(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
20782090
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -513,10 +513,11 @@
513 $(SRCDIR)/md5.c \
514 $(SRCDIR)/merge.c \
515 $(SRCDIR)/merge3.c \
516 $(SRCDIR)/moderate.c \
517 $(SRCDIR)/name.c \
 
518 $(SRCDIR)/path.c \
519 $(SRCDIR)/piechart.c \
520 $(SRCDIR)/pikchr.c \
521 $(SRCDIR)/pikchrshow.c \
522 $(SRCDIR)/pivot.c \
@@ -770,10 +771,11 @@
770 $(OBJDIR)/md5_.c \
771 $(OBJDIR)/merge_.c \
772 $(OBJDIR)/merge3_.c \
773 $(OBJDIR)/moderate_.c \
774 $(OBJDIR)/name_.c \
 
775 $(OBJDIR)/path_.c \
776 $(OBJDIR)/piechart_.c \
777 $(OBJDIR)/pikchr_.c \
778 $(OBJDIR)/pikchrshow_.c \
779 $(OBJDIR)/pivot_.c \
@@ -919,10 +921,11 @@
919 $(OBJDIR)/md5.o \
920 $(OBJDIR)/merge.o \
921 $(OBJDIR)/merge3.o \
922 $(OBJDIR)/moderate.o \
923 $(OBJDIR)/name.o \
 
924 $(OBJDIR)/path.o \
925 $(OBJDIR)/piechart.o \
926 $(OBJDIR)/pikchr.o \
927 $(OBJDIR)/pikchrshow.o \
928 $(OBJDIR)/pivot.o \
@@ -1283,10 +1286,11 @@
1283 $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1284 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1285 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1286 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1287 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
 
1288 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1289 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1290 $(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
1291 $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1292 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
@@ -2068,10 +2072,18 @@
2068
2069 $(OBJDIR)/name.o: $(OBJDIR)/name_.c $(OBJDIR)/name.h $(SRCDIR)/config.h
2070 $(XTCC) -o $(OBJDIR)/name.o -c $(OBJDIR)/name_.c
2071
2072 $(OBJDIR)/name.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
2073
2074 $(OBJDIR)/path_.c: $(SRCDIR)/path.c $(TRANSLATE)
2075 $(TRANSLATE) $(SRCDIR)/path.c >$@
2076
2077 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
2078
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -513,10 +513,11 @@
513 $(SRCDIR)/md5.c \
514 $(SRCDIR)/merge.c \
515 $(SRCDIR)/merge3.c \
516 $(SRCDIR)/moderate.c \
517 $(SRCDIR)/name.c \
518 $(SRCDIR)/patch.c \
519 $(SRCDIR)/path.c \
520 $(SRCDIR)/piechart.c \
521 $(SRCDIR)/pikchr.c \
522 $(SRCDIR)/pikchrshow.c \
523 $(SRCDIR)/pivot.c \
@@ -770,10 +771,11 @@
771 $(OBJDIR)/md5_.c \
772 $(OBJDIR)/merge_.c \
773 $(OBJDIR)/merge3_.c \
774 $(OBJDIR)/moderate_.c \
775 $(OBJDIR)/name_.c \
776 $(OBJDIR)/patch_.c \
777 $(OBJDIR)/path_.c \
778 $(OBJDIR)/piechart_.c \
779 $(OBJDIR)/pikchr_.c \
780 $(OBJDIR)/pikchrshow_.c \
781 $(OBJDIR)/pivot_.c \
@@ -919,10 +921,11 @@
921 $(OBJDIR)/md5.o \
922 $(OBJDIR)/merge.o \
923 $(OBJDIR)/merge3.o \
924 $(OBJDIR)/moderate.o \
925 $(OBJDIR)/name.o \
926 $(OBJDIR)/patch.o \
927 $(OBJDIR)/path.o \
928 $(OBJDIR)/piechart.o \
929 $(OBJDIR)/pikchr.o \
930 $(OBJDIR)/pikchrshow.o \
931 $(OBJDIR)/pivot.o \
@@ -1283,10 +1286,11 @@
1286 $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1287 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1288 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1289 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1290 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1291 $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1292 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1293 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1294 $(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
1295 $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1296 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
@@ -2068,10 +2072,18 @@
2072
2073 $(OBJDIR)/name.o: $(OBJDIR)/name_.c $(OBJDIR)/name.h $(SRCDIR)/config.h
2074 $(XTCC) -o $(OBJDIR)/name.o -c $(OBJDIR)/name_.c
2075
2076 $(OBJDIR)/name.h: $(OBJDIR)/headers
2077
2078 $(OBJDIR)/patch_.c: $(SRCDIR)/patch.c $(TRANSLATE)
2079 $(TRANSLATE) $(SRCDIR)/patch.c >$@
2080
2081 $(OBJDIR)/patch.o: $(OBJDIR)/patch_.c $(OBJDIR)/patch.h $(SRCDIR)/config.h
2082 $(XTCC) -o $(OBJDIR)/patch.o -c $(OBJDIR)/patch_.c
2083
2084 $(OBJDIR)/patch.h: $(OBJDIR)/headers
2085
2086 $(OBJDIR)/path_.c: $(SRCDIR)/path.c $(TRANSLATE)
2087 $(TRANSLATE) $(SRCDIR)/path.c >$@
2088
2089 $(OBJDIR)/path.o: $(OBJDIR)/path_.c $(OBJDIR)/path.h $(SRCDIR)/config.h
2090
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -456,10 +456,11 @@
456456
"$(OX)\md5_.c" \
457457
"$(OX)\merge_.c" \
458458
"$(OX)\merge3_.c" \
459459
"$(OX)\moderate_.c" \
460460
"$(OX)\name_.c" \
461
+ "$(OX)\patch_.c" \
461462
"$(OX)\path_.c" \
462463
"$(OX)\piechart_.c" \
463464
"$(OX)\pikchr_.c" \
464465
"$(OX)\pikchrshow_.c" \
465466
"$(OX)\pivot_.c" \
@@ -712,10 +713,11 @@
712713
"$(OX)\md5$O" \
713714
"$(OX)\merge$O" \
714715
"$(OX)\merge3$O" \
715716
"$(OX)\moderate$O" \
716717
"$(OX)\name$O" \
718
+ "$(OX)\patch$O" \
717719
"$(OX)\path$O" \
718720
"$(OX)\piechart$O" \
719721
"$(OX)\pikchr$O" \
720722
"$(OX)\pikchrshow$O" \
721723
"$(OX)\pivot$O" \
@@ -942,10 +944,11 @@
942944
echo "$(OX)\md5.obj" >> $@
943945
echo "$(OX)\merge.obj" >> $@
944946
echo "$(OX)\merge3.obj" >> $@
945947
echo "$(OX)\moderate.obj" >> $@
946948
echo "$(OX)\name.obj" >> $@
949
+ echo "$(OX)\patch.obj" >> $@
947950
echo "$(OX)\path.obj" >> $@
948951
echo "$(OX)\piechart.obj" >> $@
949952
echo "$(OX)\pikchr.obj" >> $@
950953
echo "$(OX)\pikchrshow.obj" >> $@
951954
echo "$(OX)\pivot.obj" >> $@
@@ -1766,10 +1769,16 @@
17661769
"$(OX)\name$O" : "$(OX)\name_.c" "$(OX)\name.h"
17671770
$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name_.c"
17681771
17691772
"$(OX)\name_.c" : "$(SRCDIR)\name.c"
17701773
"$(OBJDIR)\translate$E" $** > $@
1774
+
1775
+"$(OX)\patch$O" : "$(OX)\patch_.c" "$(OX)\patch.h"
1776
+ $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\patch_.c"
1777
+
1778
+"$(OX)\patch_.c" : "$(SRCDIR)\patch.c"
1779
+ "$(OBJDIR)\translate$E" $** > $@
17711780
17721781
"$(OX)\path$O" : "$(OX)\path_.c" "$(OX)\path.h"
17731782
$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path_.c"
17741783
17751784
"$(OX)\path_.c" : "$(SRCDIR)\path.c"
@@ -2203,10 +2212,11 @@
22032212
"$(OX)\md5_.c":"$(OX)\md5.h" \
22042213
"$(OX)\merge_.c":"$(OX)\merge.h" \
22052214
"$(OX)\merge3_.c":"$(OX)\merge3.h" \
22062215
"$(OX)\moderate_.c":"$(OX)\moderate.h" \
22072216
"$(OX)\name_.c":"$(OX)\name.h" \
2217
+ "$(OX)\patch_.c":"$(OX)\patch.h" \
22082218
"$(OX)\path_.c":"$(OX)\path.h" \
22092219
"$(OX)\piechart_.c":"$(OX)\piechart.h" \
22102220
"$(OX)\pikchr_.c":"$(OX)\pikchr.h" \
22112221
"$(OX)\pikchrshow_.c":"$(OX)\pikchrshow.h" \
22122222
"$(OX)\pivot_.c":"$(OX)\pivot.h" \
22132223
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -456,10 +456,11 @@
456 "$(OX)\md5_.c" \
457 "$(OX)\merge_.c" \
458 "$(OX)\merge3_.c" \
459 "$(OX)\moderate_.c" \
460 "$(OX)\name_.c" \
 
461 "$(OX)\path_.c" \
462 "$(OX)\piechart_.c" \
463 "$(OX)\pikchr_.c" \
464 "$(OX)\pikchrshow_.c" \
465 "$(OX)\pivot_.c" \
@@ -712,10 +713,11 @@
712 "$(OX)\md5$O" \
713 "$(OX)\merge$O" \
714 "$(OX)\merge3$O" \
715 "$(OX)\moderate$O" \
716 "$(OX)\name$O" \
 
717 "$(OX)\path$O" \
718 "$(OX)\piechart$O" \
719 "$(OX)\pikchr$O" \
720 "$(OX)\pikchrshow$O" \
721 "$(OX)\pivot$O" \
@@ -942,10 +944,11 @@
942 echo "$(OX)\md5.obj" >> $@
943 echo "$(OX)\merge.obj" >> $@
944 echo "$(OX)\merge3.obj" >> $@
945 echo "$(OX)\moderate.obj" >> $@
946 echo "$(OX)\name.obj" >> $@
 
947 echo "$(OX)\path.obj" >> $@
948 echo "$(OX)\piechart.obj" >> $@
949 echo "$(OX)\pikchr.obj" >> $@
950 echo "$(OX)\pikchrshow.obj" >> $@
951 echo "$(OX)\pivot.obj" >> $@
@@ -1766,10 +1769,16 @@
1766 "$(OX)\name$O" : "$(OX)\name_.c" "$(OX)\name.h"
1767 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name_.c"
1768
1769 "$(OX)\name_.c" : "$(SRCDIR)\name.c"
1770 "$(OBJDIR)\translate$E" $** > $@
 
 
 
 
 
 
1771
1772 "$(OX)\path$O" : "$(OX)\path_.c" "$(OX)\path.h"
1773 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path_.c"
1774
1775 "$(OX)\path_.c" : "$(SRCDIR)\path.c"
@@ -2203,10 +2212,11 @@
2203 "$(OX)\md5_.c":"$(OX)\md5.h" \
2204 "$(OX)\merge_.c":"$(OX)\merge.h" \
2205 "$(OX)\merge3_.c":"$(OX)\merge3.h" \
2206 "$(OX)\moderate_.c":"$(OX)\moderate.h" \
2207 "$(OX)\name_.c":"$(OX)\name.h" \
 
2208 "$(OX)\path_.c":"$(OX)\path.h" \
2209 "$(OX)\piechart_.c":"$(OX)\piechart.h" \
2210 "$(OX)\pikchr_.c":"$(OX)\pikchr.h" \
2211 "$(OX)\pikchrshow_.c":"$(OX)\pikchrshow.h" \
2212 "$(OX)\pivot_.c":"$(OX)\pivot.h" \
2213
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -456,10 +456,11 @@
456 "$(OX)\md5_.c" \
457 "$(OX)\merge_.c" \
458 "$(OX)\merge3_.c" \
459 "$(OX)\moderate_.c" \
460 "$(OX)\name_.c" \
461 "$(OX)\patch_.c" \
462 "$(OX)\path_.c" \
463 "$(OX)\piechart_.c" \
464 "$(OX)\pikchr_.c" \
465 "$(OX)\pikchrshow_.c" \
466 "$(OX)\pivot_.c" \
@@ -712,10 +713,11 @@
713 "$(OX)\md5$O" \
714 "$(OX)\merge$O" \
715 "$(OX)\merge3$O" \
716 "$(OX)\moderate$O" \
717 "$(OX)\name$O" \
718 "$(OX)\patch$O" \
719 "$(OX)\path$O" \
720 "$(OX)\piechart$O" \
721 "$(OX)\pikchr$O" \
722 "$(OX)\pikchrshow$O" \
723 "$(OX)\pivot$O" \
@@ -942,10 +944,11 @@
944 echo "$(OX)\md5.obj" >> $@
945 echo "$(OX)\merge.obj" >> $@
946 echo "$(OX)\merge3.obj" >> $@
947 echo "$(OX)\moderate.obj" >> $@
948 echo "$(OX)\name.obj" >> $@
949 echo "$(OX)\patch.obj" >> $@
950 echo "$(OX)\path.obj" >> $@
951 echo "$(OX)\piechart.obj" >> $@
952 echo "$(OX)\pikchr.obj" >> $@
953 echo "$(OX)\pikchrshow.obj" >> $@
954 echo "$(OX)\pivot.obj" >> $@
@@ -1766,10 +1769,16 @@
1769 "$(OX)\name$O" : "$(OX)\name_.c" "$(OX)\name.h"
1770 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name_.c"
1771
1772 "$(OX)\name_.c" : "$(SRCDIR)\name.c"
1773 "$(OBJDIR)\translate$E" $** > $@
1774
1775 "$(OX)\patch$O" : "$(OX)\patch_.c" "$(OX)\patch.h"
1776 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\patch_.c"
1777
1778 "$(OX)\patch_.c" : "$(SRCDIR)\patch.c"
1779 "$(OBJDIR)\translate$E" $** > $@
1780
1781 "$(OX)\path$O" : "$(OX)\path_.c" "$(OX)\path.h"
1782 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path_.c"
1783
1784 "$(OX)\path_.c" : "$(SRCDIR)\path.c"
@@ -2203,10 +2212,11 @@
2212 "$(OX)\md5_.c":"$(OX)\md5.h" \
2213 "$(OX)\merge_.c":"$(OX)\merge.h" \
2214 "$(OX)\merge3_.c":"$(OX)\merge3.h" \
2215 "$(OX)\moderate_.c":"$(OX)\moderate.h" \
2216 "$(OX)\name_.c":"$(OX)\name.h" \
2217 "$(OX)\patch_.c":"$(OX)\patch.h" \
2218 "$(OX)\path_.c":"$(OX)\path.h" \
2219 "$(OX)\piechart_.c":"$(OX)\piechart.h" \
2220 "$(OX)\pikchr_.c":"$(OX)\pikchr.h" \
2221 "$(OX)\pikchrshow_.c":"$(OX)\pikchrshow.h" \
2222 "$(OX)\pivot_.c":"$(OX)\pivot.h" \
2223
--- www/changes.wiki
+++ www/changes.wiki
@@ -3,10 +3,11 @@
33
<a name='v2_16'></a>
44
<h2>Changes for Version 2.16 (pending)</h2>
55
* <b>Security:</b> Fix the client-side TLS so that it verifies that the
66
server hostname matches its certificate. <b>Upgrading to
77
the patch is recommended.</b>
8
+ * Added the [./patchcmd.md|fossil patch] command.
89
* The [/brlist|/brlist web page] allows the user to
910
select multiple branches to be displayed together in a single
1011
timeline.
1112
* The [./forum.wiki|Forum] provides a hyperlink on the author of each
1213
post that goes to a timeline of recent posts by that same author.
1314
--- www/changes.wiki
+++ www/changes.wiki
@@ -3,10 +3,11 @@
3 <a name='v2_16'></a>
4 <h2>Changes for Version 2.16 (pending)</h2>
5 * <b>Security:</b> Fix the client-side TLS so that it verifies that the
6 server hostname matches its certificate. <b>Upgrading to
7 the patch is recommended.</b>
 
8 * The [/brlist|/brlist web page] allows the user to
9 select multiple branches to be displayed together in a single
10 timeline.
11 * The [./forum.wiki|Forum] provides a hyperlink on the author of each
12 post that goes to a timeline of recent posts by that same author.
13
--- www/changes.wiki
+++ www/changes.wiki
@@ -3,10 +3,11 @@
3 <a name='v2_16'></a>
4 <h2>Changes for Version 2.16 (pending)</h2>
5 * <b>Security:</b> Fix the client-side TLS so that it verifies that the
6 server hostname matches its certificate. <b>Upgrading to
7 the patch is recommended.</b>
8 * Added the [./patchcmd.md|fossil patch] command.
9 * The [/brlist|/brlist web page] allows the user to
10 select multiple branches to be displayed together in a single
11 timeline.
12 * The [./forum.wiki|Forum] provides a hyperlink on the author of each
13 post that goes to a timeline of recent posts by that same author.
14
--- www/changes.wiki
+++ www/changes.wiki
@@ -3,10 +3,11 @@
33
<a name='v2_16'></a>
44
<h2>Changes for Version 2.16 (pending)</h2>
55
* <b>Security:</b> Fix the client-side TLS so that it verifies that the
66
server hostname matches its certificate. <b>Upgrading to
77
the patch is recommended.</b>
8
+ * Added the [./patchcmd.md|fossil patch] command.
89
* The [/brlist|/brlist web page] allows the user to
910
select multiple branches to be displayed together in a single
1011
timeline.
1112
* The [./forum.wiki|Forum] provides a hyperlink on the author of each
1213
post that goes to a timeline of recent posts by that same author.
1314
--- www/changes.wiki
+++ www/changes.wiki
@@ -3,10 +3,11 @@
3 <a name='v2_16'></a>
4 <h2>Changes for Version 2.16 (pending)</h2>
5 * <b>Security:</b> Fix the client-side TLS so that it verifies that the
6 server hostname matches its certificate. <b>Upgrading to
7 the patch is recommended.</b>
 
8 * The [/brlist|/brlist web page] allows the user to
9 select multiple branches to be displayed together in a single
10 timeline.
11 * The [./forum.wiki|Forum] provides a hyperlink on the author of each
12 post that goes to a timeline of recent posts by that same author.
13
--- www/changes.wiki
+++ www/changes.wiki
@@ -3,10 +3,11 @@
3 <a name='v2_16'></a>
4 <h2>Changes for Version 2.16 (pending)</h2>
5 * <b>Security:</b> Fix the client-side TLS so that it verifies that the
6 server hostname matches its certificate. <b>Upgrading to
7 the patch is recommended.</b>
8 * Added the [./patchcmd.md|fossil patch] command.
9 * The [/brlist|/brlist web page] allows the user to
10 select multiple branches to be displayed together in a single
11 timeline.
12 * The [./forum.wiki|Forum] provides a hyperlink on the author of each
13 post that goes to a timeline of recent posts by that same author.
14
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -83,10 +83,11 @@
8383
makefile.wiki {The Fossil Build Process}
8484
mirrorlimitations.md {Limitations On Git Mirrors}
8585
mirrortogithub.md {How To Mirror A Fossil Repository On GitHub}
8686
/md_rules {Markdown Formatting Rules}
8787
newrepo.wiki {How To Create A New Fossil Repository}
88
+ patchcmd.md {The "fossil patch" Command}
8889
password.wiki {Password Management And Authentication}
8990
pikchr.md {The Pikchr Diagram Language}
9091
pop.wiki {Principles Of Operation}
9192
private.wiki {Creating, Syncing, and Deleting Private Branches}
9293
qandc.wiki {Questions And Criticisms}
9394
9495
ADDED www/patchcmd.md
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -83,10 +83,11 @@
83 makefile.wiki {The Fossil Build Process}
84 mirrorlimitations.md {Limitations On Git Mirrors}
85 mirrortogithub.md {How To Mirror A Fossil Repository On GitHub}
86 /md_rules {Markdown Formatting Rules}
87 newrepo.wiki {How To Create A New Fossil Repository}
 
88 password.wiki {Password Management And Authentication}
89 pikchr.md {The Pikchr Diagram Language}
90 pop.wiki {Principles Of Operation}
91 private.wiki {Creating, Syncing, and Deleting Private Branches}
92 qandc.wiki {Questions And Criticisms}
93
94 DDED www/patchcmd.md
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -83,10 +83,11 @@
83 makefile.wiki {The Fossil Build Process}
84 mirrorlimitations.md {Limitations On Git Mirrors}
85 mirrortogithub.md {How To Mirror A Fossil Repository On GitHub}
86 /md_rules {Markdown Formatting Rules}
87 newrepo.wiki {How To Create A New Fossil Repository}
88 patchcmd.md {The "fossil patch" Command}
89 password.wiki {Password Management And Authentication}
90 pikchr.md {The Pikchr Diagram Language}
91 pop.wiki {Principles Of Operation}
92 private.wiki {Creating, Syncing, and Deleting Private Branches}
93 qandc.wiki {Questions And Criticisms}
94
95 DDED www/patchcmd.md
--- a/www/patchcmd.md
+++ b/www/patchcmd.md
@@ -0,0 +1,21 @@
1
+# The "fossil patch" command?cmd=
2
+The "[fossil patch](/help/patch)" command is designed to transfer
3
+uncommitted changes from one check-out to another, including transfering
4
+those changes to other machines.
5
+
6
+For example, if you are working on a Windows desktop and you want to
7
+test your changes on a Linux server before you commit, you can use the
8
+"fossil patch push" command to make a copy of all your changes, where they can be tested.on>the
9
+remote Linux server:
10
+
11
+ fossil patch push linuxserver:/path/to"linuxserver" is the name of the remote machine and
12
+"/path/to/checkout" is an existing checkout directory for the same project
13
+on the remote machine.
14
+
15
+The "fossil patch push" command works by first creating a patch file,
16
+then transfering that patch file to the remote machine using "ssh", then
17
+applying the patch. If you do not have ssh available, you can break these
18
+steps apart as follows:
19
+
20
+ 1. On the local machine: `fossil patch create mypatch.patch`
21
+ 2. Move "mypatch.patch"
--- a/www/patchcmd.md
+++ b/www/patchcmd.md
@@ -0,0 +1,21 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/www/patchcmd.md
+++ b/www/patchcmd.md
@@ -0,0 +1,21 @@
1 # The "fossil patch" command?cmd=
2 The "[fossil patch](/help/patch)" command is designed to transfer
3 uncommitted changes from one check-out to another, including transfering
4 those changes to other machines.
5
6 For example, if you are working on a Windows desktop and you want to
7 test your changes on a Linux server before you commit, you can use the
8 "fossil patch push" command to make a copy of all your changes, where they can be tested.on>the
9 remote Linux server:
10
11 fossil patch push linuxserver:/path/to"linuxserver" is the name of the remote machine and
12 "/path/to/checkout" is an existing checkout directory for the same project
13 on the remote machine.
14
15 The "fossil patch push" command works by first creating a patch file,
16 then transfering that patch file to the remote machine using "ssh", then
17 applying the patch. If you do not have ssh available, you can break these
18 steps apart as follows:
19
20 1. On the local machine: `fossil patch create mypatch.patch`
21 2. Move "mypatch.patch"
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -106,10 +106,11 @@
106106
<li><a href="shunning.wiki">Shunning: Deleting Content From Fossil</a></li>
107107
<li><a href="../../../sitemap">Site Map</a></li>
108108
<li><a href="style.wiki">Source Code Style Guidelines</a></li>
109109
<li><a href="tech_overview.wiki">SQLite Databases Used By Fossil</a></li>
110110
<li><a href="backoffice.md">The "Backoffice" mechanism of Fossil</a></li>
111
+<li><a href="patchcmd.md">The "fossil patch" Command</a></li>
111112
<li><a href="blame.wiki">The Annotate/Blame Algorithm Of Fossil</a></li>
112113
<li><a href="defcsp.md">The Default Content Security Policy</a></li>
113114
<li><a href="fileedit-page.md">The fileedit Page</a></li>
114115
<li><a href="makefile.wiki">The Fossil Build Process</a></li>
115116
<li><a href="sync.wiki">The Fossil Sync Protocol</a></li>
116117
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -106,10 +106,11 @@
106 <li><a href="shunning.wiki">Shunning: Deleting Content From Fossil</a></li>
107 <li><a href="../../../sitemap">Site Map</a></li>
108 <li><a href="style.wiki">Source Code Style Guidelines</a></li>
109 <li><a href="tech_overview.wiki">SQLite Databases Used By Fossil</a></li>
110 <li><a href="backoffice.md">The "Backoffice" mechanism of Fossil</a></li>
 
111 <li><a href="blame.wiki">The Annotate/Blame Algorithm Of Fossil</a></li>
112 <li><a href="defcsp.md">The Default Content Security Policy</a></li>
113 <li><a href="fileedit-page.md">The fileedit Page</a></li>
114 <li><a href="makefile.wiki">The Fossil Build Process</a></li>
115 <li><a href="sync.wiki">The Fossil Sync Protocol</a></li>
116
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -106,10 +106,11 @@
106 <li><a href="shunning.wiki">Shunning: Deleting Content From Fossil</a></li>
107 <li><a href="../../../sitemap">Site Map</a></li>
108 <li><a href="style.wiki">Source Code Style Guidelines</a></li>
109 <li><a href="tech_overview.wiki">SQLite Databases Used By Fossil</a></li>
110 <li><a href="backoffice.md">The "Backoffice" mechanism of Fossil</a></li>
111 <li><a href="patchcmd.md">The "fossil patch" Command</a></li>
112 <li><a href="blame.wiki">The Annotate/Blame Algorithm Of Fossil</a></li>
113 <li><a href="defcsp.md">The Default Content Security Policy</a></li>
114 <li><a href="fileedit-page.md">The fileedit Page</a></li>
115 <li><a href="makefile.wiki">The Fossil Build Process</a></li>
116 <li><a href="sync.wiki">The Fossil Sync Protocol</a></li>
117

Keyboard Shortcuts

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