Fossil SCM

Move much interwiki code into a new source files "interwiki.c". Add the "fossil interwiki" command for managing the list of remote wikis.

drh 2020-08-23 01:43 interwiki
Commit 0875073359ec24d80dfb9881b57efe69aa9ec6653ed7cb20f5389c8e1df23ee7
Parent c959dde140adc6f…
7 files changed +26 +12 +1 +1 -93 +10 -4 +12 +10
+ src/interwiki.c ~ src/main.mk ~ src/makemake.tcl ~ src/wikiformat.c ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
A src/interwiki.c
+26
--- a/src/interwiki.c
+++ b/src/interwiki.c
@@ -0,0 +1,26 @@
1
+/*
2
+** Copyright (c) 2020 D. Richard Hipp
3
+**
4
+** This program is free software; you can redistribute it and/or
5
+** modify it under the terms of the Simplified BSD License (also
6
+** known as the "2-Clause Ljson_extract(value,'$.base'),"
7
+re; you can redist/*
8
+** Copyright (c) 2020 Dre; you can redist/*
9
+** Copyright (c) 202json_extract(value,'$.base'json_extract(value,'$.hash'json_extract(value,'$.wiki')json_extract(value,'$.base')json_extract(value,'$.base'),"
10
+ " json_extract(value,'$.hash'),"
11
+ " j"interwiki");
12
+}
13
+c) 2020 D. Richard Hipp
14
+**
15
+** This program is free software; you can redistribute it and/or
16
+** modify it under the terms of the Simplified BSD License (also
17
+** known as the "2-Clause Ljson_extract(value,'$.base'),"
18
+re; you can/*
19
+** Copyright (c) 2020 D. Richard Hipp
20
+**
21
+** This program is free software; you can redistribute it and/or
22
+** modify it under the terms of the Simplifi'interwiki:%finalize(&qbody_and_footerbody_and_footer("interwiki");
23
+}
24
+footestatic r(footer();
25
+}
26
+Setup ? }else{interwiki labels usR@15v,B:delete NAME1K@156,4:NAME1K@16T,4:NAME1y@17p,4:NAMEAL@19p,4:NAMES~@1KC,19sCyV;
--- a/src/interwiki.c
+++ b/src/interwiki.c
@@ -0,0 +1,26 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/src/interwiki.c
+++ b/src/interwiki.c
@@ -0,0 +1,26 @@
1 /*
2 ** Copyright (c) 2020 D. Richard Hipp
3 **
4 ** This program is free software; you can redistribute it and/or
5 ** modify it under the terms of the Simplified BSD License (also
6 ** known as the "2-Clause Ljson_extract(value,'$.base'),"
7 re; you can redist/*
8 ** Copyright (c) 2020 Dre; you can redist/*
9 ** Copyright (c) 202json_extract(value,'$.base'json_extract(value,'$.hash'json_extract(value,'$.wiki')json_extract(value,'$.base')json_extract(value,'$.base'),"
10 " json_extract(value,'$.hash'),"
11 " j"interwiki");
12 }
13 c) 2020 D. Richard Hipp
14 **
15 ** This program is free software; you can redistribute it and/or
16 ** modify it under the terms of the Simplified BSD License (also
17 ** known as the "2-Clause Ljson_extract(value,'$.base'),"
18 re; you can/*
19 ** Copyright (c) 2020 D. Richard Hipp
20 **
21 ** This program is free software; you can redistribute it and/or
22 ** modify it under the terms of the Simplifi'interwiki:%finalize(&qbody_and_footerbody_and_footer("interwiki");
23 }
24 footestatic r(footer();
25 }
26 Setup ? }else{interwiki labels usR@15v,B:delete NAME1K@156,4:NAME1K@16T,4:NAME1y@17p,4:NAMEAL@19p,4:NAMES~@1KC,19sCyV;
M src/main.mk
+12
--- src/main.mk
+++ src/main.mk
@@ -73,10 +73,11 @@
7373
 $(SRCDIR)/http_socket.c \
7474
 $(SRCDIR)/http_ssl.c \
7575
 $(SRCDIR)/http_transport.c \
7676
 $(SRCDIR)/import.c \
7777
 $(SRCDIR)/info.c \
78
+ $(SRCDIR)/interwiki.c \
7879
 $(SRCDIR)/json.c \
7980
 $(SRCDIR)/json_artifact.c \
8081
 $(SRCDIR)/json_branch.c \
8182
 $(SRCDIR)/json_config.c \
8283
 $(SRCDIR)/json_diff.c \
@@ -325,10 +326,11 @@
325326
 $(OBJDIR)/http_socket_.c \
326327
 $(OBJDIR)/http_ssl_.c \
327328
 $(OBJDIR)/http_transport_.c \
328329
 $(OBJDIR)/import_.c \
329330
 $(OBJDIR)/info_.c \
331
+ $(OBJDIR)/interwiki_.c \
330332
 $(OBJDIR)/json_.c \
331333
 $(OBJDIR)/json_artifact_.c \
332334
 $(OBJDIR)/json_branch_.c \
333335
 $(OBJDIR)/json_config_.c \
334336
 $(OBJDIR)/json_diff_.c \
@@ -470,10 +472,11 @@
470472
 $(OBJDIR)/http_socket.o \
471473
 $(OBJDIR)/http_ssl.o \
472474
 $(OBJDIR)/http_transport.o \
473475
 $(OBJDIR)/import.o \
474476
 $(OBJDIR)/info.o \
477
+ $(OBJDIR)/interwiki.o \
475478
 $(OBJDIR)/json.o \
476479
 $(OBJDIR)/json_artifact.o \
477480
 $(OBJDIR)/json_branch.o \
478481
 $(OBJDIR)/json_config.o \
479482
 $(OBJDIR)/json_diff.o \
@@ -805,10 +808,11 @@
805808
 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
806809
 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
807810
 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
808811
 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
809812
 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
813
+ $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
810814
 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
811815
 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
812816
 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
813817
 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
814818
 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
@@ -1367,10 +1371,18 @@
13671371
13681372
 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
13691373
 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
13701374
13711375
 $(OBJDIR)/info.h: $(OBJDIR)/headers
1376
+
1377
+$(OBJDIR)/interwiki_.c: $(SRCDIR)/interwiki.c $(OBJDIR)/translate
1378
+ $(OBJDIR)/translate $(SRCDIR)/interwiki.c >$@
1379
+
1380
+$(OBJDIR)/interwiki.o: $(OBJDIR)/interwiki_.c $(OBJDIR)/interwiki.h $(SRCDIR)/config.h
1381
+ $(XTCC) -o $(OBJDIR)/interwiki.o -c $(OBJDIR)/interwiki_.c
1382
+
1383
+$(OBJDIR)/interwiki.h: $(OBJDIR)/headers
13721384
13731385
 $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
13741386
 $(OBJDIR)/translate $(SRCDIR)/json.c >$@
13751387
13761388
 $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
13771389
--- src/main.mk
+++ src/main.mk
@@ -73,10 +73,11 @@
73 $(SRCDIR)/http_socket.c \
74 $(SRCDIR)/http_ssl.c \
75 $(SRCDIR)/http_transport.c \
76 $(SRCDIR)/import.c \
77 $(SRCDIR)/info.c \
 
78 $(SRCDIR)/json.c \
79 $(SRCDIR)/json_artifact.c \
80 $(SRCDIR)/json_branch.c \
81 $(SRCDIR)/json_config.c \
82 $(SRCDIR)/json_diff.c \
@@ -325,10 +326,11 @@
325 $(OBJDIR)/http_socket_.c \
326 $(OBJDIR)/http_ssl_.c \
327 $(OBJDIR)/http_transport_.c \
328 $(OBJDIR)/import_.c \
329 $(OBJDIR)/info_.c \
 
330 $(OBJDIR)/json_.c \
331 $(OBJDIR)/json_artifact_.c \
332 $(OBJDIR)/json_branch_.c \
333 $(OBJDIR)/json_config_.c \
334 $(OBJDIR)/json_diff_.c \
@@ -470,10 +472,11 @@
470 $(OBJDIR)/http_socket.o \
471 $(OBJDIR)/http_ssl.o \
472 $(OBJDIR)/http_transport.o \
473 $(OBJDIR)/import.o \
474 $(OBJDIR)/info.o \
 
475 $(OBJDIR)/json.o \
476 $(OBJDIR)/json_artifact.o \
477 $(OBJDIR)/json_branch.o \
478 $(OBJDIR)/json_config.o \
479 $(OBJDIR)/json_diff.o \
@@ -805,10 +808,11 @@
805 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
806 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
807 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
808 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
809 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
 
810 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
811 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
812 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
813 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
814 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
@@ -1367,10 +1371,18 @@
1367
1368 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
1369 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
1370
1371 $(OBJDIR)/info.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
1372
1373 $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
1374 $(OBJDIR)/translate $(SRCDIR)/json.c >$@
1375
1376 $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
1377
--- src/main.mk
+++ src/main.mk
@@ -73,10 +73,11 @@
73 $(SRCDIR)/http_socket.c \
74 $(SRCDIR)/http_ssl.c \
75 $(SRCDIR)/http_transport.c \
76 $(SRCDIR)/import.c \
77 $(SRCDIR)/info.c \
78 $(SRCDIR)/interwiki.c \
79 $(SRCDIR)/json.c \
80 $(SRCDIR)/json_artifact.c \
81 $(SRCDIR)/json_branch.c \
82 $(SRCDIR)/json_config.c \
83 $(SRCDIR)/json_diff.c \
@@ -325,10 +326,11 @@
326 $(OBJDIR)/http_socket_.c \
327 $(OBJDIR)/http_ssl_.c \
328 $(OBJDIR)/http_transport_.c \
329 $(OBJDIR)/import_.c \
330 $(OBJDIR)/info_.c \
331 $(OBJDIR)/interwiki_.c \
332 $(OBJDIR)/json_.c \
333 $(OBJDIR)/json_artifact_.c \
334 $(OBJDIR)/json_branch_.c \
335 $(OBJDIR)/json_config_.c \
336 $(OBJDIR)/json_diff_.c \
@@ -470,10 +472,11 @@
472 $(OBJDIR)/http_socket.o \
473 $(OBJDIR)/http_ssl.o \
474 $(OBJDIR)/http_transport.o \
475 $(OBJDIR)/import.o \
476 $(OBJDIR)/info.o \
477 $(OBJDIR)/interwiki.o \
478 $(OBJDIR)/json.o \
479 $(OBJDIR)/json_artifact.o \
480 $(OBJDIR)/json_branch.o \
481 $(OBJDIR)/json_config.o \
482 $(OBJDIR)/json_diff.o \
@@ -805,10 +808,11 @@
808 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
809 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
810 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
811 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
812 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
813 $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
814 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
815 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
816 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
817 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
818 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
@@ -1367,10 +1371,18 @@
1371
1372 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
1373 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
1374
1375 $(OBJDIR)/info.h: $(OBJDIR)/headers
1376
1377 $(OBJDIR)/interwiki_.c: $(SRCDIR)/interwiki.c $(OBJDIR)/translate
1378 $(OBJDIR)/translate $(SRCDIR)/interwiki.c >$@
1379
1380 $(OBJDIR)/interwiki.o: $(OBJDIR)/interwiki_.c $(OBJDIR)/interwiki.h $(SRCDIR)/config.h
1381 $(XTCC) -o $(OBJDIR)/interwiki.o -c $(OBJDIR)/interwiki_.c
1382
1383 $(OBJDIR)/interwiki.h: $(OBJDIR)/headers
1384
1385 $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
1386 $(OBJDIR)/translate $(SRCDIR)/json.c >$@
1387
1388 $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
1389
M src/makemake.tcl
+1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -83,10 +83,11 @@
8383
 http
8484
 http_socket
8585
 http_transport
8686
 import
8787
 info
88
+ interwiki
8889
 json
8990
 json_artifact
9091
 json_branch
9192
 json_config
9293
 json_diff
9394
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -83,10 +83,11 @@
83 http
84 http_socket
85 http_transport
86 import
87 info
 
88 json
89 json_artifact
90 json_branch
91 json_config
92 json_diff
93
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -83,10 +83,11 @@
83 http
84 http_socket
85 http_transport
86 import
87 info
88 interwiki
89 json
90 json_artifact
91 json_branch
92 json_config
93 json_diff
94
M src/wikiformat.c
+1 -93
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1198,102 +1198,10 @@
11981198
 return 0;
11991199
 }
12001200
 return wikiOverrideHash;
12011201
 }
12021202
1203
-/*
1204
-** If zTarget is an interwiki link, return a pointer to a URL for that
1205
-** link target in memory obtained from fossil_malloc(). If zTarget is
1206
-** not a valid interwiki link, return NULL.
1207
-**
1208
-** An interwiki link target is of the form:
1209
-**
1210
-** Code:PageName
1211
-**
1212
-** "Code" is a brief code that describes the intended target wiki.
1213
-** The code must be ASCII alpha-numeric. No symbols or non-ascii
1214
-** characters are allows. Case is ignored for the code.
1215
-** Codes are assigned by "intermap:*" entries in the CONFIG table.
1216
-** The link is only valid if there exists an entry in the CONFIG table
1217
-** that matches "intermap:Code".
1218
-**
1219
-** Each value of each intermap:Code entry in the CONFIG table is a JSON
1220
-** object with the following fields:
1221
-**
1222
-** {
1223
-** "base": Base URL for the remote site.
1224
-** "hash": Append this to "base" for Hash targets.
1225
-** "wiki": Append this to "base" for Wiki targets.
1226
-** }
1227
-**
1228
-** If the remote wiki is Fossil, then the correct value for "hash"
1229
-** is "/info/" and the correct value for "wiki" is "/wiki?name=".
1230
-** If (for example) Wikipedia is the remote, then "hash" should be
1231
-** omitted and the correct value for "wiki" is "/wiki/".
1232
-**
1233
-** PageName is link name of the target wiki. Several different forms
1234
-** of PageName are recognized.
1235
-**
1236
-** Path If PageName is empty or begins with a "/" character, then
1237
-** it is a pathname that is appended to "base".
1238
-**
1239
-** Hash If PageName is a hexadecimal string of 4 or more
1240
-** characters, then PageName is appended to "hash" which
1241
-** is then appended to "base".
1242
-**
1243
-** Wiki If PageName does not start with "/" and it is
1244
-** not a hexadecimal string of 4 or more characters, then
1245
-** PageName is appended to "wiki" and that combination is
1246
-** appended to "base".
1247
-**
1248
-** See https://en.wikipedia.org/wiki/Interwiki_links for further information
1249
-** on interwiki links.
1250
-*/
1251
-static char *wiki_is_interwiki(const char *zTarget){
1252
- int nCode;
1253
- int i;
1254
- const char *zPage;
1255
- int nPage;
1256
- char *zUrl = 0;
1257
- Stmt q;
1258
- for(i=0; fossil_isalnum(zTarget[i]); i++){}
1259
- if( zTarget[i]!=':' ) return 0;
1260
- nCode = i;
1261
- if( nCode==4 && strncmp(zTarget,"wiki",4)==0 ) return 0;
1262
- zPage = zTarget + nCode + 1;
1263
- nPage = (int)strlen(zPage);
1264
- db_prepare(&q,
1265
- "SELECT json_extract(value,'$.base'),"
1266
- " json_extract(value,'$.hash'),"
1267
- " json_extract(value,'$.wiki')"
1268
- " FROM config WHERE name=lower('interwiki:%.*q')",
1269
- nCode, zTarget);
1270
- while( db_step(&q)==SQLITE_ROW ){
1271
- const char *zBase = db_column_text(&q,0);
1272
- if( zBase==0 || zBase[0]==0 ) break;
1273
- if( nPage==0 || zPage[0]=='/' ){
1274
- /* Path */
1275
- zUrl = mprintf("%s%s", zBase, zPage);
1276
- }else if( nPage>=4 && validate16(zPage,nPage) ){
1277
- /* Hash */
1278
- const char *zHash = db_column_text(&q,1);
1279
- if( zHash && zHash[0] ){
1280
- zUrl = mprintf("%s%s%s", zBase, zHash, zPage);
1281
- }
1282
- }else{
1283
- /* Wiki */
1284
- const char *zWiki = db_column_text(&q,2);
1285
- if( zWiki && zWiki[0] ){
1286
- zUrl = mprintf("%s%s%s", zBase, zWiki, zPage);
1287
- }
1288
- }
1289
- break;
1290
- }
1291
- db_finalize(&q);
1292
- return zUrl;
1293
-}
1294
-
12951203
 /*
12961204
 ** Resolve a hyperlink. The zTarget argument is the content of the [...]
12971205
 ** in the wiki. Append to the output string whatever text is appropriate
12981206
 ** for opening the hyperlink. Write into zClose[0...nClose-1] text that will
12991207
 ** close the markup.
@@ -1398,11 +1306,11 @@
13981306
 blob_appendf(pOut, "%z[",xhref(zExtraNS, "%R/info/%s", zTarget));
13991307
 zTerm = "]</a>";
14001308
 }else{
14011309
 zTerm = "";
14021310
 }
1403
- }else if( (zRemote = wiki_is_interwiki(zTarget))!=0 ){
1311
+ }else if( (zRemote = interwiki_url(zTarget))!=0 ){
14041312
 blob_appendf(pOut, "<a href=\"%z\"%s>", zRemote, zExtra);
14051313
 zTerm = "</a>";
14061314
 }else if( (z = validWikiPageName(mFlags, zTarget))!=0 ){
14071315
 /* The link is to a valid wiki page name */
