Fossil SCM

Add warning-policy setting functionality.

preben 2023-10-16 14:37 warn-on-merging-private-branch
Commit af73acb2df238ad3150614bd49ae743f49ec82745686a6eda41f12003247d592
Parent f812fedc44d8310…
8 files changed +15 -1 +12 +18 -14 +46 +1 +10 -4 +12 +10
~ src/checkin.c ~ src/main.mk ~ src/merge.c + src/warnpolicy.c ~ tools/makemake.tcl ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
M src/checkin.c
+15 -1
--- src/checkin.c
+++ src/checkin.c
@@ -2542,11 +2542,24 @@
25422542
 }
25432543
25442544
 /* Always exit the loop on the second pass */
25452545
 if( bRecheck ) break;
25462546
2547
-
2547
+ if( !forceFlag && issue_commit_warnings(info_tags_of_checkin(vid, 0)) ){
2548
+ Blob yn;
2549
+ char c = 'n';
2550
+ if( !noPrompt ){
2551
+ prompt_user("Continue anyway (y/N)? ", &yn);
2552
+ c = blob_str(&yn)[0];
2553
+ blob_reset(&yn);
2554
+ }
2555
+ if( c!='y' && c!='Y' ){
2556
+ db_end_transaction(1);
2557
+ return;
2558
+ }
2559
+ }
2560
+
25482561
 /* Get the check-in comment. This might involve prompting the
25492562
 ** user for the check-in comment, in which case we should resync
25502563
 ** to renew the check-in lock and repeat the checks for conflicts.
25512564
 */
25522565
 if( zComment ){
@@ -2889,11 +2902,12 @@
28892902
28902903
 if( !g.markPrivate ){
28912904
 int syncFlags = SYNC_PUSH | SYNC_PULL | SYNC_IFABLE;
28922905
 autosync_loop(syncFlags, 0, "commit");
28932906
 }
2907
+ if( forceFlag ) issue_commit_warnings(info_tags_of_checkin(vid, 0));
28942908
 if( count_nonbranch_children(vid)>1 ){
28952909
 fossil_print("**** warning: a fork has occurred *****\n");
28962910
 }else{
28972911
 leaf_ambiguity_warning(nvid,nvid);
28982912
 }
28992913
 }
29002914
--- src/checkin.c
+++ src/checkin.c
@@ -2542,11 +2542,24 @@
2542 }
2543
2544 /* Always exit the loop on the second pass */
2545 if( bRecheck ) break;
2546
2547
 
 
 
 
 
 
 
 
 
 
 
 
 
2548 /* Get the check-in comment. This might involve prompting the
2549 ** user for the check-in comment, in which case we should resync
2550 ** to renew the check-in lock and repeat the checks for conflicts.
2551 */
2552 if( zComment ){
@@ -2889,11 +2902,12 @@
2889
2890 if( !g.markPrivate ){
2891 int syncFlags = SYNC_PUSH | SYNC_PULL | SYNC_IFABLE;
2892 autosync_loop(syncFlags, 0, "commit");
2893 }
 
2894 if( count_nonbranch_children(vid)>1 ){
2895 fossil_print("**** warning: a fork has occurred *****\n");
2896 }else{
2897 leaf_ambiguity_warning(nvid,nvid);
2898 }
2899 }
2900
--- src/checkin.c
+++ src/checkin.c
@@ -2542,11 +2542,24 @@
2542 }
2543
2544 /* Always exit the loop on the second pass */
2545 if( bRecheck ) break;
2546
2547 if( !forceFlag && issue_commit_warnings(info_tags_of_checkin(vid, 0)) ){
2548 Blob yn;
2549 char c = 'n';
2550 if( !noPrompt ){
2551 prompt_user("Continue anyway (y/N)? ", &yn);
2552 c = blob_str(&yn)[0];
2553 blob_reset(&yn);
2554 }
2555 if( c!='y' && c!='Y' ){
2556 db_end_transaction(1);
2557 return;
2558 }
2559 }
2560
2561 /* Get the check-in comment. This might involve prompting the
2562 ** user for the check-in comment, in which case we should resync
2563 ** to renew the check-in lock and repeat the checks for conflicts.
2564 */
2565 if( zComment ){
@@ -2889,11 +2902,12 @@
2902
2903 if( !g.markPrivate ){
2904 int syncFlags = SYNC_PUSH | SYNC_PULL | SYNC_IFABLE;
2905 autosync_loop(syncFlags, 0, "commit");
2906 }
2907 if( forceFlag ) issue_commit_warnings(info_tags_of_checkin(vid, 0));
2908 if( count_nonbranch_children(vid)>1 ){
2909 fossil_print("**** warning: a fork has occurred *****\n");
2910 }else{
2911 leaf_ambiguity_warning(nvid,nvid);
2912 }
2913 }
2914
M src/main.mk
+12
--- src/main.mk
+++ src/main.mk
@@ -154,10 +154,11 @@
154154
 $(SRCDIR)/user.c \
155155
 $(SRCDIR)/utf8.c \
156156
 $(SRCDIR)/util.c \
157157
 $(SRCDIR)/verify.c \
158158
 $(SRCDIR)/vfile.c \
159
+ $(SRCDIR)/warnpolicy.c \
159160
 $(SRCDIR)/wiki.c \
160161
 $(SRCDIR)/wikiformat.c \
161162
 $(SRCDIR)/winfile.c \
162163
 $(SRCDIR)/winhttp.c \
163164
 $(SRCDIR)/xfer.c \
@@ -413,10 +414,11 @@
413414
 $(OBJDIR)/user_.c \
414415
 $(OBJDIR)/utf8_.c \
415416
 $(OBJDIR)/util_.c \
416417
 $(OBJDIR)/verify_.c \
417418
 $(OBJDIR)/vfile_.c \
419
+ $(OBJDIR)/warnpolicy_.c \
418420
 $(OBJDIR)/wiki_.c \
419421
 $(OBJDIR)/wikiformat_.c \
420422
 $(OBJDIR)/winfile_.c \
421423
 $(OBJDIR)/winhttp_.c \
422424
 $(OBJDIR)/xfer_.c \
@@ -562,10 +564,11 @@
562564
 $(OBJDIR)/user.o \