14081316
 const char *zOverride = wiki_is_overridden(zTarget);
14091317
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1198,102 +1198,10 @@
1198 return 0;
1199 }
1200 return wikiOverrideHash;
1201 }
1202
1203 /*
1204 ** If zTarget is an interwiki link, return a pointer to a URL for that
1205 ** link target in memory obtained from fossil_malloc(). If zTarget is
1206 ** not a valid interwiki link, return NULL.
1207 **
1208 ** An interwiki link target is of the form:
1209 **
1210 ** Code:PageName
1211 **
1212 ** "Code" is a brief code that describes the intended target wiki.
1213 ** The code must be ASCII alpha-numeric. No symbols or non-ascii
1214 ** characters are allows. Case is ignored for the code.
1215 ** Codes are assigned by "intermap:*" entries in the CONFIG table.
1216 ** The link is only valid if there exists an entry in the CONFIG table
1217 ** that matches "intermap:Code".
1218 **
1219 ** Each value of each intermap:Code entry in the CONFIG table is a JSON
1220 ** object with the following fields:
1221 **
1222 ** {
1223 ** "base": Base URL for the remote site.
1224 ** "hash": Append this to "base" for Hash targets.
1225 ** "wiki": Append this to "base" for Wiki targets.
1226 ** }
1227 **
1228 ** If the remote wiki is Fossil, then the correct value for "hash"
1229 ** is "/info/" and the correct value for "wiki" is "/wiki?name=".
1230 ** If (for example) Wikipedia is the remote, then "hash" should be
1231 ** omitted and the correct value for "wiki" is "/wiki/".
1232 **
1233 ** PageName is link name of the target wiki. Several different forms
1234 ** of PageName are recognized.
1235 **
1236 ** Path If PageName is empty or begins with a "/" character, then
1237 ** it is a pathname that is appended to "base".
1238 **
1239 ** Hash If PageName is a hexadecimal string of 4 or more
1240 ** characters, then PageName is appended to "hash" which
1241 ** is then appended to "base".
1242 **
1243 ** Wiki If PageName does not start with "/" and it is
1244 ** not a hexadecimal string of 4 or more characters, then
1245 ** PageName is appended to "wiki" and that combination is
1246 ** appended to "base".
1247 **
1248 ** See https://en.wikipedia.org/wiki/Interwiki_links for further information
1249 ** on interwiki links.
1250 */
1251 static char *wiki_is_interwiki(const char *zTarget){
1252 int nCode;
1253 int i;
1254 const char *zPage;
1255 int nPage;
1256 char *zUrl = 0;
1257 Stmt q;
1258 for(i=0; fossil_isalnum(zTarget[i]); i++){}
1259 if( zTarget[i]!=':' ) return 0;
1260 nCode = i;
1261 if( nCode==4 && strncmp(zTarget,"wiki",4)==0 ) return 0;
1262 zPage = zTarget + nCode + 1;
1263 nPage = (int)strlen(zPage);
1264 db_prepare(&q,
1265 "SELECT json_extract(value,'$.base'),"
1266 " json_extract(value,'$.hash'),"
1267 " json_extract(value,'$.wiki')"
1268 " FROM config WHERE name=lower('interwiki:%.*q')",
1269 nCode, zTarget);
1270 while( db_step(&q)==SQLITE_ROW ){
1271 const char *zBase = db_column_text(&q,0);
1272 if( zBase==0 || zBase[0]==0 ) break;
1273 if( nPage==0 || zPage[0]=='/' ){
1274 /* Path */
1275 zUrl = mprintf("%s%s", zBase, zPage);
1276 }else if( nPage>=4 && validate16(zPage,nPage) ){
1277 /* Hash */
1278 const char *zHash = db_column_text(&q,1);
1279 if( zHash && zHash[0] ){
1280 zUrl = mprintf("%s%s%s", zBase, zHash, zPage);
1281 }
1282 }else{
1283 /* Wiki */
1284 const char *zWiki = db_column_text(&q,2);
1285 if( zWiki && zWiki[0] ){
1286 zUrl = mprintf("%s%s%s", zBase, zWiki, zPage);
1287 }
1288 }
1289 break;
1290 }
1291 db_finalize(&q);
1292 return zUrl;
1293 }
1294
1295 /*
1296 ** Resolve a hyperlink. The zTarget argument is the content of the [...]
1297 ** in the wiki. Append to the output string whatever text is appropriate
1298 ** for opening the hyperlink. Write into zClose[0...nClose-1] text that will
1299 ** close the markup.
@@ -1398,11 +1306,11 @@
1398 blob_appendf(pOut, "%z[",xhref(zExtraNS, "%R/info/%s", zTarget));
1399 zTerm = "]</a>";
1400 }else{
1401 zTerm = "";
1402 }
1403 }else if( (zRemote = wiki_is_interwiki(zTarget))!=0 ){
1404 blob_appendf(pOut, "<a href=\"%z\"%s>", zRemote, zExtra);
1405 zTerm = "</a>";
1406 }else if( (z = validWikiPageName(mFlags, zTarget))!=0 ){
1407 /* The link is to a valid wiki page name */
1408 const char *zOverride = wiki_is_overridden(zTarget);
1409
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1198,102 +1198,10 @@
1198 return 0;
1199 }
1200 return wikiOverrideHash;
1201 }
1202
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1203 /*
1204 ** Resolve a hyperlink. The zTarget argument is the content of the [...]
1205 ** in the wiki. Append to the output string whatever text is appropriate
1206 ** for opening the hyperlink. Write into zClose[0...nClose-1] text that will
1207 ** close the markup.
@@ -1398,11 +1306,11 @@
1306 blob_appendf(pOut, "%z[",xhref(zExtraNS, "%R/info/%s", zTarget));
1307 zTerm = "]</a>";
1308 }else{
1309 zTerm = "";
1310 }
1311 }else if( (zRemote = interwiki_url(zTarget))!=0 ){
1312 blob_appendf(pOut, "<a href=\"%z\"%s>", zRemote, zExtra);
1313 zTerm = "</a>";
1314 }else if( (z = validWikiPageName(mFlags, zTarget))!=0 ){
1315 /* The link is to a valid wiki page name */
1316 const char *zOverride = wiki_is_overridden(zTarget);
1317
M win/Makefile.dmc
+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 checkin_.c checkout_.c clearsign_.c clone_.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 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 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 webmail_.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 checkin_.c checkout_.c clearsign_.c clone_.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 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 webmail_.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)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$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)\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)\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)\webmail$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)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$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)\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)\webmail$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 checkin checkout clearsign clone 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 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 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 webmail 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 checkin checkout clearsign clone 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 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 webmail 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 >> $@
@@ -475,10 +475,16 @@
475475
 $(OBJDIR)\info$O : info_.c info.h
476476
 $(TCC) -o$@ -c info_.c
477477
478478
 info_.c : $(SRCDIR)\info.c
479479
 +translate$E $** > $@
480
+
481
+$(OBJDIR)\interwiki$O : interwiki_.c interwiki.h
482
+ $(TCC) -o$@ -c interwiki_.c
483
+
484
+interwiki_.c : $(SRCDIR)\interwiki.c
485
+ +translate$E $** > $@
480486
481487
 $(OBJDIR)\json$O : json_.c json.h
482488
 $(TCC) -o$@ -c json_.c
483489
484490
 json_.c : $(SRCDIR)\json.c
@@ -981,7 +987,7 @@
981987
982988
 zip_.c : $(SRCDIR)\zip.c
983989
 +translate$E $** > $@
984990
985991
 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
986
- +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 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 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 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 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 webmail_.c:webmail.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
992
+ +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 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 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 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 webmail_.c:webmail.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
987993
 @copy /Y nul: headers
988994
--- 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 checkin_.c checkout_.c clearsign_.c clone_.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 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 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 webmail_.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)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$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)\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)\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)\webmail$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 checkin checkout clearsign clone 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 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 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 webmail 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 >> $@
@@ -475,10 +475,16 @@
475 $(OBJDIR)\info$O : info_.c info.h
476 $(TCC) -o$@ -c info_.c
477
478 info_.c : $(SRCDIR)\info.c
479 +translate$E $** > $@
 
 
 
 
 
 
480
481 $(OBJDIR)\json$O : json_.c json.h
482 $(TCC) -o$@ -c json_.c
483
484 json_.c : $(SRCDIR)\json.c
@@ -981,7 +987,7 @@
981
982 zip_.c : $(SRCDIR)\zip.c
983 +translate$E $** > $@
984
985 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
986 +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 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 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 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 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 webmail_.c:webmail.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
987 @copy /Y nul: headers
988
--- 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 checkin_.c checkout_.c clearsign_.c clone_.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 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 webmail_.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)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$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)\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)\webmail$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 checkin checkout clearsign clone 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 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 webmail 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 >> $@
@@ -475,10 +475,16 @@
475 $(OBJDIR)\info$O : info_.c info.h
476 $(TCC) -o$@ -c info_.c
477
478 info_.c : $(SRCDIR)\info.c
479 +translate$E $** > $@
480
481 $(OBJDIR)\interwiki$O : interwiki_.c interwiki.h
482 $(TCC) -o$@ -c interwiki_.c
483
484 interwiki_.c : $(SRCDIR)\interwiki.c
485 +translate$E $** > $@
486
487 $(OBJDIR)\json$O : json_.c json.h
488 $(TCC) -o$@ -c json_.c
489
490 json_.c : $(SRCDIR)\json.c
@@ -981,7 +987,7 @@
987
988 zip_.c : $(SRCDIR)\zip.c
989 +translate$E $** > $@
990
991 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
992 +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 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 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 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 webmail_.c:webmail.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
993 @copy /Y nul: headers
994
M win/Makefile.mingw
+12
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -485,10 +485,11 @@
485485
 $(SRCDIR)/http_socket.c \