563565
 $(OBJDIR)/utf8.o \
564566
 $(OBJDIR)/util.o \
565567
 $(OBJDIR)/verify.o \
566568
 $(OBJDIR)/vfile.o \
569
+ $(OBJDIR)/warnpolicy.o \
567570
 $(OBJDIR)/wiki.o \
568571
 $(OBJDIR)/wikiformat.o \
569572
 $(OBJDIR)/winfile.o \
570573
 $(OBJDIR)/winhttp.o \
571574
 $(OBJDIR)/xfer.o \
@@ -897,10 +900,11 @@
897900
 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
898901
 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
899902
 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
900903
 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
901904
 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
905
+ $(OBJDIR)/warnpolicy_.c:$(OBJDIR)/warnpolicy.h \
902906
 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
903907
 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
904908
 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
905909
 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
906910
 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
@@ -2031,10 +2035,18 @@
20312035
20322036
 $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h
20332037
 $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c
20342038
20352039
 $(OBJDIR)/vfile.h: $(OBJDIR)/headers
2040
+
2041
+$(OBJDIR)/warnpolicy_.c: $(SRCDIR)/warnpolicy.c $(OBJDIR)/translate
2042
+ $(OBJDIR)/translate $(SRCDIR)/warnpolicy.c >$@
2043
+
2044
+$(OBJDIR)/warnpolicy.o: $(OBJDIR)/warnpolicy_.c $(OBJDIR)/warnpolicy.h $(SRCDIR)/config.h
2045
+ $(XTCC) -o $(OBJDIR)/warnpolicy.o -c $(OBJDIR)/warnpolicy_.c
2046
+
2047
+$(OBJDIR)/warnpolicy.h: $(OBJDIR)/headers
20362048
20372049
 $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(OBJDIR)/translate
20382050
 $(OBJDIR)/translate $(SRCDIR)/wiki.c >$@
20392051
20402052
 $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h
20412053
--- src/main.mk
+++ src/main.mk
@@ -154,10 +154,11 @@
154 $(SRCDIR)/user.c \
155 $(SRCDIR)/utf8.c \
156 $(SRCDIR)/util.c \
157 $(SRCDIR)/verify.c \
158 $(SRCDIR)/vfile.c \
 
159 $(SRCDIR)/wiki.c \
160 $(SRCDIR)/wikiformat.c \
161 $(SRCDIR)/winfile.c \
162 $(SRCDIR)/winhttp.c \
163 $(SRCDIR)/xfer.c \
@@ -413,10 +414,11 @@
413 $(OBJDIR)/user_.c \
414 $(OBJDIR)/utf8_.c \
415 $(OBJDIR)/util_.c \
416 $(OBJDIR)/verify_.c \
417 $(OBJDIR)/vfile_.c \
 
418 $(OBJDIR)/wiki_.c \
419 $(OBJDIR)/wikiformat_.c \
420 $(OBJDIR)/winfile_.c \
421 $(OBJDIR)/winhttp_.c \
422 $(OBJDIR)/xfer_.c \
@@ -562,10 +564,11 @@
562 $(OBJDIR)/user.o \
563 $(OBJDIR)/utf8.o \
564 $(OBJDIR)/util.o \
565 $(OBJDIR)/verify.o \
566 $(OBJDIR)/vfile.o \
 
567 $(OBJDIR)/wiki.o \
568 $(OBJDIR)/wikiformat.o \
569 $(OBJDIR)/winfile.o \
570 $(OBJDIR)/winhttp.o \
571 $(OBJDIR)/xfer.o \
@@ -897,10 +900,11 @@
897 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
898 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
899 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
900 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
901 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
 
902 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
903 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
904 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
905 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
906 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
@@ -2031,10 +2035,18 @@
2031
2032 $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h
2033 $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c
2034
2035 $(OBJDIR)/vfile.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
2036
2037 $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(OBJDIR)/translate
2038 $(OBJDIR)/translate $(SRCDIR)/wiki.c >$@
2039
2040 $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h
2041
--- src/main.mk
+++ src/main.mk
@@ -154,10 +154,11 @@
154 $(SRCDIR)/user.c \
155 $(SRCDIR)/utf8.c \
156 $(SRCDIR)/util.c \
157 $(SRCDIR)/verify.c \
158 $(SRCDIR)/vfile.c \
159 $(SRCDIR)/warnpolicy.c \
160 $(SRCDIR)/wiki.c \
161 $(SRCDIR)/wikiformat.c \
162 $(SRCDIR)/winfile.c \
163 $(SRCDIR)/winhttp.c \
164 $(SRCDIR)/xfer.c \
@@ -413,10 +414,11 @@
414 $(OBJDIR)/user_.c \
415 $(OBJDIR)/utf8_.c \
416 $(OBJDIR)/util_.c \
417 $(OBJDIR)/verify_.c \
418 $(OBJDIR)/vfile_.c \
419 $(OBJDIR)/warnpolicy_.c \
420 $(OBJDIR)/wiki_.c \
421 $(OBJDIR)/wikiformat_.c \
422 $(OBJDIR)/winfile_.c \
423 $(OBJDIR)/winhttp_.c \
424 $(OBJDIR)/xfer_.c \
@@ -562,10 +564,11 @@
564 $(OBJDIR)/user.o \
565 $(OBJDIR)/utf8.o \
566 $(OBJDIR)/util.o \
567 $(OBJDIR)/verify.o \
568 $(OBJDIR)/vfile.o \
569 $(OBJDIR)/warnpolicy.o \
570 $(OBJDIR)/wiki.o \
571 $(OBJDIR)/wikiformat.o \
572 $(OBJDIR)/winfile.o \
573 $(OBJDIR)/winhttp.o \
574 $(OBJDIR)/xfer.o \
@@ -897,10 +900,11 @@
900 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
901 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
902 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
903 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
904 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
905 $(OBJDIR)/warnpolicy_.c:$(OBJDIR)/warnpolicy.h \
906 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
907 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
908 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
909 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
910 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
@@ -2031,10 +2035,18 @@
2035
2036 $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h
2037 $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c
2038
2039 $(OBJDIR)/vfile.h: $(OBJDIR)/headers
2040
2041 $(OBJDIR)/warnpolicy_.c: $(SRCDIR)/warnpolicy.c $(OBJDIR)/translate
2042 $(OBJDIR)/translate $(SRCDIR)/warnpolicy.c >$@
2043
2044 $(OBJDIR)/warnpolicy.o: $(OBJDIR)/warnpolicy_.c $(OBJDIR)/warnpolicy.h $(SRCDIR)/config.h
2045 $(XTCC) -o $(OBJDIR)/warnpolicy.o -c $(OBJDIR)/warnpolicy_.c
2046
2047 $(OBJDIR)/warnpolicy.h: $(OBJDIR)/headers
2048
2049 $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(OBJDIR)/translate
2050 $(OBJDIR)/translate $(SRCDIR)/wiki.c >$@
2051
2052 $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h
2053
M src/merge.c
+18 -14
--- src/merge.c
+++ src/merge.c
@@ -507,10 +507,23 @@
507507
 if( !forceFlag && mid==pid ){
508508
 fossil_print("Merge skipped because it is a no-op. "
509509
 " Use --force to override.\n");
510510
 return;
511511
 }