486486
 $(SRCDIR)/http_ssl.c \
487487
 $(SRCDIR)/http_transport.c \
488488
 $(SRCDIR)/import.c \
489489
 $(SRCDIR)/info.c \
490
+ $(SRCDIR)/interwiki.c \
490491
 $(SRCDIR)/json.c \
491492
 $(SRCDIR)/json_artifact.c \
492493
 $(SRCDIR)/json_branch.c \
493494
 $(SRCDIR)/json_config.c \
494495
 $(SRCDIR)/json_diff.c \
@@ -737,10 +738,11 @@
737738
 $(OBJDIR)/http_socket_.c \
738739
 $(OBJDIR)/http_ssl_.c \
739740
 $(OBJDIR)/http_transport_.c \
740741
 $(OBJDIR)/import_.c \
741742
 $(OBJDIR)/info_.c \
743
+ $(OBJDIR)/interwiki_.c \
742744
 $(OBJDIR)/json_.c \
743745
 $(OBJDIR)/json_artifact_.c \
744746
 $(OBJDIR)/json_branch_.c \
745747
 $(OBJDIR)/json_config_.c \
746748
 $(OBJDIR)/json_diff_.c \
@@ -882,10 +884,11 @@
882884
 $(OBJDIR)/http_socket.o \
883885
 $(OBJDIR)/http_ssl.o \
884886
 $(OBJDIR)/http_transport.o \
885887
 $(OBJDIR)/import.o \
886888
 $(OBJDIR)/info.o \
889
+ $(OBJDIR)/interwiki.o \
887890
 $(OBJDIR)/json.o \
888891
 $(OBJDIR)/json_artifact.o \
889892
 $(OBJDIR)/json_branch.o \
890893
 $(OBJDIR)/json_config.o \
891894
 $(OBJDIR)/json_diff.o \
@@ -1242,10 +1245,11 @@
12421245
 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
12431246
 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
12441247
 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
12451248
 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
12461249
 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1250
+ $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
12471251
 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
12481252
 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
12491253
 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
12501254
 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
12511255
 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
@@ -1806,10 +1810,18 @@
18061810
18071811
 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
18081812
 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
18091813
18101814
 $(OBJDIR)/info.h: $(OBJDIR)/headers
1815
+
1816
+$(OBJDIR)/interwiki_.c: $(SRCDIR)/interwiki.c $(TRANSLATE)
1817
+ $(TRANSLATE) $(SRCDIR)/interwiki.c >$@
1818
+
1819
+$(OBJDIR)/interwiki.o: $(OBJDIR)/interwiki_.c $(OBJDIR)/interwiki.h $(SRCDIR)/config.h
1820
+ $(XTCC) -o $(OBJDIR)/interwiki.o -c $(OBJDIR)/interwiki_.c
1821
+
1822
+$(OBJDIR)/interwiki.h: $(OBJDIR)/headers
18111823
18121824
 $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(TRANSLATE)