512
+ if( !forceFlag
513
+ && issue_merge_warnings(
514
+ info_tags_of_checkin(vid, 0),
515
+ info_tags_of_checkin(mid, 0),
516
+ content_is_private(mid) && !content_is_private(vid))
517
+ ){
518
+ Blob yn;
519
+ char c;
520
+ prompt_user("Continue anyway (y/N)? ", &yn);
521
+ c = blob_str(&yn)[0];
522
+ blob_reset(&yn);
523
+ if( c!='y' && c!='Y' ) return;
524
+ }
512525
 if( integrateFlag && !is_a_leaf(mid)){
513526
 fossil_warning("ignoring --integrate: %s is not a leaf", g.argv[2]);
514527
 integrateFlag = 0;
515528
 }
516529
 if( integrateFlag && content_is_private(mid) ){
@@ -524,22 +537,10 @@
524537
 print_checkin_description(mid, 12,
525538
 integrateFlag ? "integrate:" : "merge-from:");
526539
 print_checkin_description(pid, 12, "baseline:");
527540
 }
528541
 vfile_check_signature(vid, CKSIG_ENOTFILE);
529
-
530
- if( forceFlag==0 && content_is_private(mid) && !content_is_private(vid) ){
531
- Blob ans;
532
- char cReply;
533
- fossil_warning("Merging UNPUBLISHED artifacts."
534
- " Consider using \"fossil publish\" first.");
535
- prompt_user("Continue with merge (y/N)? ", &ans);
536
- cReply = blob_str(&ans)[0];
537
- blob_reset(&ans);
538
- if( cReply!='y' && cReply!='Y' ) return;
539
- }
540
-
541542
 db_begin_transaction();
542543
 if( !dryRunFlag ) undo_begin();
543544
 if( load_vfile_from_rid(mid) && !forceMissingFlag ){
544545
 fossil_fatal("missing content, unable to merge");
545546
 }
@@ -1060,9 +1061,12 @@
10601061
 vmerge_insert(0, mid);
10611062
 }
10621063
 if( !dryRunFlag ) undo_finish();
10631064
 db_end_transaction(dryRunFlag);
10641065
1065
- if( forceFlag==1 && content_is_private(mid) && !content_is_private(vid) ){
1066
- fossil_warning("WARNING: Merged private artifacts to public branch.");
1066
+ if( forceFlag==1 ){
1067
+ issue_merge_warnings(
1068
+ info_tags_of_checkin(vid, 0),
1069
+ info_tags_of_checkin(mid, 0),
1070
+ content_is_private(mid) && !content_is_private(vid));
10671071
 }
10681072
 }
10691073
10701074
ADDED src/warnpolicy.c
--- src/merge.c
+++ src/merge.c
@@ -507,10 +507,23 @@
507 if( !forceFlag && mid==pid ){
508 fossil_print("Merge skipped because it is a no-op. "
509 " Use --force to override.\n");
510 return;
511 }
 
 
 
 
 
 
 
 
 
 
 
 
 