18131825
 $(TRANSLATE) $(SRCDIR)/json.c >$@
18141826
18151827
 $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
18161828
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -485,10 +485,11 @@
485 $(SRCDIR)/http_socket.c \
486 $(SRCDIR)/http_ssl.c \
487 $(SRCDIR)/http_transport.c \
488 $(SRCDIR)/import.c \
489 $(SRCDIR)/info.c \
 
490 $(SRCDIR)/json.c \
491 $(SRCDIR)/json_artifact.c \
492 $(SRCDIR)/json_branch.c \
493 $(SRCDIR)/json_config.c \
494 $(SRCDIR)/json_diff.c \
@@ -737,10 +738,11 @@
737 $(OBJDIR)/http_socket_.c \
738 $(OBJDIR)/http_ssl_.c \
739 $(OBJDIR)/http_transport_.c \
740 $(OBJDIR)/import_.c \
741 $(OBJDIR)/info_.c \
 
742 $(OBJDIR)/json_.c \
743 $(OBJDIR)/json_artifact_.c \
744 $(OBJDIR)/json_branch_.c \
745 $(OBJDIR)/json_config_.c \
746 $(OBJDIR)/json_diff_.c \
@@ -882,10 +884,11 @@
882 $(OBJDIR)/http_socket.o \
883 $(OBJDIR)/http_ssl.o \
884 $(OBJDIR)/http_transport.o \
885 $(OBJDIR)/import.o \
886 $(OBJDIR)/info.o \
 
887 $(OBJDIR)/json.o \
888 $(OBJDIR)/json_artifact.o \
889 $(OBJDIR)/json_branch.o \
890 $(OBJDIR)/json_config.o \
891 $(OBJDIR)/json_diff.o \
@@ -1242,10 +1245,11 @@
1242 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1243 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1244 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1245 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1246 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
 
1247 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1248 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1249 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1250 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1251 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
@@ -1806,10 +1810,18 @@
1806
1807 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
1808 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
1809
1810 $(OBJDIR)/info.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
1811
1812 $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(TRANSLATE)
1813 $(TRANSLATE) $(SRCDIR)/json.c >$@
1814
1815 $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
1816
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -485,10 +485,11 @@
485 $(SRCDIR)/http_socket.c \
486 $(SRCDIR)/http_ssl.c \
487 $(SRCDIR)/http_transport.c \
488 $(SRCDIR)/import.c \
489 $(SRCDIR)/info.c \
490 $(SRCDIR)/interwiki.c \
491 $(SRCDIR)/json.c \
492 $(SRCDIR)/json_artifact.c \
493 $(SRCDIR)/json_branch.c \
494 $(SRCDIR)/json_config.c \
495 $(SRCDIR)/json_diff.c \
@@ -737,10 +738,11 @@
738 $(OBJDIR)/http_socket_.c \
739 $(OBJDIR)/http_ssl_.c \
740 $(OBJDIR)/http_transport_.c \
741 $(OBJDIR)/import_.c \
742 $(OBJDIR)/info_.c \
743 $(OBJDIR)/interwiki_.c \
744 $(OBJDIR)/json_.c \
745 $(OBJDIR)/json_artifact_.c \
746 $(OBJDIR)/json_branch_.c \
747 $(OBJDIR)/json_config_.c \
748 $(OBJDIR)/json_diff_.c \
@@ -882,10 +884,11 @@
884 $(OBJDIR)/http_socket.o \
885 $(OBJDIR)/http_ssl.o \
886 $(OBJDIR)/http_transport.o \
887 $(OBJDIR)/import.o \
888 $(OBJDIR)/info.o \
889 $(OBJDIR)/interwiki.o \
890 $(OBJDIR)/json.o \
891 $(OBJDIR)/json_artifact.o \
892 $(OBJDIR)/json_branch.o \
893 $(OBJDIR)/json_config.o \
894 $(OBJDIR)/json_diff.o \
@@ -1242,10 +1245,11 @@
1245 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1246 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1247 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1248 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1249 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1250 $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1251 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1252 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1253 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1254 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1255 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
@@ -1806,10 +1810,18 @@
1810
1811 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
1812 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
1813
1814 $(OBJDIR)/info.h: $(OBJDIR)/headers
1815
1816 $(OBJDIR)/interwiki_.c: $(SRCDIR)/interwiki.c $(TRANSLATE)
1817 $(TRANSLATE) $(SRCDIR)/interwiki.c >$@
1818
1819 $(OBJDIR)/interwiki.o: $(OBJDIR)/interwiki_.c $(OBJDIR)/interwiki.h $(SRCDIR)/config.h
1820 $(XTCC) -o $(OBJDIR)/interwiki.o -c $(OBJDIR)/interwiki_.c
1821
1822 $(OBJDIR)/interwiki.h: $(OBJDIR)/headers
1823
1824 $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(TRANSLATE)
1825 $(TRANSLATE) $(SRCDIR)/json.c >$@
1826
1827 $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
1828
M win/Makefile.msc
+10
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -407,10 +407,11 @@
407407
 "$(OX)\http_socket_.c" \