512 if( integrateFlag && !is_a_leaf(mid)){
513 fossil_warning("ignoring --integrate: %s is not a leaf", g.argv[2]);
514 integrateFlag = 0;
515 }
516 if( integrateFlag && content_is_private(mid) ){
@@ -524,22 +537,10 @@
524 print_checkin_description(mid, 12,
525 integrateFlag ? "integrate:" : "merge-from:");
526 print_checkin_description(pid, 12, "baseline:");
527 }
528 vfile_check_signature(vid, CKSIG_ENOTFILE);
529
530 if( forceFlag==0 && content_is_private(mid) && !content_is_private(vid) ){
531 Blob ans;
532 char cReply;
533 fossil_warning("Merging UNPUBLISHED artifacts."
534 " Consider using \"fossil publish\" first.");
535 prompt_user("Continue with merge (y/N)? ", &ans);
536 cReply = blob_str(&ans)[0];
537 blob_reset(&ans);
538 if( cReply!='y' && cReply!='Y' ) return;
539 }
540
541 db_begin_transaction();
542 if( !dryRunFlag ) undo_begin();
543 if( load_vfile_from_rid(mid) && !forceMissingFlag ){
544 fossil_fatal("missing content, unable to merge");
545 }
@@ -1060,9 +1061,12 @@
1060 vmerge_insert(0, mid);
1061 }
1062 if( !dryRunFlag ) undo_finish();
1063 db_end_transaction(dryRunFlag);
1064
1065 if( forceFlag==1 && content_is_private(mid) && !content_is_private(vid) ){
1066 fossil_warning("WARNING: Merged private artifacts to public branch.");
 
 
 
1067 }
1068 }
1069
1070 DDED src/warnpolicy.c
--- src/merge.c
+++ src/merge.c
@@ -507,10 +507,23 @@
507 if( !forceFlag && mid==pid ){
508 fossil_print("Merge skipped because it is a no-op. "
509 " Use --force to override.\n");
510 return;
511 }
512 if( !forceFlag
513 && issue_merge_warnings(
514 info_tags_of_checkin(vid, 0),
515 info_tags_of_checkin(mid, 0),
516 content_is_private(mid) && !content_is_private(vid))
517 ){
518 Blob yn;
519 char c;
520 prompt_user("Continue anyway (y/N)? ", &yn);
521 c = blob_str(&yn)[0];
522 blob_reset(&yn);
523 if( c!='y' && c!='Y' ) return;
524 }
525 if( integrateFlag && !is_a_leaf(mid)){
526 fossil_warning("ignoring --integrate: %s is not a leaf", g.argv[2]);
527 integrateFlag = 0;
528 }
529 if( integrateFlag && content_is_private(mid) ){
@@ -524,22 +537,10 @@
537 print_checkin_description(mid, 12,
538 integrateFlag ? "integrate:" : "merge-from:");
539 print_checkin_description(pid, 12, "baseline:");
540 }
541 vfile_check_signature(vid, CKSIG_ENOTFILE);
 
 
 
 
 
 
 
 
 
 
 
 
542 db_begin_transaction();
543 if( !dryRunFlag ) undo_begin();
544 if( load_vfile_from_rid(mid) && !forceMissingFlag ){
545 fossil_fatal("missing content, unable to merge");
546 }
@@ -1060,9 +1061,12 @@
1061 vmerge_insert(0, mid);
1062 }
1063 if( !dryRunFlag ) undo_finish();
1064 db_end_transaction(dryRunFlag);
1065
1066 if( forceFlag==1 ){
1067 issue_merge_warnings(
1068 info_tags_of_checkin(vid, 0),
1069 info_tags_of_checkin(mid, 0),
1070 content_is_private(mid) && !content_is_private(vid));
1071 }
1072 }
1073
1074 DDED src/warnpolicy.c
A src/warnpolicy.c
+46
--- a/src/warnpolicy.c
+++ b/src/warnpolicy.c
@@ -0,0 +1,46 @@
1
+/*
2
+** Copyright (c) 2023 Preben Guldberg
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 License" or "FreeBSD License".)
7
+
8
+** This program is distributed in the hope that it will be useful,
9
+** but without any warranty; without even the implied warranty of
10
+** merchantability or fitness for a particular purpose.
11
+**
12
+** Author contact information:
13
+** [email protected]
14
+** http://www.hwaci.com/drh/
15
+**
16
+*******************************************************************************
17
+**
18
+** This file contains code implementing a warning policy for different events.
19
+*/
20
+#include "config.h"
21
+#include "warnpolicy.h"
22
+
23
+/*
24
+** SETTING: warning-policy width=40 block-text propagating default={}
25
+** Policy for showing warnings under certain conditions.
26
+**
27
+** The policy is a JSON object where the following names are recognised:
28
+**
29
+** commit: Used when committing. A list of objects with names in
30
+** (message, branch, except-branch, users, except-users).
31
+** merge: Used when merging. A List of objects with names in
32
+** (message, branch, except-branch, from, except-from,
33
+** history-loss 2023 Preben Guldberg
34
+**
35
+** This program is free software; you can redistribute it and/or
36
+** modify it under the terms of the Simplified BSD License (also
37
+** known as the "2-Clause License" or "FreeBSD License".)
38
+
39
+** This program is distributed in the hope that it will be useful,
40
+** but without any warranty; without even the implied warranty of
41
+** merchantability or fitness for a particular purpose.
42
+**
43
+** Author contact information:
44
+** [email protected]
45
+** http://www./*
46
+** Copyright (c trueR@Re,P:message when history lossW@SV,Y:would occur; that is, when merging7L@SL,1l@Zj,C:history-lossth@ae,C:history-lossd@1UW,C:history-loss90@1VJ,H:hl|--history-lossGi@1d_,I:history-loss", "hl5K@1uX,1TB2YJ;
--- a/src/warnpolicy.c
+++ b/src/warnpolicy.c
@@ -0,0 +1,46 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/src/warnpolicy.c
+++ b/src/warnpolicy.c
@@ -0,0 +1,46 @@
1 /*
2 ** Copyright (c) 2023 Preben Guldberg
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 License" or "FreeBSD License".)
7
8 ** This program is distributed in the hope that it will be useful,
9 ** but without any warranty; without even the implied warranty of
10 ** merchantability or fitness for a particular purpose.
11 **
12 ** Author contact information:
13 ** [email protected]
14 ** http://www.hwaci.com/drh/
15 **
16 *******************************************************************************
17 **
18 ** This file contains code implementing a warning policy for different events.
19 */
20 #include "config.h"
21 #include "warnpolicy.h"
22
23 /*
24 ** SETTING: warning-policy width=40 block-text propagating default={}
25 ** Policy for showing warnings under certain conditions.
26 **
27 ** The policy is a JSON object where the following names are recognised:
28 **
29 ** commit: Used when committing. A list of objects with names in
30 ** (message, branch, except-branch, users, except-users).
31 ** merge: Used when merging. A List of objects with names in
32 ** (message, branch, except-branch, from, except-from,
33 ** history-loss 2023 Preben Guldberg
34 **
35 ** This program is free software; you can redistribute it and/or
36 ** modify it under the terms of the Simplified BSD License (also
37 ** known as the "2-Clause License" or "FreeBSD License".)
38
39 ** This program is distributed in the hope that it will be useful,
40 ** but without any warranty; without even the implied warranty of
41 ** merchantability or fitness for a particular purpose.
42 **
43 ** Author contact information:
44 ** [email protected]
45 ** http://www./*
46 ** Copyright (c trueR@Re,P:message when history lossW@SV,Y:would occur; that is, when merging7L@SL,1l@Zj,C:history-lossth@ae,C:history-lossd@1UW,C:history-loss90@1VJ,H:hl|--history-lossGi@1d_,I:history-loss", "hl5K@1uX,1TB2YJ;
M tools/makemake.tcl
+1
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -187,10 +187,11 @@
187187
 user
188188
 utf8
189189
 util
190190
 verify
191191
 vfile
192
+ warnpolicy
192193
 wiki
193194
 wikiformat
194195
 winfile
195196
 winhttp
196197
 xfer
197198
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -187,10 +187,11 @@
187 user
188 utf8
189 util
190 verify
191 vfile
 
192 wiki
193 wikiformat
194 winfile
195 winhttp
196 xfer
197
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -187,10 +187,11 @@
187 user
188 utf8
189 util
190 verify
191 vfile
192 warnpolicy
193 wiki
194 wikiformat
195 winfile
196 winhttp
197 xfer
198
M win/Makefile.dmc
+10 -4
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -32,13 +32,13 @@
3232
3333
 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_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -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
3434
3535
 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
3636
37
-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 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
37
+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 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 warnpolicy_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
3838
39
-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)\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
39
+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)\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)\warnpolicy$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
4040
4141
4242
 RC=$(DMDIR)\bin\rcc
4343
 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
4444
@@ -53,11 +53,11 @@
5353
5454
 $(OBJDIR)\fossil.res: $B\win\fossil.rc
5555
 $(RC) $(RCFLAGS) -o$@ $**
5656
5757
 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
58
- +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 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 > $@
58
+ +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 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 warnpolicy wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
5959
 +echo fossil >> $@
6060
 +echo fossil >> $@
6161
 +echo $(LIBS) >> $@
6262
 +echo. >> $@
6363
 +echo fossil >> $@
@@ -965,10 +965,16 @@
965965
 $(OBJDIR)\vfile$O : vfile_.c vfile.h
966966
 $(TCC) -o$@ -c vfile_.c
967967
968968
 vfile_.c : $(SRCDIR)\vfile.c
969969
 +translate$E $** > $@
970
+
971
+$(OBJDIR)\warnpolicy$O : warnpolicy_.c warnpolicy.h
972
+ $(TCC) -o$@ -c warnpolicy_.c
973
+
974
+warnpolicy_.c : $(SRCDIR)\warnpolicy.c
975
+ +translate$E $** > $@
970976
971977
 $(OBJDIR)\wiki$O : wiki_.c wiki.h
972978
 $(TCC) -o$@ -c wiki_.c
973979
974980
 wiki_.c : $(SRCDIR)\wiki.c
@@ -1009,7 +1015,7 @@
10091015
10101016
 zip_.c : $(SRCDIR)\zip.c
10111017
 +translate$E $** > $@
10121018
10131019
 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1014
- +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 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_extsrc)\pikchr.c:pikchr.h $(SRCDIR_extsrc)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR_extsrc)\cson_amalgamation.h
1020
+ +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 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 warnpolicy_.c:warnpolicy.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_extsrc)\pikchr.c:pikchr.h $(SRCDIR_extsrc)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR_extsrc)\cson_amalgamation.h
10151021
 @copy /Y nul: headers
10161022
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -32,13 +32,13 @@
32
33 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_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -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
34
35 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
36
37 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 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
38
39 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)\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
40
41
42 RC=$(DMDIR)\bin\rcc
43 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
44
@@ -53,11 +53,11 @@
53
54 $(OBJDIR)\fossil.res: $B\win\fossil.rc
55 $(RC) $(RCFLAGS) -o$@ $**
56
57 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
58 +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 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 > $@
59 +echo fossil >> $@
60 +echo fossil >> $@
61 +echo $(LIBS) >> $@
62 +echo. >> $@
63 +echo fossil >> $@
@@ -965,10 +965,16 @@
965 $(OBJDIR)\vfile$O : vfile_.c vfile.h
966 $(TCC) -o$@ -c vfile_.c
967
968 vfile_.c : $(SRCDIR)\vfile.c
969 +translate$E $** > $@
 
 
 
 
 
 
970
971 $(OBJDIR)\wiki$O : wiki_.c wiki.h
972 $(TCC) -o$@ -c wiki_.c
973
974 wiki_.c : $(SRCDIR)\wiki.c
@@ -1009,7 +1015,7 @@
1009
1010 zip_.c : $(SRCDIR)\zip.c
1011 +translate$E $** > $@
1012
1013 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1014 +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 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_extsrc)\pikchr.c:pikchr.h $(SRCDIR_extsrc)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR_extsrc)\cson_amalgamation.h
1015 @copy /Y nul: headers
1016
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -32,13 +32,13 @@
32
33 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_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DHAVE_USLEEP -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
34
35 PIKCHR_OPTIONS = -DPIKCHR_TOKEN_LIMIT=10000
36
37 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 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 warnpolicy_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
38
39 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)\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)\warnpolicy$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
40
41
42 RC=$(DMDIR)\bin\rcc
43 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
44
@@ -53,11 +53,11 @@
53
54 $(OBJDIR)\fossil.res: $B\win\fossil.rc
55 $(RC) $(RCFLAGS) -o$@ $**
56
57 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
58 +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 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 warnpolicy wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
59 +echo fossil >> $@
60 +echo fossil >> $@
61 +echo $(LIBS) >> $@
62 +echo. >> $@
63 +echo fossil >> $@
@@ -965,10 +965,16 @@
965 $(OBJDIR)\vfile$O : vfile_.c vfile.h
966 $(TCC) -o$@ -c vfile_.c
967
968 vfile_.c : $(SRCDIR)\vfile.c
969 +translate$E $** > $@
970
971 $(OBJDIR)\warnpolicy$O : warnpolicy_.c warnpolicy.h
972 $(TCC) -o$@ -c warnpolicy_.c
973
974 warnpolicy_.c : $(SRCDIR)\warnpolicy.c
975 +translate$E $** > $@
976
977 $(OBJDIR)\wiki$O : wiki_.c wiki.h
978 $(TCC) -o$@ -c wiki_.c
979
980 wiki_.c : $(SRCDIR)\wiki.c
@@ -1009,7 +1015,7 @@
1015
1016 zip_.c : $(SRCDIR)\zip.c
1017 +translate$E $** > $@
1018
1019 headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1020 +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 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 warnpolicy_.c:warnpolicy.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_extsrc)\pikchr.c:pikchr.h $(SRCDIR_extsrc)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR_extsrc)\cson_amalgamation.h
1021 @copy /Y nul: headers
1022
M win/Makefile.mingw
+12
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -540,10 +540,11 @@
540540
 $(SRCDIR)/user.c \
541541
 $(SRCDIR)/utf8.c \
542542
 $(SRCDIR)/util.c \
543543
 $(SRCDIR)/verify.c \
544544
 $(SRCDIR)/vfile.c \
545
+ $(SRCDIR)/warnpolicy.c \
545546
 $(SRCDIR)/wiki.c \
546547
 $(SRCDIR)/wikiformat.c \
547548
 $(SRCDIR)/winfile.c \
548549
 $(SRCDIR)/winhttp.c \
549550
 $(SRCDIR)/xfer.c \
@@ -799,10 +800,11 @@
799800
 $(OBJDIR)/user_.c \
800801
 $(OBJDIR)/utf8_.c \
801802
 $(OBJDIR)/util_.c \
802803
 $(OBJDIR)/verify_.c \
803804
 $(OBJDIR)/vfile_.c \
805
+ $(OBJDIR)/warnpolicy_.c \
804806
 $(OBJDIR)/wiki_.c \
805807
 $(OBJDIR)/wikiformat_.c \
806808
 $(OBJDIR)/winfile_.c \
807809
 $(OBJDIR)/winhttp_.c \
808810
 $(OBJDIR)/xfer_.c \
@@ -948,10 +950,11 @@
948950
 $(OBJDIR)/user.o \
949951
 $(OBJDIR)/utf8.o \
950952
 $(OBJDIR)/util.o \
951953
 $(OBJDIR)/verify.o \
952954
 $(OBJDIR)/vfile.o \
955
+ $(OBJDIR)/warnpolicy.o \
953956
 $(OBJDIR)/wiki.o \
954957
 $(OBJDIR)/wikiformat.o \
955958
 $(OBJDIR)/winfile.o \
956959
 $(OBJDIR)/winhttp.o \
957960
 $(OBJDIR)/xfer.o \
@@ -1301,10 +1304,11 @@
13011304
 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
13021305
 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
13031306
 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
13041307
 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
13051308
 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1309
+ $(OBJDIR)/warnpolicy_.c:$(OBJDIR)/warnpolicy.h \
13061310
 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
13071311
 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
13081312
 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
13091313
 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
13101314
 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
@@ -2437,10 +2441,18 @@
24372441
24382442
 $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h
24392443
 $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c
24402444
24412445
 $(OBJDIR)/vfile.h: $(OBJDIR)/headers
2446
+
2447
+$(OBJDIR)/warnpolicy_.c: $(SRCDIR)/warnpolicy.c $(TRANSLATE)
2448
+ $(TRANSLATE) $(SRCDIR)/warnpolicy.c >$@
2449
+
2450
+$(OBJDIR)/warnpolicy.o: $(OBJDIR)/warnpolicy_.c $(OBJDIR)/warnpolicy.h $(SRCDIR)/config.h
2451
+ $(XTCC) -o $(OBJDIR)/warnpolicy.o -c $(OBJDIR)/warnpolicy_.c
2452
+
2453
+$(OBJDIR)/warnpolicy.h: $(OBJDIR)/headers
24422454
24432455
 $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(TRANSLATE)
24442456
 $(TRANSLATE) $(SRCDIR)/wiki.c >$@
24452457
24462458
 $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h
24472459
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -540,10 +540,11 @@
540 $(SRCDIR)/user.c \
541 $(SRCDIR)/utf8.c \
542 $(SRCDIR)/util.c \
543 $(SRCDIR)/verify.c \
544 $(SRCDIR)/vfile.c \
 
545 $(SRCDIR)/wiki.c \
546 $(SRCDIR)/wikiformat.c \
547 $(SRCDIR)/winfile.c \
548 $(SRCDIR)/winhttp.c \
549 $(SRCDIR)/xfer.c \
@@ -799,10 +800,11 @@
799 $(OBJDIR)/user_.c \
800 $(OBJDIR)/utf8_.c \
801 $(OBJDIR)/util_.c \
802 $(OBJDIR)/verify_.c \
803 $(OBJDIR)/vfile_.c \
 
804 $(OBJDIR)/wiki_.c \
805 $(OBJDIR)/wikiformat_.c \
806 $(OBJDIR)/winfile_.c \
807 $(OBJDIR)/winhttp_.c \
808 $(OBJDIR)/xfer_.c \
@@ -948,10 +950,11 @@
948 $(OBJDIR)/user.o \
949 $(OBJDIR)/utf8.o \
950 $(OBJDIR)/util.o \
951 $(OBJDIR)/verify.o \
952 $(OBJDIR)/vfile.o \
 
953 $(OBJDIR)/wiki.o \
954 $(OBJDIR)/wikiformat.o \
955 $(OBJDIR)/winfile.o \
956 $(OBJDIR)/winhttp.o \
957 $(OBJDIR)/xfer.o \
@@ -1301,10 +1304,11 @@
1301 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1302 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1303 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1304 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1305 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
 
1306 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1307 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1308 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1309 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1310 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
@@ -2437,10 +2441,18 @@
2437
2438 $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h
2439 $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c
2440
2441 $(OBJDIR)/vfile.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
2442
2443 $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(TRANSLATE)
2444 $(TRANSLATE) $(SRCDIR)/wiki.c >$@
2445
2446 $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h
2447
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -540,10 +540,11 @@
540 $(SRCDIR)/user.c \
541 $(SRCDIR)/utf8.c \
542 $(SRCDIR)/util.c \
543 $(SRCDIR)/verify.c \
544 $(SRCDIR)/vfile.c \
545 $(SRCDIR)/warnpolicy.c \
546 $(SRCDIR)/wiki.c \
547 $(SRCDIR)/wikiformat.c \
548 $(SRCDIR)/winfile.c \
549 $(SRCDIR)/winhttp.c \
550 $(SRCDIR)/xfer.c \
@@ -799,10 +800,11 @@
800 $(OBJDIR)/user_.c \
801 $(OBJDIR)/utf8_.c \
802 $(OBJDIR)/util_.c \
803 $(OBJDIR)/verify_.c \
804 $(OBJDIR)/vfile_.c \
805 $(OBJDIR)/warnpolicy_.c \
806 $(OBJDIR)/wiki_.c \
807 $(OBJDIR)/wikiformat_.c \
808 $(OBJDIR)/winfile_.c \
809 $(OBJDIR)/winhttp_.c \
810 $(OBJDIR)/xfer_.c \
@@ -948,10 +950,11 @@
950 $(OBJDIR)/user.o \
951 $(OBJDIR)/utf8.o \
952 $(OBJDIR)/util.o \
953 $(OBJDIR)/verify.o \
954 $(OBJDIR)/vfile.o \
955 $(OBJDIR)/warnpolicy.o \
956 $(OBJDIR)/wiki.o \
957 $(OBJDIR)/wikiformat.o \
958 $(OBJDIR)/winfile.o \
959 $(OBJDIR)/winhttp.o \
960 $(OBJDIR)/xfer.o \
@@ -1301,10 +1304,11 @@
1304 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1305 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1306 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1307 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1308 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1309 $(OBJDIR)/warnpolicy_.c:$(OBJDIR)/warnpolicy.h \
1310 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1311 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1312 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1313 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1314 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
@@ -2437,10 +2441,18 @@
2441
2442 $(OBJDIR)/vfile.o: $(OBJDIR)/vfile_.c $(OBJDIR)/vfile.h $(SRCDIR)/config.h
2443 $(XTCC) -o $(OBJDIR)/vfile.o -c $(OBJDIR)/vfile_.c
2444
2445 $(OBJDIR)/vfile.h: $(OBJDIR)/headers
2446
2447 $(OBJDIR)/warnpolicy_.c: $(SRCDIR)/warnpolicy.c $(TRANSLATE)
2448 $(TRANSLATE) $(SRCDIR)/warnpolicy.c >$@
2449
2450 $(OBJDIR)/warnpolicy.o: $(OBJDIR)/warnpolicy_.c $(OBJDIR)/warnpolicy.h $(SRCDIR)/config.h
2451 $(XTCC) -o $(OBJDIR)/warnpolicy.o -c $(OBJDIR)/warnpolicy_.c
2452
2453 $(OBJDIR)/warnpolicy.h: $(OBJDIR)/headers
2454
2455 $(OBJDIR)/wiki_.c: $(SRCDIR)/wiki.c $(TRANSLATE)
2456 $(TRANSLATE) $(SRCDIR)/wiki.c >$@
2457
2458 $(OBJDIR)/wiki.o: $(OBJDIR)/wiki_.c $(OBJDIR)/wiki.h $(SRCDIR)/config.h
2459
M win/Makefile.msc
+10
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -498,10 +498,11 @@
498498
 "$(OX)\user_.c" \
499499
 "$(OX)\utf8_.c" \
500500
 "$(OX)\util_.c" \
501501
 "$(OX)\verify_.c" \
502502
 "$(OX)\vfile_.c" \
503
+ "$(OX)\warnpolicy_.c" \
503504
 "$(OX)\wiki_.c" \
504505
 "$(OX)\wikiformat_.c" \
505506
 "$(OX)\winfile_.c" \
506507
 "$(OX)\winhttp_.c" \
507508
 "$(OX)\xfer_.c" \
@@ -763,10 +764,11 @@
763764
 "$(OX)\user$O" \
764765
 "$(OX)\utf8$O" \
765766
 "$(OX)\util$O" \
766767
 "$(OX)\verify$O" \
767768
 "$(OX)\vfile$O" \
769
+ "$(OX)\warnpolicy$O" \
768770
 "$(OX)\wiki$O" \
769771
 "$(OX)\wikiformat$O" \
770772
 "$(OX)\winfile$O" \
771773
 "$(OX)\winhttp$O" \
772774
 "$(OX)\xfer$O" \
@@ -1012,10 +1014,11 @@
10121014
 echo "$(OX)\user.obj" >> $@
10131015
 echo "$(OX)\utf8.obj" >> $@
10141016
 echo "$(OX)\util.obj" >> $@
10151017
 echo "$(OX)\verify.obj" >> $@
10161018
 echo "$(OX)\vfile.obj" >> $@
1019
+ echo "$(OX)\warnpolicy.obj" >> $@
10171020
 echo "$(OX)\wiki.obj" >> $@
10181021
 echo "$(OX)\wikiformat.obj" >> $@
10191022
 echo "$(OX)\winfile.obj" >> $@
10201023
 echo "$(OX)\winhttp.obj" >> $@
10211024
 echo "$(OX)\xfer.obj" >> $@
@@ -2080,10 +2083,16 @@
20802083
 "$(OX)\vfile$O" : "$(OX)\vfile_.c" "$(OX)\vfile.h"
20812084
 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile_.c"
20822085
20832086
 "$(OX)\vfile_.c" : "$(SRCDIR)\vfile.c"
20842087
 "$(OBJDIR)\translate$E" $** > $@
2088
+
2089
+"$(OX)\warnpolicy$O" : "$(OX)\warnpolicy_.c" "$(OX)\warnpolicy.h"
2090
+ $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\warnpolicy_.c"
2091
+
2092
+"$(OX)\warnpolicy_.c" : "$(SRCDIR)\warnpolicy.c"
2093
+ "$(OBJDIR)\translate$E" $** > $@
20852094
20862095
 "$(OX)\wiki$O" : "$(OX)\wiki_.c" "$(OX)\wiki.h"
20872096
 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki_.c"
20882097
20892098
 "$(OX)\wiki_.c" : "$(SRCDIR)\wiki.c"
@@ -2267,10 +2276,11 @@
22672276
 "$(OX)\user_.c":"$(OX)\user.h" \
22682277
 "$(OX)\utf8_.c":"$(OX)\utf8.h" \
22692278
 "$(OX)\util_.c":"$(OX)\util.h" \
22702279
 "$(OX)\verify_.c":"$(OX)\verify.h" \
22712280
 "$(OX)\vfile_.c":"$(OX)\vfile.h" \
2281
+ "$(OX)\warnpolicy_.c":"$(OX)\warnpolicy.h" \
22722282
 "$(OX)\wiki_.c":"$(OX)\wiki.h" \
22732283
 "$(OX)\wikiformat_.c":"$(OX)\wikiformat.h" \
22742284
 "$(OX)\winfile_.c":"$(OX)\winfile.h" \
22752285
 "$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
22762286
 "$(OX)\xfer_.c":"$(OX)\xfer.h" \
22772287
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -498,10 +498,11 @@
498 "$(OX)\user_.c" \
499 "$(OX)\utf8_.c" \
500 "$(OX)\util_.c" \
501 "$(OX)\verify_.c" \
502 "$(OX)\vfile_.c" \
 
503 "$(OX)\wiki_.c" \
504 "$(OX)\wikiformat_.c" \
505 "$(OX)\winfile_.c" \
506 "$(OX)\winhttp_.c" \
507 "$(OX)\xfer_.c" \
@@ -763,10 +764,11 @@
763 "$(OX)\user$O" \
764 "$(OX)\utf8$O" \
765 "$(OX)\util$O" \
766 "$(OX)\verify$O" \
767 "$(OX)\vfile$O" \
 
768 "$(OX)\wiki$O" \
769 "$(OX)\wikiformat$O" \
770 "$(OX)\winfile$O" \
771 "$(OX)\winhttp$O" \
772 "$(OX)\xfer$O" \
@@ -1012,10 +1014,11 @@
1012 echo "$(OX)\user.obj" >> $@
1013 echo "$(OX)\utf8.obj" >> $@
1014 echo "$(OX)\util.obj" >> $@
1015 echo "$(OX)\verify.obj" >> $@
1016 echo "$(OX)\vfile.obj" >> $@
 
1017 echo "$(OX)\wiki.obj" >> $@
1018 echo "$(OX)\wikiformat.obj" >> $@
1019 echo "$(OX)\winfile.obj" >> $@
1020 echo "$(OX)\winhttp.obj" >> $@
1021 echo "$(OX)\xfer.obj" >> $@
@@ -2080,10 +2083,16 @@
2080 "$(OX)\vfile$O" : "$(OX)\vfile_.c" "$(OX)\vfile.h"
2081 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile_.c"
2082
2083 "$(OX)\vfile_.c" : "$(SRCDIR)\vfile.c"
2084 "$(OBJDIR)\translate$E" $** > $@
 
 
 
 
 
 
2085
2086 "$(OX)\wiki$O" : "$(OX)\wiki_.c" "$(OX)\wiki.h"
2087 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki_.c"
2088
2089 "$(OX)\wiki_.c" : "$(SRCDIR)\wiki.c"
@@ -2267,10 +2276,11 @@
2267 "$(OX)\user_.c":"$(OX)\user.h" \
2268 "$(OX)\utf8_.c":"$(OX)\utf8.h" \
2269 "$(OX)\util_.c":"$(OX)\util.h" \
2270 "$(OX)\verify_.c":"$(OX)\verify.h" \
2271 "$(OX)\vfile_.c":"$(OX)\vfile.h" \
 
2272 "$(OX)\wiki_.c":"$(OX)\wiki.h" \
2273 "$(OX)\wikiformat_.c":"$(OX)\wikiformat.h" \
2274 "$(OX)\winfile_.c":"$(OX)\winfile.h" \
2275 "$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
2276 "$(OX)\xfer_.c":"$(OX)\xfer.h" \
2277
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -498,10 +498,11 @@
498 "$(OX)\user_.c" \
499 "$(OX)\utf8_.c" \
500 "$(OX)\util_.c" \
501 "$(OX)\verify_.c" \
502 "$(OX)\vfile_.c" \
503 "$(OX)\warnpolicy_.c" \
504 "$(OX)\wiki_.c" \
505 "$(OX)\wikiformat_.c" \
506 "$(OX)\winfile_.c" \
507 "$(OX)\winhttp_.c" \
508 "$(OX)\xfer_.c" \
@@ -763,10 +764,11 @@
764 "$(OX)\user$O" \
765 "$(OX)\utf8$O" \
766 "$(OX)\util$O" \
767 "$(OX)\verify$O" \
768 "$(OX)\vfile$O" \
769 "$(OX)\warnpolicy$O" \
770 "$(OX)\wiki$O" \
771 "$(OX)\wikiformat$O" \
772 "$(OX)\winfile$O" \
773 "$(OX)\winhttp$O" \
774 "$(OX)\xfer$O" \
@@ -1012,10 +1014,11 @@
1014 echo "$(OX)\user.obj" >> $@
1015 echo "$(OX)\utf8.obj" >> $@
1016 echo "$(OX)\util.obj" >> $@
1017 echo "$(OX)\verify.obj" >> $@
1018 echo "$(OX)\vfile.obj" >> $@
1019 echo "$(OX)\warnpolicy.obj" >> $@
1020 echo "$(OX)\wiki.obj" >> $@
1021 echo "$(OX)\wikiformat.obj" >> $@
1022 echo "$(OX)\winfile.obj" >> $@
1023 echo "$(OX)\winhttp.obj" >> $@
1024 echo "$(OX)\xfer.obj" >> $@
@@ -2080,10 +2083,16 @@
2083 "$(OX)\vfile$O" : "$(OX)\vfile_.c" "$(OX)\vfile.h"
2084 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile_.c"
2085
2086 "$(OX)\vfile_.c" : "$(SRCDIR)\vfile.c"
2087 "$(OBJDIR)\translate$E" $** > $@
2088
2089 "$(OX)\warnpolicy$O" : "$(OX)\warnpolicy_.c" "$(OX)\warnpolicy.h"
2090 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\warnpolicy_.c"
2091
2092 "$(OX)\warnpolicy_.c" : "$(SRCDIR)\warnpolicy.c"
2093 "$(OBJDIR)\translate$E" $** > $@
2094
2095 "$(OX)\wiki$O" : "$(OX)\wiki_.c" "$(OX)\wiki.h"
2096 $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki_.c"
2097
2098 "$(OX)\wiki_.c" : "$(SRCDIR)\wiki.c"
@@ -2267,10 +2276,11 @@
2276 "$(OX)\user_.c":"$(OX)\user.h" \
2277 "$(OX)\utf8_.c":"$(OX)\utf8.h" \
2278 "$(OX)\util_.c":"$(OX)\util.h" \
2279 "$(OX)\verify_.c":"$(OX)\verify.h" \
2280 "$(OX)\vfile_.c":"$(OX)\vfile.h" \
2281 "$(OX)\warnpolicy_.c":"$(OX)\warnpolicy.h" \
2282 "$(OX)\wiki_.c":"$(OX)\wiki.h" \
2283 "$(OX)\wikiformat_.c":"$(OX)\wikiformat.h" \
2284 "$(OX)\winfile_.c":"$(OX)\winfile.h" \
2285 "$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
2286 "$(OX)\xfer_.c":"$(OX)\xfer.h" \
2287

Keyboard Shortcuts

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