408408
 "$(OX)\http_ssl_.c" \
409409
 "$(OX)\http_transport_.c" \
410410
 "$(OX)\import_.c" \
411411
 "$(OX)\info_.c" \
412
+ "$(OX)\interwiki_.c" \
412413
 "$(OX)\json_.c" \
413414
 "$(OX)\json_artifact_.c" \
414415
 "$(OX)\json_branch_.c" \
415416
 "$(OX)\json_config_.c" \
416417
 "$(OX)\json_diff_.c" \
@@ -658,10 +659,11 @@
658659
 "$(OX)\http_socket$O" \
659660
 "$(OX)\http_ssl$O" \
660661
 "$(OX)\http_transport$O" \
661662
 "$(OX)\import$O" \
662663
 "$(OX)\info$O" \
664
+ "$(OX)\interwiki$O" \
663665
 "$(OX)\json$O" \
664666
 "$(OX)\json_artifact$O" \
665667
 "$(OX)\json_branch$O" \
666668
 "$(OX)\json_config$O" \
667669
 "$(OX)\json_diff$O" \
@@ -884,10 +886,11 @@
884886
 echo "$(OX)\http_socket.obj" >> $@
885887
 echo "$(OX)\http_ssl.obj" >> $@
886888
 echo "$(OX)\http_transport.obj" >> $@
887889
 echo "$(OX)\import.obj" >> $@
888890
 echo "$(OX)\info.obj" >> $@
891
+ echo "$(OX)\interwiki.obj" >> $@
889892
 echo "$(OX)\json.obj" >> $@
890893
 echo "$(OX)\json_artifact.obj" >> $@
891894
 echo "$(OX)\json_branch.obj" >> $@
892895
 echo "$(OX)\json_config.obj" >> $@
893896
 echo "$(OX)\json_diff.obj" >> $@
@@ -1548,10 +1551,16 @@
15481551
 "$(OX)\info$O" : "$(OX)\info_.c" "$(OX)\info.h"
15491552
 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info_.c"
15501553
15511554
 "$(OX)\info_.c" : "$(SRCDIR)\info.c"
15521555
 "$(OBJDIR)\translate$E" $** > $@
1556
+
1557
+"$(OX)\interwiki$O" : "$(OX)\interwiki_.c" "$(OX)\interwiki.h"
1558
+ $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki_.c"
1559
+
1560
+"$(OX)\interwiki_.c" : "$(SRCDIR)\interwiki.c"
1561
+ "$(OBJDIR)\translate$E" $** > $@
15531562
15541563
 "$(OX)\json$O" : "$(OX)\json_.c" "$(OX)\json.h"
15551564
 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_.c"
15561565
15571566
 "$(OX)\json_.c" : "$(SRCDIR)\json.c"
@@ -2116,10 +2125,11 @@
21162125
 "$(OX)\http_socket_.c":"$(OX)\http_socket.h" \
21172126
 "$(OX)\http_ssl_.c":"$(OX)\http_ssl.h" \
21182127
 "$(OX)\http_transport_.c":"$(OX)\http_transport.h" \
21192128
 "$(OX)\import_.c":"$(OX)\import.h" \
21202129
 "$(OX)\info_.c":"$(OX)\info.h" \
2130
+ "$(OX)\interwiki_.c":"$(OX)\interwiki.h" \
21212131
 "$(OX)\json_.c":"$(OX)\json.h" \
21222132
 "$(OX)\json_artifact_.c":"$(OX)\json_artifact.h" \
21232133
 "$(OX)\json_branch_.c":"$(OX)\json_branch.h" \
21242134
 "$(OX)\json_config_.c":"$(OX)\json_config.h" \
21252135
 "$(OX)\json_diff_.c":"$(OX)\json_diff.h" \
21262136
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -407,10 +407,11 @@
407 "$(OX)\http_socket_.c" \
408 "$(OX)\http_ssl_.c" \
409 "$(OX)\http_transport_.c" \
410 "$(OX)\import_.c" \
411 "$(OX)\info_.c" \
 
412 "$(OX)\json_.c" \
413 "$(OX)\json_artifact_.c" \
414 "$(OX)\json_branch_.c" \
415 "$(OX)\json_config_.c" \
416 "$(OX)\json_diff_.c" \
@@ -658,10 +659,11 @@
658 "$(OX)\http_socket$O" \
659 "$(OX)\http_ssl$O" \
660 "$(OX)\http_transport$O" \
661 "$(OX)\import$O" \
662 "$(OX)\info$O" \
 
663 "$(OX)\json$O" \
664 "$(OX)\json_artifact$O" \
665 "$(OX)\json_branch$O" \
666 "$(OX)\json_config$O" \
667 "$(OX)\json_diff$O" \
@@ -884,10 +886,11 @@
884 echo "$(OX)\http_socket.obj" >> $@
885 echo "$(OX)\http_ssl.obj" >> $@
886 echo "$(OX)\http_transport.obj" >> $@
887 echo "$(OX)\import.obj" >> $@
888 echo "$(OX)\info.obj" >> $@
 
889 echo "$(OX)\json.obj" >> $@
890 echo "$(OX)\json_artifact.obj" >> $@
891 echo "$(OX)\json_branch.obj" >> $@
892 echo "$(OX)\json_config.obj" >> $@
893 echo "$(OX)\json_diff.obj" >> $@
@@ -1548,10 +1551,16 @@
1548 "$(OX)\info$O" : "$(OX)\info_.c" "$(OX)\info.h"
1549 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info_.c"
1550
1551 "$(OX)\info_.c" : "$(SRCDIR)\info.c"
1552 "$(OBJDIR)\translate$E" $** > $@
 
 
 
 
 
 
1553
1554 "$(OX)\json$O" : "$(OX)\json_.c" "$(OX)\json.h"
1555 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_.c"
1556
1557 "$(OX)\json_.c" : "$(SRCDIR)\json.c"
@@ -2116,10 +2125,11 @@
2116 "$(OX)\http_socket_.c":"$(OX)\http_socket.h" \
2117 "$(OX)\http_ssl_.c":"$(OX)\http_ssl.h" \
2118 "$(OX)\http_transport_.c":"$(OX)\http_transport.h" \
2119 "$(OX)\import_.c":"$(OX)\import.h" \
2120 "$(OX)\info_.c":"$(OX)\info.h" \
 
2121 "$(OX)\json_.c":"$(OX)\json.h" \
2122 "$(OX)\json_artifact_.c":"$(OX)\json_artifact.h" \
2123 "$(OX)\json_branch_.c":"$(OX)\json_branch.h" \
2124 "$(OX)\json_config_.c":"$(OX)\json_config.h" \
2125 "$(OX)\json_diff_.c":"$(OX)\json_diff.h" \
2126
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -407,10 +407,11 @@
407 "$(OX)\http_socket_.c" \
408 "$(OX)\http_ssl_.c" \
409 "$(OX)\http_transport_.c" \
410 "$(OX)\import_.c" \
411 "$(OX)\info_.c" \
412 "$(OX)\interwiki_.c" \
413 "$(OX)\json_.c" \
414 "$(OX)\json_artifact_.c" \
415 "$(OX)\json_branch_.c" \
416 "$(OX)\json_config_.c" \
417 "$(OX)\json_diff_.c" \
@@ -658,10 +659,11 @@
659 "$(OX)\http_socket$O" \
660 "$(OX)\http_ssl$O" \
661 "$(OX)\http_transport$O" \
662 "$(OX)\import$O" \
663 "$(OX)\info$O" \
664 "$(OX)\interwiki$O" \
665 "$(OX)\json$O" \
666 "$(OX)\json_artifact$O" \
667 "$(OX)\json_branch$O" \
668 "$(OX)\json_config$O" \
669 "$(OX)\json_diff$O" \
@@ -884,10 +886,11 @@
886 echo "$(OX)\http_socket.obj" >> $@
887 echo "$(OX)\http_ssl.obj" >> $@
888 echo "$(OX)\http_transport.obj" >> $@
889 echo "$(OX)\import.obj" >> $@
890 echo "$(OX)\info.obj" >> $@
891 echo "$(OX)\interwiki.obj" >> $@
892 echo "$(OX)\json.obj" >> $@
893 echo "$(OX)\json_artifact.obj" >> $@
894 echo "$(OX)\json_branch.obj" >> $@
895 echo "$(OX)\json_config.obj" >> $@
896 echo "$(OX)\json_diff.obj" >> $@
@@ -1548,10 +1551,16 @@
1551 "$(OX)\info$O" : "$(OX)\info_.c" "$(OX)\info.h"
1552 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info_.c"
1553
1554 "$(OX)\info_.c" : "$(SRCDIR)\info.c"
1555 "$(OBJDIR)\translate$E" $** > $@
1556
1557 "$(OX)\interwiki$O" : "$(OX)\interwiki_.c" "$(OX)\interwiki.h"
1558 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki_.c"
1559
1560 "$(OX)\interwiki_.c" : "$(SRCDIR)\interwiki.c"
1561 "$(OBJDIR)\translate$E" $** > $@
1562
1563 "$(OX)\json$O" : "$(OX)\json_.c" "$(OX)\json.h"
1564 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_.c"
1565
1566 "$(OX)\json_.c" : "$(SRCDIR)\json.c"
@@ -2116,10 +2125,11 @@
2125 "$(OX)\http_socket_.c":"$(OX)\http_socket.h" \
2126 "$(OX)\http_ssl_.c":"$(OX)\http_ssl.h" \
2127 "$(OX)\http_transport_.c":"$(OX)\http_transport.h" \
2128 "$(OX)\import_.c":"$(OX)\import.h" \
2129 "$(OX)\info_.c":"$(OX)\info.h" \
2130 "$(OX)\interwiki_.c":"$(OX)\interwiki.h" \
2131 "$(OX)\json_.c":"$(OX)\json.h" \
2132 "$(OX)\json_artifact_.c":"$(OX)\json_artifact.h" \
2133 "$(OX)\json_branch_.c":"$(OX)\json_branch.h" \
2134 "$(OX)\json_config_.c":"$(OX)\json_config.h" \
2135 "$(OX)\json_diff_.c":"$(OX)\json_diff.h" \
2136

Keyboard Shortcuts

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