Fossil SCM

Merge the email.c-to-alerts.c refactor.

drh 2018-08-30 21:20 trunk merge

Commit fc5c7d2625aab1cc90570408f927b43035e51a55e4a72797719453532958b4af

Parent 2f72c1fbd2a066e…

15 files changed +1 -97 +32 +1 -1 +2 -2 +1 -1 -128 +7 -7 +12 -12 +1 -1 +3 -3 +1 -1 +1 -1 +10 -10 +12 -12 +10 -10

~ src/alerts.c + src/alerts.c ~ src/backoffice.c ~ src/configure.c ~ src/db.c - src/email.c ~ src/login.c ~ src/main.mk ~ src/makemake.tcl ~ src/rebuild.c ~ src/security_audit.c ~ src/stat.c ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc

M src/alerts.c

+1 -97

		--- a/src/alerts.c
		+++ b/src/alerts.c
		@@ -1,37 +1,4 @@
1	1	form-posted nnounce, then no
2		-
3		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
4		- }
5		- rc = relayhost emailerError(p, arn p;
6		-localhost){
7		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
8		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
9		- ** form element to avoid that a URL arg of to=... passed to this
10		- ** page ends up overwriting the form-posted "to" value. This
11		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="memailS3v,3qmjft;h>Disabled</thOptions:
12		-**
13		-** statusOptions:
14		-**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
15		- @ 3Delivery:1ayhoEmailemailue. This
16		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:<emailor="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:temail form-posted nnounce, then no
17		-
18		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
19		- }
20		- rc = relayhost emailerError(p, arn p;
21		-localhost){
22		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
23		- /* Maintenance reminder: we unce,emailEmailemailemailemailemailemail_trigger1;\n"email_enabled(void){
24		- if( !email 0;
25		-emailemail 0emailemailel>_@DK0,6:id="to9S@R form-posted nnounce, temailemailEmailemailEMAIL /announcebTest2 ? "blob" : 02
26		- /* Maintenance reminder: we need an exp formEmailEmailEmailEMAILemail_sender_free(EmailEmailrm-posted nnounce, then no
27		-
28		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
29		- }
30		- rc = relayhost emailerError(p, arn p;
31		-localhost){
32		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
33		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
34		- ** form element to avoid tha formEmailemail_sender_frEmailEMAILemailemailemailemailemailemailemailemail-posted nnounce, then no
35	2
36	3	** have been sent is */ ){int bTest2 = fossil_sarn p;
37	4	}
		@@ -57,72 +24,9 @@
57	24	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
58	25	** form element to avoid that a URL arg of to=... passed to this
59	26	** page ends up overwriting the form-posted "to" value. This
60		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label fnounce, then no
61		- EMAILemailemailemailemailemailemailemailemailemail_schema(0ndemailEMAILEmailEMAILemailemailemaile, then no
62		-
63		- nnounce, then no
64		-
65		-
66		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
67		- }
68		- rc = relayhost emailerError(p, arn p;
69		-localhost){
70		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
71		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
72		- ** form element to avoid that a URL arg of to=... passed to this
73		- ** page ends up overwriting the form-posted "to" value. This
74		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
75		-**
76		-** statusOptions:
77		-**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
78		- @ 3Delivery:1ayhost emai rc = relayEmail Address:User:</emailEmail-emailemailel>_@DK0,6:id="to9S@R form-posted nnounce, then no
79		-
80		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
81		- }
82		- rc = relayhost emailerError(p, arn p;
83		-localhost){
84		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
85		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
86		- ** form element to avoid that a URL arg of to=... passed to this
87		- ** page ends up overwriting the form-posted "to" value. This
88	27	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
89	28	**
90	29	** statusOptions:
91	30	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
92	31	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
93		- @ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
94		-; rc = relayhost form-posted nnounce, then no
95		-
96		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
97		- }
98		- rc = relayhost emailerError(p, arn p;
99		-localhost){
100		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
101		- /* Maintenance reminder: we need an explicit action=THIS_PAGEmailSender *pSender = emails:1ayhost emailerE form-posted nnounce, then no
102		-
103		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
104		- }
105		- rc = relayhost emailerError(p, arn p;emailemailemailemailemailsemailemailel>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
106		-**
107		-** statusOptions:
108		-**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
109		- @ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
110		- @ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
111		-; rc = relayhost form-posted nnounce, then no
112		-
113		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
114		- }
115		- rc = relayhost emailerError(p, arn p;
116		-localhost){
117		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
118		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
119		- ** form element to avoid that a URL arg of to=... passed to this
120		- ** page ends up overwriting the form-posted "to" value. This
121		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
122		-**
123		-* formemailEmailSender *pSender = emails:1ayhost form-posted nnounce,emailemailemailemailel>_@DK0,6:id="to9S@R form-posted emailemailemailzIrtunce, then no
124		-
125		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
126		- }
127		- rc = relunce,emailemailemailemailpEvent);
128		- emailemailemailemailemailemailemailEmailemailyEmail Address:User:</td>t form-posted nnounce, then no
	32	+ @ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema

	--- a/src/alerts.c
	+++ b/src/alerts.c
	@@ -1,37 +1,4 @@
1	form-posted nnounce, then no
2
3	** have been sent is */ ){int bTest2 = fossil_sarn p;
4	}
5	rc = relayhost emailerError(p, arn p;
6	localhost){
7	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
8	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
9	** form element to avoid that a URL arg of to=... passed to this
10	** page ends up overwriting the form-posted "to" value. This
11	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="memailS3v,3qmjft;h>Disabled</thOptions:
12	**
13	** statusOptions:
14	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
15	@ 3Delivery:1ayhoEmailemailue. This
16	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:<emailor="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:temail form-posted nnounce, then no
17
18	** have been sent is */ ){int bTest2 = fossil_sarn p;
19	}
20	rc = relayhost emailerError(p, arn p;
21	localhost){
22	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
23	/* Maintenance reminder: we unce,emailEmailemailemailemailemailemail_trigger1;\n"email_enabled(void){
24	if( !email 0;
25	emailemail 0emailemailel>_@DK0,6:id="to9S@R form-posted nnounce, temailemailEmailemailEMAIL /announcebTest2 ? "blob" : 02
26	/* Maintenance reminder: we need an exp formEmailEmailEmailEMAILemail_sender_free(EmailEmailrm-posted nnounce, then no
27
28	** have been sent is */ ){int bTest2 = fossil_sarn p;
29	}
30	rc = relayhost emailerError(p, arn p;
31	localhost){
32	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
33	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
34	** form element to avoid tha formEmailemail_sender_frEmailEMAILemailemailemailemailemailemailemailemail-posted nnounce, then no
35
36	** have been sent is */ ){int bTest2 = fossil_sarn p;
37	}
	@@ -57,72 +24,9 @@
57	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
58	** form element to avoid that a URL arg of to=... passed to this
59	** page ends up overwriting the form-posted "to" value. This
60	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label fnounce, then no
61	EMAILemailemailemailemailemailemailemailemailemail_schema(0ndemailEMAILEmailEMAILemailemailemaile, then no
62
63	nnounce, then no
64
65
66	** have been sent is */ ){int bTest2 = fossil_sarn p;
67	}
68	rc = relayhost emailerError(p, arn p;
69	localhost){
70	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
71	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
72	** form element to avoid that a URL arg of to=... passed to this
73	** page ends up overwriting the form-posted "to" value. This
74	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
75	**
76	** statusOptions:
77	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
78	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</emailEmail-emailemailel>_@DK0,6:id="to9S@R form-posted nnounce, then no
79
80	** have been sent is */ ){int bTest2 = fossil_sarn p;
81	}
82	rc = relayhost emailerError(p, arn p;
83	localhost){
84	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
85	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
86	** form element to avoid that a URL arg of to=... passed to this
87	** page ends up overwriting the form-posted "to" value. This
88	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
89	**
90	** statusOptions:
91	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
92	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
93	@ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
94	; rc = relayhost form-posted nnounce, then no
95
96	** have been sent is */ ){int bTest2 = fossil_sarn p;
97	}
98	rc = relayhost emailerError(p, arn p;
99	localhost){
100	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
101	/* Maintenance reminder: we need an explicit action=THIS_PAGEmailSender *pSender = emails:1ayhost emailerE form-posted nnounce, then no
102
103	** have been sent is */ ){int bTest2 = fossil_sarn p;
104	}
105	rc = relayhost emailerError(p, arn p;emailemailemailemailemailsemailemailel>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
106	**
107	** statusOptions:
108	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
109	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
110	@ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
111	; rc = relayhost form-posted nnounce, then no
112
113	** have been sent is */ ){int bTest2 = fossil_sarn p;
114	}
115	rc = relayhost emailerError(p, arn p;
116	localhost){
117	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
118	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
119	** form element to avoid that a URL arg of to=... passed to this
120	** page ends up overwriting the form-posted "to" value. This
121	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
122	**
123	* formemailEmailSender *pSender = emails:1ayhost form-posted nnounce,emailemailemailemailel>_@DK0,6:id="to9S@R form-posted emailemailemailzIrtunce, then no
124
125	** have been sent is */ ){int bTest2 = fossil_sarn p;
126	}
127	rc = relunce,emailemailemailemailpEvent);
128	emailemailemailemailemailemailemailEmailemailyEmail Address:User:</td>t form-posted nnounce, then no

	--- a/src/alerts.c
	+++ b/src/alerts.c
	@@ -1,37 +1,4 @@
1	form-posted nnounce, then no

































2
3	** have been sent is */ ){int bTest2 = fossil_sarn p;
4	}
	@@ -57,72 +24,9 @@
24	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
25	** form element to avoid that a URL arg of to=... passed to this
26	** page ends up overwriting the form-posted "to" value. This




























27	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
28	**
29	** statusOptions:
30	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
31	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
32	@ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema

A src/alerts.c

+32

		--- a/src/alerts.c
		+++ b/src/alerts.c
		@@ -0,0 +1,32 @@
	1	+ form-posted nnounce, then no
	2	+
	3	+ ** have been sent is */ ){int bTest2 = fossil_sarn p;
	4	+ }
	5	+ rc = relayhost emailerError(p, arn p;
	6	+localhost){
	7	+ /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
	8	+ /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
	9	+ ** form element to avoid that a URL arg of to=... passed to this
	10	+ ** page ends up overwriting the form-posted "to" value. This
	11	+ ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
	12	+**
	13	+** statusOptions:
	14	+**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
	15	+ @ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
	16	+ @ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
	17	+; rc = relayhost form-posted nnounce, then no
	18	+
	19	+ ** have been sent is */ ){int bTest2 = fossil_sarn p;
	20	+ }
	21	+ rc = relayhost emailerError(p, arn p;
	22	+localhost){
	23	+ /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
	24	+ /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
	25	+ ** form element to avoid that a URL arg of to=... passed to this
	26	+ ** page ends up overwriting the form-posted "to" value. This
	27	+ ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
	28	+**
	29	+** statusOptions:
	30	+**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
	31	+ @ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
	32	+ @ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema

	--- a/src/alerts.c
	+++ b/src/alerts.c
	@@ -0,0 +1,32 @@

	--- a/src/alerts.c
	+++ b/src/alerts.c
	@@ -0,0 +1,32 @@
1	form-posted nnounce, then no
2
3	** have been sent is */ ){int bTest2 = fossil_sarn p;
4	}
5	rc = relayhost emailerError(p, arn p;
6	localhost){
7	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
8	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
9	** form element to avoid that a URL arg of to=... passed to this
10	** page ends up overwriting the form-posted "to" value. This
11	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
12	**
13	** statusOptions:
14	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
15	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
16	@ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
17	; rc = relayhost form-posted nnounce, then no
18
19	** have been sent is */ ){int bTest2 = fossil_sarn p;
20	}
21	rc = relayhost emailerError(p, arn p;
22	localhost){
23	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
24	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
25	** form element to avoid that a URL arg of to=... passed to this
26	** page ends up overwriting the form-posted "to" value. This
27	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
28	**
29	** statusOptions:
30	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
31	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
32	@ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema

M src/backoffice.c

+1 -1

		--- src/backoffice.c
		+++ src/backoffice.c
		@@ -519,11 +519,11 @@
519	519	fclose(pLog);
520	520	}
521	521	}
522	522
523	523	/* Here is where the actual work of the backoffice happens */
524		- email_backoffice(0);
	524	+ alert_backoffice(0);
525	525	smtp_cleanup();
526	526	}
527	527
528	528	/*
529	529	** COMMAND: backoffice
530	530

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -519,11 +519,11 @@
519	fclose(pLog);
520	}
521	}
522
523	/* Here is where the actual work of the backoffice happens */
524	email_backoffice(0);
525	smtp_cleanup();
526	}
527
528	/*
529	** COMMAND: backoffice
530

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -519,11 +519,11 @@
519	fclose(pLog);
520	}
521	}
522
523	/* Here is where the actual work of the backoffice happens */
524	alert_backoffice(0);
525	smtp_cleanup();
526	}
527
528	/*
529	** COMMAND: backoffice
530

M src/configure.c

+2 -2

		--- src/configure.c
		+++ src/configure.c
		@@ -398,11 +398,11 @@
398	398	thisMask = configure_is_exportable(aType[ii].zName);
399	399	}
400	400	if( (thisMask & groupMask)==0 ) return;
401	401	if( (thisMask & checkMask)!=0 ){
402	402	if( (thisMask & CONFIGSET_SCRIBER)!=0 ){
403		- email_schema(1);
	403	+ alert_schema(1);
404	404	}
405	405	checkMask &= ~thisMask;
406	406	}
407	407
408	408	blob_zero(&sql);
		@@ -415,11 +415,11 @@
415	415	}else{
416	416	blob_append_sql(&sql, "INSERT OR IGNORE INTO ");
417	417	}
418	418	blob_append_sql(&sql, "\"%w\"(\"%w\",mtime",
419	419	&zName[1], aType[ii].zPrimKey);
420		- if( fossil_stricmp(zName,"/subscriber") ) email_schema(0);
	420	+ if( fossil_stricmp(zName,"/subscriber") ) alert_schema(0);
421	421	for(jj=2; jj<nToken; jj+=2){
422	422	blob_append_sql(&sql, ",\"%w\"", azToken[jj]);
423	423	}
424	424	blob_append_sql(&sql,") VALUES(%s,%s",
425	425	azToken[1] /safe-for-%s/, azToken[0]/safe-for-%s/);
426	426

	--- src/configure.c
	+++ src/configure.c
	@@ -398,11 +398,11 @@
398	thisMask = configure_is_exportable(aType[ii].zName);
399	}
400	if( (thisMask & groupMask)==0 ) return;
401	if( (thisMask & checkMask)!=0 ){
402	if( (thisMask & CONFIGSET_SCRIBER)!=0 ){
403	email_schema(1);
404	}
405	checkMask &= ~thisMask;
406	}
407
408	blob_zero(&sql);
	@@ -415,11 +415,11 @@
415	}else{
416	blob_append_sql(&sql, "INSERT OR IGNORE INTO ");
417	}
418	blob_append_sql(&sql, "\"%w\"(\"%w\",mtime",
419	&zName[1], aType[ii].zPrimKey);
420	if( fossil_stricmp(zName,"/subscriber") ) email_schema(0);
421	for(jj=2; jj<nToken; jj+=2){
422	blob_append_sql(&sql, ",\"%w\"", azToken[jj]);
423	}
424	blob_append_sql(&sql,") VALUES(%s,%s",
425	azToken[1] /safe-for-%s/, azToken[0]/safe-for-%s/);
426

	--- src/configure.c
	+++ src/configure.c
	@@ -398,11 +398,11 @@
398	thisMask = configure_is_exportable(aType[ii].zName);
399	}
400	if( (thisMask & groupMask)==0 ) return;
401	if( (thisMask & checkMask)!=0 ){
402	if( (thisMask & CONFIGSET_SCRIBER)!=0 ){
403	alert_schema(1);
404	}
405	checkMask &= ~thisMask;
406	}
407
408	blob_zero(&sql);
	@@ -415,11 +415,11 @@
415	}else{
416	blob_append_sql(&sql, "INSERT OR IGNORE INTO ");
417	}
418	blob_append_sql(&sql, "\"%w\"(\"%w\",mtime",
419	&zName[1], aType[ii].zPrimKey);
420	if( fossil_stricmp(zName,"/subscriber") ) alert_schema(0);
421	for(jj=2; jj<nToken; jj+=2){
422	blob_append_sql(&sql, ",\"%w\"", azToken[jj]);
423	}
424	blob_append_sql(&sql,") VALUES(%s,%s",
425	azToken[1] /safe-for-%s/, azToken[0]/safe-for-%s/);
426

M src/db.c

+1 -1

		--- src/db.c
		+++ src/db.c
		@@ -1001,11 +1001,11 @@
1001	1001	sqlite3_create_function(db, "capunion", 1, SQLITE_UTF8, 0,
1002	1002	0, capability_union_step, capability_union_finalize);
1003	1003	sqlite3_create_function(db, "fullcap", 1, SQLITE_UTF8, 0,
1004	1004	capability_fullcap, 0, 0);
1005	1005	sqlite3_create_function(db, "find_emailaddr", 1, SQLITE_UTF8, 0,
1006		- email_find_emailaddr_func, 0, 0);
	1006	+ alert_find_emailaddr_func, 0, 0);
1007	1007	}
1008	1008
1009	1009	#if USE_SEE
1010	1010	/*
1011	1011	** This is a pointer to the saved database encryption key string.
1012	1012
1013	1013	DELETED src/email.c

	--- src/db.c
	+++ src/db.c
	@@ -1001,11 +1001,11 @@
1001	sqlite3_create_function(db, "capunion", 1, SQLITE_UTF8, 0,
1002	0, capability_union_step, capability_union_finalize);
1003	sqlite3_create_function(db, "fullcap", 1, SQLITE_UTF8, 0,
1004	capability_fullcap, 0, 0);
1005	sqlite3_create_function(db, "find_emailaddr", 1, SQLITE_UTF8, 0,
1006	email_find_emailaddr_func, 0, 0);
1007	}
1008
1009	#if USE_SEE
1010	/*
1011	** This is a pointer to the saved database encryption key string.
1012
1013	ELETED src/email.c

	--- src/db.c
	+++ src/db.c
	@@ -1001,11 +1001,11 @@
1001	sqlite3_create_function(db, "capunion", 1, SQLITE_UTF8, 0,
1002	0, capability_union_step, capability_union_finalize);
1003	sqlite3_create_function(db, "fullcap", 1, SQLITE_UTF8, 0,
1004	capability_fullcap, 0, 0);
1005	sqlite3_create_function(db, "find_emailaddr", 1, SQLITE_UTF8, 0,
1006	alert_find_emailaddr_func, 0, 0);
1007	}
1008
1009	#if USE_SEE
1010	/*
1011	** This is a pointer to the saved database encryption key string.
1012
1013	ELETED src/email.c

D src/email.c

-128

		--- a/src/email.c
		+++ b/src/email.c
		@@ -1,128 +0,0 @@
1		- form-posted nnounce, then no
2		-
3		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
4		- }
5		- rc = relayhost emailerError(p, arn p;
6		-localhost){
7		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
8		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
9		- ** form element to avoid that a URL arg of to=... passed to this
10		- ** page ends up overwriting the form-posted "to" value. This
11		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="memailS3v,3qmjft;h>Disabled</thOptions:
12		-**
13		-** statusOptions:
14		-**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
15		- @ 3Delivery:1ayhoEmailemailue. This
16		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:<emailor="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:temail form-posted nnounce, then no
17		-
18		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
19		- }
20		- rc = relayhost emailerError(p, arn p;
21		-localhost){
22		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
23		- /* Maintenance reminder: we unce,emailEmailemailemailemailemailemail_trigger1;\n"email_enabled(void){
24		- if( !email 0;
25		-emailemail 0emailemailel>_@DK0,6:id="to9S@R form-posted nnounce, temailemailEmailemailEMAIL /announcebTest2 ? "blob" : 02
26		- /* Maintenance reminder: we need an exp formEmailEmailEmailEMAILemail_sender_free(EmailEmailrm-posted nnounce, then no
27		-
28		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
29		- }
30		- rc = relayhost emailerError(p, arn p;
31		-localhost){
32		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
33		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
34		- ** form element to avoid tha formEmailemail_sender_frEmailEMAILemailemailemailemailemailemailemailemail-posted nnounce, then no
35		-
36		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
37		- }
38		- rc = relayhost emailerError(p, arn p;
39		-localhost){
40		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
41		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
42		- ** form element to avoid that a URL arg of to=... passed to this
43		- ** page ends up overwriting the form-posted "to" value. This
44		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
45		-**
46		-** statusOptions:
47		-**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
48		- @ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
49		- @ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
50		-; rc = relayhost form-posted nnounce, then no
51		-
52		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
53		- }
54		- rc = relayhost emailerError(p, arn p;
55		-localhost){
56		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
57		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
58		- ** form element to avoid that a URL arg of to=... passed to this
59		- ** page ends up overwriting the form-posted "to" value. This
60		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label fnounce, then no
61		- EMAILemailemailemailemailemailemailemailemailemail_schema(0ndemailEMAILEmailEMAILemailemailemaile, then no
62		-
63		- nnounce, then no
64		-
65		-
66		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
67		- }
68		- rc = relayhost emailerError(p, arn p;
69		-localhost){
70		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
71		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
72		- ** form element to avoid that a URL arg of to=... passed to this
73		- ** page ends up overwriting the form-posted "to" value. This
74		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
75		-**
76		-** statusOptions:
77		-**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
78		- @ 3Delivery:1ayhost emai rc = relayEmail Address:User:</emailEmail-emailemailel>_@DK0,6:id="to9S@R form-posted nnounce, then no
79		-
80		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
81		- }
82		- rc = relayhost emailerError(p, arn p;
83		-localhost){
84		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
85		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
86		- ** form element to avoid that a URL arg of to=... passed to this
87		- ** page ends up overwriting the form-posted "to" value. This
88		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
89		-**
90		-** statusOptions:
91		-**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
92		- @ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
93		- @ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
94		-; rc = relayhost form-posted nnounce, then no
95		-
96		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
97		- }
98		- rc = relayhost emailerError(p, arn p;
99		-localhost){
100		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
101		- /* Maintenance reminder: we need an explicit action=THIS_PAGEmailSender *pSender = emails:1ayhost emailerE form-posted nnounce, then no
102		-
103		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
104		- }
105		- rc = relayhost emailerError(p, arn p;emailemailemailemailemailsemailemailel>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
106		-**
107		-** statusOptions:
108		-**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
109		- @ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
110		- @ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
111		-; rc = relayhost form-posted nnounce, then no
112		-
113		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
114		- }
115		- rc = relayhost emailerError(p, arn p;
116		-localhost){
117		- /* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
118		- /* Maintenance reminder: we need an explicit action=THIS_PAGE on the
119		- ** form element to avoid that a URL arg of to=... passed to this
120		- ** page ends up overwriting the form-posted "to" value. This
121		- ** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
122		-**
123		-* formemailEmailSender *pSender = emails:1ayhost form-posted nnounce,emailemailemailemailel>_@DK0,6:id="to9S@R form-posted emailemailemailzIrtunce, then no
124		-
125		- ** have been sent is */ ){int bTest2 = fossil_sarn p;
126		- }
127		- rc = relunce,emailemailemailemailpEvent);
128		- emailemailemailemailemailemailemailEmailemailyEmail Address:User:</td>t form-posted nnounce, then no

	--- a/src/email.c
	+++ b/src/email.c
	@@ -1,128 +0,0 @@
1	form-posted nnounce, then no
2
3	** have been sent is */ ){int bTest2 = fossil_sarn p;
4	}
5	rc = relayhost emailerError(p, arn p;
6	localhost){
7	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
8	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
9	** form element to avoid that a URL arg of to=... passed to this
10	** page ends up overwriting the form-posted "to" value. This
11	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="memailS3v,3qmjft;h>Disabled</thOptions:
12	**
13	** statusOptions:
14	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
15	@ 3Delivery:1ayhoEmailemailue. This
16	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:<emailor="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:temail form-posted nnounce, then no
17
18	** have been sent is */ ){int bTest2 = fossil_sarn p;
19	}
20	rc = relayhost emailerError(p, arn p;
21	localhost){
22	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
23	/* Maintenance reminder: we unce,emailEmailemailemailemailemailemail_trigger1;\n"email_enabled(void){
24	if( !email 0;
25	emailemail 0emailemailel>_@DK0,6:id="to9S@R form-posted nnounce, temailemailEmailemailEMAIL /announcebTest2 ? "blob" : 02
26	/* Maintenance reminder: we need an exp formEmailEmailEmailEMAILemail_sender_free(EmailEmailrm-posted nnounce, then no
27
28	** have been sent is */ ){int bTest2 = fossil_sarn p;
29	}
30	rc = relayhost emailerError(p, arn p;
31	localhost){
32	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
33	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
34	** form element to avoid tha formEmailemail_sender_frEmailEMAILemailemailemailemailemailemailemailemail-posted nnounce, then no
35
36	** have been sent is */ ){int bTest2 = fossil_sarn p;
37	}
38	rc = relayhost emailerError(p, arn p;
39	localhost){
40	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
41	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
42	** form element to avoid that a URL arg of to=... passed to this
43	** page ends up overwriting the form-posted "to" value. This
44	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
45	**
46	** statusOptions:
47	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
48	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
49	@ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
50	; rc = relayhost form-posted nnounce, then no
51
52	** have been sent is */ ){int bTest2 = fossil_sarn p;
53	}
54	rc = relayhost emailerError(p, arn p;
55	localhost){
56	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
57	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
58	** form element to avoid that a URL arg of to=... passed to this
59	** page ends up overwriting the form-posted "to" value. This
60	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label fnounce, then no
61	EMAILemailemailemailemailemailemailemailemailemail_schema(0ndemailEMAILEmailEMAILemailemailemaile, then no
62
63	nnounce, then no
64
65
66	** have been sent is */ ){int bTest2 = fossil_sarn p;
67	}
68	rc = relayhost emailerError(p, arn p;
69	localhost){
70	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
71	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
72	** form element to avoid that a URL arg of to=... passed to this
73	** page ends up overwriting the form-posted "to" value. This
74	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
75	**
76	** statusOptions:
77	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
78	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</emailEmail-emailemailel>_@DK0,6:id="to9S@R form-posted nnounce, then no
79
80	** have been sent is */ ){int bTest2 = fossil_sarn p;
81	}
82	rc = relayhost emailerError(p, arn p;
83	localhost){
84	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
85	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
86	** form element to avoid that a URL arg of to=... passed to this
87	** page ends up overwriting the form-posted "to" value. This
88	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
89	**
90	** statusOptions:
91	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
92	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
93	@ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
94	; rc = relayhost form-posted nnounce, then no
95
96	** have been sent is */ ){int bTest2 = fossil_sarn p;
97	}
98	rc = relayhost emailerError(p, arn p;
99	localhost){
100	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
101	/* Maintenance reminder: we need an explicit action=THIS_PAGEmailSender *pSender = emails:1ayhost emailerE form-posted nnounce, then no
102
103	** have been sent is */ ){int bTest2 = fossil_sarn p;
104	}
105	rc = relayhost emailerError(p, arn p;emailemailemailemailemailsemailemailel>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
106	**
107	** statusOptions:
108	**Email Address:1ayhost emailerError(p, arn p; rc = relayhost Security User:</td>text" name="sunamsuname",g.zLogin))" \
109	@ 3Delivery:1ayhost emai rc = relayEmail Address:User:</td>text" name="suname"\
110	@ uidDelivery:1ayhost emai rc = relayEmail Address:1ayhost emailerError(p, arn p; rc = relayhost ema1ayhost ema>
111	; rc = relayhost form-posted nnounce, then no
112
113	** have been sent is */ ){int bTest2 = fossil_sarn p;
114	}
115	rc = relayhost emailerError(p, arn p;
116	localhost){
117	/* If the URL is /announce/test2 instead of just /announcebTest2 ? "blob" : 02
118	/* Maintenance reminder: we need an explicit action=THIS_PAGE on the
119	** form element to avoid that a URL arg of to=... passed to this
120	** page ends up overwriting the form-posted "to" value. This
121	** action value differs for the test1 requor="captcha">Security Code:</label>_@DK0,B:id="captchaW@Idx,2r@QVB,G:<label for="fromX@QX~,6:label>Y@DBW,8:id="from1_@QYz,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"1Fc@QcQ,R:<label for="to">To:</label>_@DK0,6:id="to9S@Rsb,a:<label for="subject">Subject:</label>Y@DBW,A:id="subjec1m@S1e,X:<label for="msg">Message:</label>G@DBW,H:textarea id="msg"5h@S3v,3qmjft;h>Disabled</thOptions:
122	**
123	* formemailEmailSender *pSender = emails:1ayhost form-posted nnounce,emailemailemailemailel>_@DK0,6:id="to9S@R form-posted emailemailemailzIrtunce, then no
124
125	** have been sent is */ ){int bTest2 = fossil_sarn p;
126	}
127	rc = relunce,emailemailemailemailpEvent);
128	emailemailemailemailemailemailemailEmailemailyEmail Address:User:</td>t form-posted nnounce, then no

	--- a/src/email.c
	+++ b/src/email.c
	@@ -1,128 +0,0 @@

M src/login.c

+7 -7

		--- src/login.c
		+++ src/login.c
		@@ -790,11 +790,11 @@
790	790	free(zCaptcha);
791	791	}
792	792	@ </form>
793	793	}
794	794	if( login_is_individual() && g.perm.Password ){
795		- if( email_enabled() ){
	795	+ if( alert_enabled() ){
796	796	@ <hr>
797	797	@ <p>Configure <a href="%R/alerts">Email Alerts</a>
798	798	@ for user <b>%h(g.zLogin)</b></p>
799	799	}
800	800	@ <hr />
		@@ -1542,11 +1542,11 @@
1542	1542	}
1543	1543	zPerms = db_get("default-perms","u");
1544	1544
1545	1545	/* Prompt the user for email alerts if this repository is configured for
1546	1546	** email alerts and if the default permissions include "7" */
1547		- canDoAlerts = email_tables_exist() && db_int(0,
	1547	+ canDoAlerts = alert_tables_exist() && db_int(0,
1548	1548	"SELECT fullcap(%Q) GLOB '7'", zPerms
1549	1549	);
1550	1550	doAlerts = canDoAlerts && atoi(PD("alerts","1"))!=0;
1551	1551
1552	1552	zUserID = PDT("u","");
		@@ -1615,11 +1615,11 @@
1615	1615	uid = db_int(0, "SELECT uid FROM user WHERE login=%Q", zUserID);
1616	1616	login_set_user_cookie(zUserID, uid, NULL);
1617	1617	if( doAlerts ){
1618	1618	/* Also make the new user a subscriber. */
1619	1619	Blob hdr, body;
1620		- EmailSender *pSender;
	1620	+ AlertSender *pSender;
1621	1621	sqlite3_int64 id; /* New subscriber Id */
1622	1622	const char zCode; / New subscriber code (in hex) */
1623	1623	const char *zGoto = P("g");
1624	1624	int nsub = 0;
1625	1625	char ssub[20];
		@@ -1653,17 +1653,17 @@
1653	1653	}
1654	1654	zCode = db_text(0,
1655	1655	"SELECT hex(subscriberCode) FROM subscriber WHERE subscriberId=%lld",
1656	1656	id);
1657	1657	/* A verification email */
1658		- pSender = email_sender_new(0,0);
	1658	+ pSender = alert_sender_new(0,0);
1659	1659	blob_init(&hdr,0,0);
1660	1660	blob_init(&body,0,0);
1661	1661	blob_appendf(&hdr, "To: <%s>\n", zEAddr);
1662	1662	blob_appendf(&hdr, "Subject: Subscription verification\n");
1663		- email_append_confirmation_message(&body, zCode);
1664		- email_send(pSender, &hdr, &body, 0);
	1663	+ alert_append_confirmation_message(&body, zCode);
	1664	+ alert_send(pSender, &hdr, &body, 0);
1665	1665	style_header("Email Verification");
1666	1666	if( pSender->zErr ){
1667	1667	@ <h1>Internal Error</h1>
1668	1668	@ <p>The following internal error was encountered while trying
1669	1669	@ to send the confirmation email:
		@@ -1673,11 +1673,11 @@
1673	1673	}else{
1674	1674	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1675	1675	@ hyperlink that you must click on in order to activate your
1676	1676	@ subscription.</p>
1677	1677	}
1678		- email_sender_free(pSender);
	1678	+ alert_sender_free(pSender);
1679	1679	if( zGoto ){
1680	1680	@ <p><a href='%h(zGoto)'>Continue</a>
1681	1681	}
1682	1682	style_footer();
1683	1683	return;
1684	1684

	--- src/login.c
	+++ src/login.c
	@@ -790,11 +790,11 @@
790	free(zCaptcha);
791	}
792	@ </form>
793	}
794	if( login_is_individual() && g.perm.Password ){
795	if( email_enabled() ){
796	@ <hr>
797	@ <p>Configure <a href="%R/alerts">Email Alerts</a>
798	@ for user <b>%h(g.zLogin)</b></p>
799	}
800	@ <hr />
	@@ -1542,11 +1542,11 @@
1542	}
1543	zPerms = db_get("default-perms","u");
1544
1545	/* Prompt the user for email alerts if this repository is configured for
1546	** email alerts and if the default permissions include "7" */
1547	canDoAlerts = email_tables_exist() && db_int(0,
1548	"SELECT fullcap(%Q) GLOB '7'", zPerms
1549	);
1550	doAlerts = canDoAlerts && atoi(PD("alerts","1"))!=0;
1551
1552	zUserID = PDT("u","");
	@@ -1615,11 +1615,11 @@
1615	uid = db_int(0, "SELECT uid FROM user WHERE login=%Q", zUserID);
1616	login_set_user_cookie(zUserID, uid, NULL);
1617	if( doAlerts ){
1618	/* Also make the new user a subscriber. */
1619	Blob hdr, body;
1620	EmailSender *pSender;
1621	sqlite3_int64 id; /* New subscriber Id */
1622	const char zCode; / New subscriber code (in hex) */
1623	const char *zGoto = P("g");
1624	int nsub = 0;
1625	char ssub[20];
	@@ -1653,17 +1653,17 @@
1653	}
1654	zCode = db_text(0,
1655	"SELECT hex(subscriberCode) FROM subscriber WHERE subscriberId=%lld",
1656	id);
1657	/* A verification email */
1658	pSender = email_sender_new(0,0);
1659	blob_init(&hdr,0,0);
1660	blob_init(&body,0,0);
1661	blob_appendf(&hdr, "To: <%s>\n", zEAddr);
1662	blob_appendf(&hdr, "Subject: Subscription verification\n");
1663	email_append_confirmation_message(&body, zCode);
1664	email_send(pSender, &hdr, &body, 0);
1665	style_header("Email Verification");
1666	if( pSender->zErr ){
1667	@ <h1>Internal Error</h1>
1668	@ <p>The following internal error was encountered while trying
1669	@ to send the confirmation email:
	@@ -1673,11 +1673,11 @@
1673	}else{
1674	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1675	@ hyperlink that you must click on in order to activate your
1676	@ subscription.</p>
1677	}
1678	email_sender_free(pSender);
1679	if( zGoto ){
1680	@ <p><a href='%h(zGoto)'>Continue</a>
1681	}
1682	style_footer();
1683	return;
1684

	--- src/login.c
	+++ src/login.c
	@@ -790,11 +790,11 @@
790	free(zCaptcha);
791	}
792	@ </form>
793	}
794	if( login_is_individual() && g.perm.Password ){
795	if( alert_enabled() ){
796	@ <hr>
797	@ <p>Configure <a href="%R/alerts">Email Alerts</a>
798	@ for user <b>%h(g.zLogin)</b></p>
799	}
800	@ <hr />
	@@ -1542,11 +1542,11 @@
1542	}
1543	zPerms = db_get("default-perms","u");
1544
1545	/* Prompt the user for email alerts if this repository is configured for
1546	** email alerts and if the default permissions include "7" */
1547	canDoAlerts = alert_tables_exist() && db_int(0,
1548	"SELECT fullcap(%Q) GLOB '7'", zPerms
1549	);
1550	doAlerts = canDoAlerts && atoi(PD("alerts","1"))!=0;
1551
1552	zUserID = PDT("u","");
	@@ -1615,11 +1615,11 @@
1615	uid = db_int(0, "SELECT uid FROM user WHERE login=%Q", zUserID);
1616	login_set_user_cookie(zUserID, uid, NULL);
1617	if( doAlerts ){
1618	/* Also make the new user a subscriber. */
1619	Blob hdr, body;
1620	AlertSender *pSender;
1621	sqlite3_int64 id; /* New subscriber Id */
1622	const char zCode; / New subscriber code (in hex) */
1623	const char *zGoto = P("g");
1624	int nsub = 0;
1625	char ssub[20];
	@@ -1653,17 +1653,17 @@
1653	}
1654	zCode = db_text(0,
1655	"SELECT hex(subscriberCode) FROM subscriber WHERE subscriberId=%lld",
1656	id);
1657	/* A verification email */
1658	pSender = alert_sender_new(0,0);
1659	blob_init(&hdr,0,0);
1660	blob_init(&body,0,0);
1661	blob_appendf(&hdr, "To: <%s>\n", zEAddr);
1662	blob_appendf(&hdr, "Subject: Subscription verification\n");
1663	alert_append_confirmation_message(&body, zCode);
1664	alert_send(pSender, &hdr, &body, 0);
1665	style_header("Email Verification");
1666	if( pSender->zErr ){
1667	@ <h1>Internal Error</h1>
1668	@ <p>The following internal error was encountered while trying
1669	@ to send the confirmation email:
	@@ -1673,11 +1673,11 @@
1673	}else{
1674	@ <p>An email has been sent to "%h(zEAddr)". That email contains a
1675	@ hyperlink that you must click on in order to activate your
1676	@ subscription.</p>
1677	}
1678	alert_sender_free(pSender);
1679	if( zGoto ){
1680	@ <p><a href='%h(zGoto)'>Continue</a>
1681	}
1682	style_footer();
1683	return;
1684

M src/main.mk

+12 -12

		--- src/main.mk
		+++ src/main.mk
		@@ -14,10 +14,11 @@
14	14	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
15	15
16	16
17	17	SRC = \
18	18	$(SRCDIR)/add.c \
	19	+ $(SRCDIR)/alerts.c \
19	20	$(SRCDIR)/allrepo.c \
20	21	$(SRCDIR)/attach.c \
21	22	$(SRCDIR)/backoffice.c \
22	23	$(SRCDIR)/bag.c \
23	24	$(SRCDIR)/bisect.c \
		@@ -44,11 +45,10 @@
44	45	$(SRCDIR)/descendants.c \
45	46	$(SRCDIR)/diff.c \
46	47	$(SRCDIR)/diffcmd.c \
47	48	$(SRCDIR)/dispatch.c \
48	49	$(SRCDIR)/doc.c \
49		- $(SRCDIR)/email.c \
50	50	$(SRCDIR)/encode.c \
51	51	$(SRCDIR)/etag.c \
52	52	$(SRCDIR)/event.c \
53	53	$(SRCDIR)/export.c \
54	54	$(SRCDIR)/file.c \
		@@ -223,10 +223,11 @@
223	223	$(SRCDIR)/useredit.js \
224	224	$(SRCDIR)/wiki.wiki
225	225
226	226	TRANS_SRC = \
227	227	$(OBJDIR)/add_.c \
	228	+ $(OBJDIR)/alerts_.c \
228	229	$(OBJDIR)/allrepo_.c \
229	230	$(OBJDIR)/attach_.c \
230	231	$(OBJDIR)/backoffice_.c \
231	232	$(OBJDIR)/bag_.c \
232	233	$(OBJDIR)/bisect_.c \
		@@ -253,11 +254,10 @@
253	254	$(OBJDIR)/descendants_.c \
254	255	$(OBJDIR)/diff_.c \
255	256	$(OBJDIR)/diffcmd_.c \
256	257	$(OBJDIR)/dispatch_.c \
257	258	$(OBJDIR)/doc_.c \
258		- $(OBJDIR)/email_.c \
259	259	$(OBJDIR)/encode_.c \
260	260	$(OBJDIR)/etag_.c \
261	261	$(OBJDIR)/event_.c \
262	262	$(OBJDIR)/export_.c \
263	263	$(OBJDIR)/file_.c \
		@@ -360,10 +360,11 @@
360	360	$(OBJDIR)/xfersetup_.c \
361	361	$(OBJDIR)/zip_.c
362	362
363	363	OBJ = \
364	364	$(OBJDIR)/add.o \
	365	+ $(OBJDIR)/alerts.o \
365	366	$(OBJDIR)/allrepo.o \
366	367	$(OBJDIR)/attach.o \
367	368	$(OBJDIR)/backoffice.o \
368	369	$(OBJDIR)/bag.o \
369	370	$(OBJDIR)/bisect.o \
		@@ -390,11 +391,10 @@
390	391	$(OBJDIR)/descendants.o \
391	392	$(OBJDIR)/diff.o \
392	393	$(OBJDIR)/diffcmd.o \
393	394	$(OBJDIR)/dispatch.o \
394	395	$(OBJDIR)/doc.o \
395		- $(OBJDIR)/email.o \
396	396	$(OBJDIR)/encode.o \
397	397	$(OBJDIR)/etag.o \
398	398	$(OBJDIR)/event.o \
399	399	$(OBJDIR)/export.o \
400	400	$(OBJDIR)/file.o \
		@@ -695,10 +695,11 @@
695	695	$(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
696	696	$(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
697	697
698	698	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
699	699	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
	700	+ $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
700	701	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
701	702	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
702	703	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
703	704	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
704	705	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
		@@ -725,11 +726,10 @@
725	726	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
726	727	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
727	728	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
728	729	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
729	730	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
730		- $(OBJDIR)/email_.c:$(OBJDIR)/email.h \
731	731	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
732	732	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
733	733	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
734	734	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
735	735	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
		@@ -843,10 +843,18 @@
843	843
844	844	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
845	845	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
846	846
847	847	$(OBJDIR)/add.h: $(OBJDIR)/headers
	848	+
	849	+$(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(OBJDIR)/translate
	850	+ $(OBJDIR)/translate $(SRCDIR)/alerts.c >$@
	851	+
	852	+$(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
	853	+ $(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
	854	+
	855	+$(OBJDIR)/alerts.h: $(OBJDIR)/headers
848	856
849	857	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(OBJDIR)/translate
850	858	$(OBJDIR)/translate $(SRCDIR)/allrepo.c >$@
851	859
852	860	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
		@@ -1084,18 +1092,10 @@
1084	1092	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1085	1093	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1086	1094
1087	1095	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1088	1096
1089		-$(OBJDIR)/email_.c: $(SRCDIR)/email.c $(OBJDIR)/translate
1090		- $(OBJDIR)/translate $(SRCDIR)/email.c >$@
1091		-
1092		-$(OBJDIR)/email.o: $(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
1093		- $(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
1094		-
1095		-$(OBJDIR)/email.h: $(OBJDIR)/headers
1096		-
1097	1097	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(OBJDIR)/translate
1098	1098	$(OBJDIR)/translate $(SRCDIR)/encode.c >$@
1099	1099
1100	1100	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1101	1101	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
1102	1102

	--- src/main.mk
	+++ src/main.mk
	@@ -14,10 +14,11 @@
14	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
15
16
17	SRC = \
18	$(SRCDIR)/add.c \

19	$(SRCDIR)/allrepo.c \
20	$(SRCDIR)/attach.c \
21	$(SRCDIR)/backoffice.c \
22	$(SRCDIR)/bag.c \
23	$(SRCDIR)/bisect.c \
	@@ -44,11 +45,10 @@
44	$(SRCDIR)/descendants.c \
45	$(SRCDIR)/diff.c \
46	$(SRCDIR)/diffcmd.c \
47	$(SRCDIR)/dispatch.c \
48	$(SRCDIR)/doc.c \
49	$(SRCDIR)/email.c \
50	$(SRCDIR)/encode.c \
51	$(SRCDIR)/etag.c \
52	$(SRCDIR)/event.c \
53	$(SRCDIR)/export.c \
54	$(SRCDIR)/file.c \
	@@ -223,10 +223,11 @@
223	$(SRCDIR)/useredit.js \
224	$(SRCDIR)/wiki.wiki
225
226	TRANS_SRC = \
227	$(OBJDIR)/add_.c \

228	$(OBJDIR)/allrepo_.c \
229	$(OBJDIR)/attach_.c \
230	$(OBJDIR)/backoffice_.c \
231	$(OBJDIR)/bag_.c \
232	$(OBJDIR)/bisect_.c \
	@@ -253,11 +254,10 @@
253	$(OBJDIR)/descendants_.c \
254	$(OBJDIR)/diff_.c \
255	$(OBJDIR)/diffcmd_.c \
256	$(OBJDIR)/dispatch_.c \
257	$(OBJDIR)/doc_.c \
258	$(OBJDIR)/email_.c \
259	$(OBJDIR)/encode_.c \
260	$(OBJDIR)/etag_.c \
261	$(OBJDIR)/event_.c \
262	$(OBJDIR)/export_.c \
263	$(OBJDIR)/file_.c \
	@@ -360,10 +360,11 @@
360	$(OBJDIR)/xfersetup_.c \
361	$(OBJDIR)/zip_.c
362
363	OBJ = \
364	$(OBJDIR)/add.o \

365	$(OBJDIR)/allrepo.o \
366	$(OBJDIR)/attach.o \
367	$(OBJDIR)/backoffice.o \
368	$(OBJDIR)/bag.o \
369	$(OBJDIR)/bisect.o \
	@@ -390,11 +391,10 @@
390	$(OBJDIR)/descendants.o \
391	$(OBJDIR)/diff.o \
392	$(OBJDIR)/diffcmd.o \
393	$(OBJDIR)/dispatch.o \
394	$(OBJDIR)/doc.o \
395	$(OBJDIR)/email.o \
396	$(OBJDIR)/encode.o \
397	$(OBJDIR)/etag.o \
398	$(OBJDIR)/event.o \
399	$(OBJDIR)/export.o \
400	$(OBJDIR)/file.o \
	@@ -695,10 +695,11 @@
695	$(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
696	$(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
697
698	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
699	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \

700	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
701	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
702	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
703	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
704	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
	@@ -725,11 +726,10 @@
725	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
726	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
727	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
728	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
729	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
730	$(OBJDIR)/email_.c:$(OBJDIR)/email.h \
731	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
732	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
733	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
734	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
735	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
	@@ -843,10 +843,18 @@
843
844	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
845	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
846
847	$(OBJDIR)/add.h: $(OBJDIR)/headers








848
849	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(OBJDIR)/translate
850	$(OBJDIR)/translate $(SRCDIR)/allrepo.c >$@
851
852	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
	@@ -1084,18 +1092,10 @@
1084	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1085	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1086
1087	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1088
1089	$(OBJDIR)/email_.c: $(SRCDIR)/email.c $(OBJDIR)/translate
1090	$(OBJDIR)/translate $(SRCDIR)/email.c >$@
1091
1092	$(OBJDIR)/email.o: $(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
1093	$(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
1094
1095	$(OBJDIR)/email.h: $(OBJDIR)/headers
1096
1097	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(OBJDIR)/translate
1098	$(OBJDIR)/translate $(SRCDIR)/encode.c >$@
1099
1100	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1101	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
1102

	--- src/main.mk
	+++ src/main.mk
	@@ -14,10 +14,11 @@
14	XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
15
16
17	SRC = \
18	$(SRCDIR)/add.c \
19	$(SRCDIR)/alerts.c \
20	$(SRCDIR)/allrepo.c \
21	$(SRCDIR)/attach.c \
22	$(SRCDIR)/backoffice.c \
23	$(SRCDIR)/bag.c \
24	$(SRCDIR)/bisect.c \
	@@ -44,11 +45,10 @@
45	$(SRCDIR)/descendants.c \
46	$(SRCDIR)/diff.c \
47	$(SRCDIR)/diffcmd.c \
48	$(SRCDIR)/dispatch.c \
49	$(SRCDIR)/doc.c \

50	$(SRCDIR)/encode.c \
51	$(SRCDIR)/etag.c \
52	$(SRCDIR)/event.c \
53	$(SRCDIR)/export.c \
54	$(SRCDIR)/file.c \
	@@ -223,10 +223,11 @@
223	$(SRCDIR)/useredit.js \
224	$(SRCDIR)/wiki.wiki
225
226	TRANS_SRC = \
227	$(OBJDIR)/add_.c \
228	$(OBJDIR)/alerts_.c \
229	$(OBJDIR)/allrepo_.c \
230	$(OBJDIR)/attach_.c \
231	$(OBJDIR)/backoffice_.c \
232	$(OBJDIR)/bag_.c \
233	$(OBJDIR)/bisect_.c \
	@@ -253,11 +254,10 @@
254	$(OBJDIR)/descendants_.c \
255	$(OBJDIR)/diff_.c \
256	$(OBJDIR)/diffcmd_.c \
257	$(OBJDIR)/dispatch_.c \
258	$(OBJDIR)/doc_.c \

259	$(OBJDIR)/encode_.c \
260	$(OBJDIR)/etag_.c \
261	$(OBJDIR)/event_.c \
262	$(OBJDIR)/export_.c \
263	$(OBJDIR)/file_.c \
	@@ -360,10 +360,11 @@
360	$(OBJDIR)/xfersetup_.c \
361	$(OBJDIR)/zip_.c
362
363	OBJ = \
364	$(OBJDIR)/add.o \
365	$(OBJDIR)/alerts.o \
366	$(OBJDIR)/allrepo.o \
367	$(OBJDIR)/attach.o \
368	$(OBJDIR)/backoffice.o \
369	$(OBJDIR)/bag.o \
370	$(OBJDIR)/bisect.o \
	@@ -390,11 +391,10 @@
391	$(OBJDIR)/descendants.o \
392	$(OBJDIR)/diff.o \
393	$(OBJDIR)/diffcmd.o \
394	$(OBJDIR)/dispatch.o \
395	$(OBJDIR)/doc.o \

396	$(OBJDIR)/encode.o \
397	$(OBJDIR)/etag.o \
398	$(OBJDIR)/event.o \
399	$(OBJDIR)/export.o \
400	$(OBJDIR)/file.o \
	@@ -695,10 +695,11 @@
695	$(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
696	$(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
697
698	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
699	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
700	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
701	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
702	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
703	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
704	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
705	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
	@@ -725,11 +726,10 @@
726	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
727	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
728	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
729	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
730	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \

731	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
732	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
733	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
734	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
735	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
	@@ -843,10 +843,18 @@
843
844	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
845	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
846
847	$(OBJDIR)/add.h: $(OBJDIR)/headers
848
849	$(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(OBJDIR)/translate
850	$(OBJDIR)/translate $(SRCDIR)/alerts.c >$@
851
852	$(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
853	$(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
854
855	$(OBJDIR)/alerts.h: $(OBJDIR)/headers
856
857	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(OBJDIR)/translate
858	$(OBJDIR)/translate $(SRCDIR)/allrepo.c >$@
859
860	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
	@@ -1084,18 +1092,10 @@
1092	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1093	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1094
1095	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1096








1097	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(OBJDIR)/translate
1098	$(OBJDIR)/translate $(SRCDIR)/encode.c >$@
1099
1100	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1101	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
1102

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -26,10 +26,11 @@
26	26	# Set the separate extra_files variable further down for how to add non-C
27	27	# files, such as string and BLOB resources.
28	28	#
29	29	set src {
30	30	add
	31	+ alerts
31	32	allrepo
32	33	attach
33	34	backoffice
34	35	bag
35	36	bisect
		@@ -56,11 +57,10 @@
56	57	descendants
57	58	diff
58	59	diffcmd
59	60	dispatch
60	61	doc
61		- email
62	62	encode
63	63	etag
64	64	event
65	65	export
66	66	file
67	67

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -26,10 +26,11 @@
26	# Set the separate extra_files variable further down for how to add non-C
27	# files, such as string and BLOB resources.
28	#
29	set src {
30	add

31	allrepo
32	attach
33	backoffice
34	bag
35	bisect
	@@ -56,11 +57,10 @@
56	descendants
57	diff
58	diffcmd
59	dispatch
60	doc
61	email
62	encode
63	etag
64	event
65	export
66	file
67

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -26,10 +26,11 @@
26	# Set the separate extra_files variable further down for how to add non-C
27	# files, such as string and BLOB resources.
28	#
29	set src {
30	add
31	alerts
32	allrepo
33	attach
34	backoffice
35	bag
36	bisect
	@@ -56,11 +57,10 @@
57	descendants
58	diff
59	diffcmd
60	dispatch
61	doc

62	encode
63	etag
64	event
65	export
66	file
67

M src/rebuild.c

+3 -3

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -358,21 +358,21 @@
358	358	ttyOutput = doOut;
359	359	processCnt = 0;
360	360	if (ttyOutput && !g.fQuiet) {
361	361	percent_complete(0);
362	362	}
363		- email_triggers_disable();
	363	+ alert_triggers_disable();
364	364	rebuild_update_schema();
365	365	blob_init(&sql, 0, 0);
366	366	db_prepare(&q,
367	367	"SELECT name FROM sqlite_master /scan/"
368	368	" WHERE type='table'"
369	369	" AND name NOT IN ('admin_log', 'blob','delta','rcvfrom','user','alias',"
370	370	"'config','shun','private','reportfmt',"
371	371	"'concealed','accesslog','modreq',"
372	372	"'purgeevent','purgeitem','unversioned',"
373		- "'subscriber','pending_alert','email_bounce')"
	373	+ "'subscriber','pending_alert','alert_bounce')"
374	374	" AND name NOT GLOB 'sqlite_*'"
375	375	" AND name NOT GLOB 'fx_*'"
376	376	);
377	377	while( db_step(&q)==SQLITE_ROW ){
378	378	blob_appendf(&sql, "DROP TABLE IF EXISTS \"%w\";\n", db_column_text(&q,0));
		@@ -449,11 +449,11 @@
449	449	if( doClustering ) create_cluster();
450	450	if( ttyOutput && !g.fQuiet && totalSize>0 ){
451	451	processCnt += incrSize;
452	452	percent_complete((processCnt*1000)/totalSize);
453	453	}
454		- email_triggers_enable();
	454	+ alert_triggers_enable();
455	455	if(!g.fQuiet && ttyOutput ){
456	456	percent_complete(1000);
457	457	fossil_print("\n");
458	458	}
459	459	return errCnt;
460	460

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -358,21 +358,21 @@
358	ttyOutput = doOut;
359	processCnt = 0;
360	if (ttyOutput && !g.fQuiet) {
361	percent_complete(0);
362	}
363	email_triggers_disable();
364	rebuild_update_schema();
365	blob_init(&sql, 0, 0);
366	db_prepare(&q,
367	"SELECT name FROM sqlite_master /scan/"
368	" WHERE type='table'"
369	" AND name NOT IN ('admin_log', 'blob','delta','rcvfrom','user','alias',"
370	"'config','shun','private','reportfmt',"
371	"'concealed','accesslog','modreq',"
372	"'purgeevent','purgeitem','unversioned',"
373	"'subscriber','pending_alert','email_bounce')"
374	" AND name NOT GLOB 'sqlite_*'"
375	" AND name NOT GLOB 'fx_*'"
376	);
377	while( db_step(&q)==SQLITE_ROW ){
378	blob_appendf(&sql, "DROP TABLE IF EXISTS \"%w\";\n", db_column_text(&q,0));
	@@ -449,11 +449,11 @@
449	if( doClustering ) create_cluster();
450	if( ttyOutput && !g.fQuiet && totalSize>0 ){
451	processCnt += incrSize;
452	percent_complete((processCnt*1000)/totalSize);
453	}
454	email_triggers_enable();
455	if(!g.fQuiet && ttyOutput ){
456	percent_complete(1000);
457	fossil_print("\n");
458	}
459	return errCnt;
460

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -358,21 +358,21 @@
358	ttyOutput = doOut;
359	processCnt = 0;
360	if (ttyOutput && !g.fQuiet) {
361	percent_complete(0);
362	}
363	alert_triggers_disable();
364	rebuild_update_schema();
365	blob_init(&sql, 0, 0);
366	db_prepare(&q,
367	"SELECT name FROM sqlite_master /scan/"
368	" WHERE type='table'"
369	" AND name NOT IN ('admin_log', 'blob','delta','rcvfrom','user','alias',"
370	"'config','shun','private','reportfmt',"
371	"'concealed','accesslog','modreq',"
372	"'purgeevent','purgeitem','unversioned',"
373	"'subscriber','pending_alert','alert_bounce')"
374	" AND name NOT GLOB 'sqlite_*'"
375	" AND name NOT GLOB 'fx_*'"
376	);
377	while( db_step(&q)==SQLITE_ROW ){
378	blob_appendf(&sql, "DROP TABLE IF EXISTS \"%w\";\n", db_column_text(&q,0));
	@@ -449,11 +449,11 @@
449	if( doClustering ) create_cluster();
450	if( ttyOutput && !g.fQuiet && totalSize>0 ){
451	processCnt += incrSize;
452	percent_complete((processCnt*1000)/totalSize);
453	}
454	alert_triggers_enable();
455	if(!g.fQuiet && ttyOutput ){
456	percent_complete(1000);
457	fossil_print("\n");
458	}
459	return errCnt;
460

M src/security_audit.c

+1 -1

		--- src/security_audit.c
		+++ src/security_audit.c
		@@ -390,11 +390,11 @@
390	390	}
391	391
392	392	@ <li><p> User capability summary:
393	393	capability_summary();
394	394
395		- if( email_enabled() ){
	395	+ if( alert_enabled() ){
396	396	@ <li><p> Email alert configuration summary:
397	397	@ <table class="label-value">
398	398	stats_for_email();
399	399	@ </table>
400	400	}else{
401	401

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -390,11 +390,11 @@
390	}
391
392	@ <li><p> User capability summary:
393	capability_summary();
394
395	if( email_enabled() ){
396	@ <li><p> Email alert configuration summary:
397	@ <table class="label-value">
398	stats_for_email();
399	@ </table>
400	}else{
401

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -390,11 +390,11 @@
390	}
391
392	@ <li><p> User capability summary:
393	capability_summary();
394
395	if( alert_enabled() ){
396	@ <li><p> Email alert configuration summary:
397	@ <table class="label-value">
398	stats_for_email();
399	@ </table>
400	}else{
401

M src/stat.c

+1 -1

		--- src/stat.c
		+++ src/stat.c
		@@ -270,11 +270,11 @@
270	270	}
271	271	if( g.perm.Admin ){
272	272	@ <tr><th>Backoffice:</th>
273	273	@ <td>Last run: %z(backoffice_last_run())</td></tr>
274	274	}
275		- if( g.perm.Admin && email_enabled() ){
	275	+ if( g.perm.Admin && alert_enabled() ){
276	276	stats_for_email();
277	277	}
278	278
279	279	@ </table>
280	280	style_footer();
281	281

	--- src/stat.c
	+++ src/stat.c
	@@ -270,11 +270,11 @@
270	}
271	if( g.perm.Admin ){
272	@ <tr><th>Backoffice:</th>
273	@ <td>Last run: %z(backoffice_last_run())</td></tr>
274	}
275	if( g.perm.Admin && email_enabled() ){
276	stats_for_email();
277	}
278
279	@ </table>
280	style_footer();
281

	--- src/stat.c
	+++ src/stat.c
	@@ -270,11 +270,11 @@
270	}
271	if( g.perm.Admin ){
272	@ <tr><th>Backoffice:</th>
273	@ <td>Last run: %z(backoffice_last_run())</td></tr>
274	}
275	if( g.perm.Admin && alert_enabled() ){
276	stats_for_email();
277	}
278
279	@ </table>
280	style_footer();
281

M win/Makefile.dmc

+10 -10

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -28,13 +28,13 @@
28	28
29	29	SQLITE_OPTIONS = -DNDEBUG=1 -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_GET_TABLE -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_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB
30	30
31	31	SHELL_OPTIONS = -DNDEBUG=1 -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_GET_TABLE -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_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -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	32
33		-SRC = add_.c allrepo_.c attach_.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 descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c email_.c encode_.c etag_.c event_.c export_.c file_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c glob_.c graph_.c gzip_.c hname_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c 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 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 wysiwyg_.c xfer_.c xfersetup_.c zip_.c
	33	+SRC = add_.c alerts_.c allrepo_.c attach_.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 descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c file_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c glob_.c graph_.c gzip_.c hname_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c 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 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 wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34	34
35		-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$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)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\email$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\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)\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)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
	35	+OBJ = $(OBJDIR)\add$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$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)\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)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\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)\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)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36	36
37	37
38	38	RC=$(DMDIR)\bin\rcc
39	39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40	40
		@@ -49,11 +49,11 @@
49	49
50	50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	51	$(RC) $(RCFLAGS) -o$@ $**
52	52
53	53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54		- +echo add allrepo attach backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd descendants diff diffcmd dispatch doc email encode etag event export file finfo foci forum fshell fusefs glob graph gzip hname http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
	54	+ +echo add alerts allrepo attach backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd descendants diff diffcmd dispatch doc encode etag event export file finfo foci forum fshell fusefs glob graph gzip hname http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
55	55	+echo fossil >> $@
56	56	+echo fossil >> $@
57	57	+echo $(LIBS) >> $@
58	58	+echo. >> $@
59	59	+echo fossil >> $@
		@@ -134,10 +134,16 @@
134	134	$(OBJDIR)\add$O : add_.c add.h
135	135	$(TCC) -o$@ -c add_.c
136	136
137	137	add_.c : $(SRCDIR)\add.c
138	138	+translate$E $** > $@
	139	+
	140	+$(OBJDIR)\alerts$O : alerts_.c alerts.h
	141	+ $(TCC) -o$@ -c alerts_.c
	142	+
	143	+alerts_.c : $(SRCDIR)\alerts.c
	144	+ +translate$E $** > $@
139	145
140	146	$(OBJDIR)\allrepo$O : allrepo_.c allrepo.h
141	147	$(TCC) -o$@ -c allrepo_.c
142	148
143	149	allrepo_.c : $(SRCDIR)\allrepo.c
		@@ -315,16 +321,10 @@
315	321	$(TCC) -o$@ -c doc_.c
316	322
317	323	doc_.c : $(SRCDIR)\doc.c
318	324	+translate$E $** > $@
319	325
320		-$(OBJDIR)\email$O : email_.c email.h
321		- $(TCC) -o$@ -c email_.c
322		-
323		-email_.c : $(SRCDIR)\email.c
324		- +translate$E $** > $@
325		-
326	326	$(OBJDIR)\encode$O : encode_.c encode.h
327	327	$(TCC) -o$@ -c encode_.c
328	328
329	329	encode_.c : $(SRCDIR)\encode.c
330	330	+translate$E $** > $@
		@@ -940,7 +940,7 @@
940	940
941	941	zip_.c : $(SRCDIR)\zip.c
942	942	+translate$E $** > $@
943	943
944	944	headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
945		- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.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 descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h email_.c:email.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h 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 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 wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
	945	+ +makeheaders$E add_.c:add.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.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 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 file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h 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 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 wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
946	946	@copy /Y nul: headers
947	947

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -28,13 +28,13 @@
28
29	SQLITE_OPTIONS = -DNDEBUG=1 -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_GET_TABLE -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_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB
30
31	SHELL_OPTIONS = -DNDEBUG=1 -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_GET_TABLE -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_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -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 allrepo_.c attach_.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 descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c email_.c encode_.c etag_.c event_.c export_.c file_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c glob_.c graph_.c gzip_.c hname_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c 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 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 wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$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)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\email$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\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)\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)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37
38	RC=$(DMDIR)\bin\rcc
39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40
	@@ -49,11 +49,11 @@
49
50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	$(RC) $(RCFLAGS) -o$@ $**
52
53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54	+echo add allrepo attach backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd descendants diff diffcmd dispatch doc email encode etag event export file finfo foci forum fshell fusefs glob graph gzip hname http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
55	+echo fossil >> $@
56	+echo fossil >> $@
57	+echo $(LIBS) >> $@
58	+echo. >> $@
59	+echo fossil >> $@
	@@ -134,10 +134,16 @@
134	$(OBJDIR)\add$O : add_.c add.h
135	$(TCC) -o$@ -c add_.c
136
137	add_.c : $(SRCDIR)\add.c
138	+translate$E $** > $@






139
140	$(OBJDIR)\allrepo$O : allrepo_.c allrepo.h
141	$(TCC) -o$@ -c allrepo_.c
142
143	allrepo_.c : $(SRCDIR)\allrepo.c
	@@ -315,16 +321,10 @@
315	$(TCC) -o$@ -c doc_.c
316
317	doc_.c : $(SRCDIR)\doc.c
318	+translate$E $** > $@
319
320	$(OBJDIR)\email$O : email_.c email.h
321	$(TCC) -o$@ -c email_.c
322
323	email_.c : $(SRCDIR)\email.c
324	+translate$E $** > $@
325
326	$(OBJDIR)\encode$O : encode_.c encode.h
327	$(TCC) -o$@ -c encode_.c
328
329	encode_.c : $(SRCDIR)\encode.c
330	+translate$E $** > $@
	@@ -940,7 +940,7 @@
940
941	zip_.c : $(SRCDIR)\zip.c
942	+translate$E $** > $@
943
944	headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
945	+makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.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 descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h email_.c:email.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h 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 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 wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
946	@copy /Y nul: headers
947

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -28,13 +28,13 @@
28
29	SQLITE_OPTIONS = -DNDEBUG=1 -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_GET_TABLE -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_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB
30
31	SHELL_OPTIONS = -DNDEBUG=1 -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_GET_TABLE -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_FTS3_PARENTHESIS -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -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 alerts_.c allrepo_.c attach_.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 descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c file_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c glob_.c graph_.c gzip_.c hname_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c piechart_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c 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 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 wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$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)\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)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\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)\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)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37
38	RC=$(DMDIR)\bin\rcc
39	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
40
	@@ -49,11 +49,11 @@
49
50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	$(RC) $(RCFLAGS) -o$@ $**
52
53	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
54	+echo add alerts allrepo attach backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi checkin checkout clearsign clone comformat configure content cookies db delta deltacmd descendants diff diffcmd dispatch doc encode etag event export file finfo foci forum fshell fusefs glob graph gzip hname http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path piechart pivot popen pqueue printf publish purge rebuild regexp report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
55	+echo fossil >> $@
56	+echo fossil >> $@
57	+echo $(LIBS) >> $@
58	+echo. >> $@
59	+echo fossil >> $@
	@@ -134,10 +134,16 @@
134	$(OBJDIR)\add$O : add_.c add.h
135	$(TCC) -o$@ -c add_.c
136
137	add_.c : $(SRCDIR)\add.c
138	+translate$E $** > $@
139
140	$(OBJDIR)\alerts$O : alerts_.c alerts.h
141	$(TCC) -o$@ -c alerts_.c
142
143	alerts_.c : $(SRCDIR)\alerts.c
144	+translate$E $** > $@
145
146	$(OBJDIR)\allrepo$O : allrepo_.c allrepo.h
147	$(TCC) -o$@ -c allrepo_.c
148
149	allrepo_.c : $(SRCDIR)\allrepo.c
	@@ -315,16 +321,10 @@
321	$(TCC) -o$@ -c doc_.c
322
323	doc_.c : $(SRCDIR)\doc.c
324	+translate$E $** > $@
325






326	$(OBJDIR)\encode$O : encode_.c encode.h
327	$(TCC) -o$@ -c encode_.c
328
329	encode_.c : $(SRCDIR)\encode.c
330	+translate$E $** > $@
	@@ -940,7 +940,7 @@
940
941	zip_.c : $(SRCDIR)\zip.c
942	+translate$E $** > $@
943
944	headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
945	+makeheaders$E add_.c:add.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.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 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 file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h piechart_.c:piechart.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h 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 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 wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
946	@copy /Y nul: headers
947

M win/Makefile.mingw

+12 -12

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -437,10 +437,11 @@
437	437	XBCC = $(BCC) $(CFLAGS)
438	438	XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR)
439	439
440	440	SRC = \
441	441	$(SRCDIR)/add.c \
	442	+ $(SRCDIR)/alerts.c \
442	443	$(SRCDIR)/allrepo.c \
443	444	$(SRCDIR)/attach.c \
444	445	$(SRCDIR)/backoffice.c \
445	446	$(SRCDIR)/bag.c \
446	447	$(SRCDIR)/bisect.c \
		@@ -467,11 +468,10 @@
467	468	$(SRCDIR)/descendants.c \
468	469	$(SRCDIR)/diff.c \
469	470	$(SRCDIR)/diffcmd.c \
470	471	$(SRCDIR)/dispatch.c \
471	472	$(SRCDIR)/doc.c \
472		- $(SRCDIR)/email.c \
473	473	$(SRCDIR)/encode.c \
474	474	$(SRCDIR)/etag.c \
475	475	$(SRCDIR)/event.c \
476	476	$(SRCDIR)/export.c \
477	477	$(SRCDIR)/file.c \
		@@ -646,10 +646,11 @@
646	646	$(SRCDIR)/useredit.js \
647	647	$(SRCDIR)/wiki.wiki
648	648
649	649	TRANS_SRC = \
650	650	$(OBJDIR)/add_.c \
	651	+ $(OBJDIR)/alerts_.c \
651	652	$(OBJDIR)/allrepo_.c \
652	653	$(OBJDIR)/attach_.c \
653	654	$(OBJDIR)/backoffice_.c \
654	655	$(OBJDIR)/bag_.c \
655	656	$(OBJDIR)/bisect_.c \
		@@ -676,11 +677,10 @@
676	677	$(OBJDIR)/descendants_.c \
677	678	$(OBJDIR)/diff_.c \
678	679	$(OBJDIR)/diffcmd_.c \
679	680	$(OBJDIR)/dispatch_.c \
680	681	$(OBJDIR)/doc_.c \
681		- $(OBJDIR)/email_.c \
682	682	$(OBJDIR)/encode_.c \
683	683	$(OBJDIR)/etag_.c \
684	684	$(OBJDIR)/event_.c \
685	685	$(OBJDIR)/export_.c \
686	686	$(OBJDIR)/file_.c \
		@@ -783,10 +783,11 @@
783	783	$(OBJDIR)/xfersetup_.c \
784	784	$(OBJDIR)/zip_.c
785	785
786	786	OBJ = \
787	787	$(OBJDIR)/add.o \
	788	+ $(OBJDIR)/alerts.o \
788	789	$(OBJDIR)/allrepo.o \
789	790	$(OBJDIR)/attach.o \
790	791	$(OBJDIR)/backoffice.o \
791	792	$(OBJDIR)/bag.o \
792	793	$(OBJDIR)/bisect.o \
		@@ -813,11 +814,10 @@
813	814	$(OBJDIR)/descendants.o \
814	815	$(OBJDIR)/diff.o \
815	816	$(OBJDIR)/diffcmd.o \
816	817	$(OBJDIR)/dispatch.o \
817	818	$(OBJDIR)/doc.o \
818		- $(OBJDIR)/email.o \
819	819	$(OBJDIR)/encode.o \
820	820	$(OBJDIR)/etag.o \
821	821	$(OBJDIR)/event.o \
822	822	$(OBJDIR)/export.o \
823	823	$(OBJDIR)/file.o \
		@@ -1139,10 +1139,11 @@
1139	1139	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1140	1140	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1141	1141
1142	1142	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1143	1143	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
	1144	+ $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1144	1145	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1145	1146	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1146	1147	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1147	1148	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1148	1149	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
		@@ -1169,11 +1170,10 @@
1169	1170	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1170	1171	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1171	1172	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1172	1173	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1173	1174	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1174		- $(OBJDIR)/email_.c:$(OBJDIR)/email.h \
1175	1175	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1176	1176	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1177	1177	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1178	1178	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1179	1179	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
		@@ -1289,10 +1289,18 @@
1289	1289
1290	1290	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
1291	1291	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
1292	1292
1293	1293	$(OBJDIR)/add.h: $(OBJDIR)/headers
	1294	+
	1295	+$(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(TRANSLATE)
	1296	+ $(TRANSLATE) $(SRCDIR)/alerts.c >$@
	1297	+
	1298	+$(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
	1299	+ $(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
	1300	+
	1301	+$(OBJDIR)/alerts.h: $(OBJDIR)/headers
1294	1302
1295	1303	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(TRANSLATE)
1296	1304	$(TRANSLATE) $(SRCDIR)/allrepo.c >$@
1297	1305
1298	1306	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
		@@ -1530,18 +1538,10 @@
1530	1538	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1531	1539	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1532	1540
1533	1541	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1534	1542
1535		-$(OBJDIR)/email_.c: $(SRCDIR)/email.c $(TRANSLATE)
1536		- $(TRANSLATE) $(SRCDIR)/email.c >$@
1537		-
1538		-$(OBJDIR)/email.o: $(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
1539		- $(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
1540		-
1541		-$(OBJDIR)/email.h: $(OBJDIR)/headers
1542		-
1543	1543	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(TRANSLATE)
1544	1544	$(TRANSLATE) $(SRCDIR)/encode.c >$@
1545	1545
1546	1546	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1547	1547	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
1548	1548

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -437,10 +437,11 @@
437	XBCC = $(BCC) $(CFLAGS)
438	XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR)
439
440	SRC = \
441	$(SRCDIR)/add.c \

442	$(SRCDIR)/allrepo.c \
443	$(SRCDIR)/attach.c \
444	$(SRCDIR)/backoffice.c \
445	$(SRCDIR)/bag.c \
446	$(SRCDIR)/bisect.c \
	@@ -467,11 +468,10 @@
467	$(SRCDIR)/descendants.c \
468	$(SRCDIR)/diff.c \
469	$(SRCDIR)/diffcmd.c \
470	$(SRCDIR)/dispatch.c \
471	$(SRCDIR)/doc.c \
472	$(SRCDIR)/email.c \
473	$(SRCDIR)/encode.c \
474	$(SRCDIR)/etag.c \
475	$(SRCDIR)/event.c \
476	$(SRCDIR)/export.c \
477	$(SRCDIR)/file.c \
	@@ -646,10 +646,11 @@
646	$(SRCDIR)/useredit.js \
647	$(SRCDIR)/wiki.wiki
648
649	TRANS_SRC = \
650	$(OBJDIR)/add_.c \

651	$(OBJDIR)/allrepo_.c \
652	$(OBJDIR)/attach_.c \
653	$(OBJDIR)/backoffice_.c \
654	$(OBJDIR)/bag_.c \
655	$(OBJDIR)/bisect_.c \
	@@ -676,11 +677,10 @@
676	$(OBJDIR)/descendants_.c \
677	$(OBJDIR)/diff_.c \
678	$(OBJDIR)/diffcmd_.c \
679	$(OBJDIR)/dispatch_.c \
680	$(OBJDIR)/doc_.c \
681	$(OBJDIR)/email_.c \
682	$(OBJDIR)/encode_.c \
683	$(OBJDIR)/etag_.c \
684	$(OBJDIR)/event_.c \
685	$(OBJDIR)/export_.c \
686	$(OBJDIR)/file_.c \
	@@ -783,10 +783,11 @@
783	$(OBJDIR)/xfersetup_.c \
784	$(OBJDIR)/zip_.c
785
786	OBJ = \
787	$(OBJDIR)/add.o \

788	$(OBJDIR)/allrepo.o \
789	$(OBJDIR)/attach.o \
790	$(OBJDIR)/backoffice.o \
791	$(OBJDIR)/bag.o \
792	$(OBJDIR)/bisect.o \
	@@ -813,11 +814,10 @@
813	$(OBJDIR)/descendants.o \
814	$(OBJDIR)/diff.o \
815	$(OBJDIR)/diffcmd.o \
816	$(OBJDIR)/dispatch.o \
817	$(OBJDIR)/doc.o \
818	$(OBJDIR)/email.o \
819	$(OBJDIR)/encode.o \
820	$(OBJDIR)/etag.o \
821	$(OBJDIR)/event.o \
822	$(OBJDIR)/export.o \
823	$(OBJDIR)/file.o \
	@@ -1139,10 +1139,11 @@
1139	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1140	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1141
1142	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1143	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \

1144	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1145	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1146	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1147	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1148	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
	@@ -1169,11 +1170,10 @@
1169	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1170	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1171	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1172	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1173	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1174	$(OBJDIR)/email_.c:$(OBJDIR)/email.h \
1175	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1176	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1177	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1178	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1179	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
	@@ -1289,10 +1289,18 @@
1289
1290	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
1291	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
1292
1293	$(OBJDIR)/add.h: $(OBJDIR)/headers








1294
1295	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(TRANSLATE)
1296	$(TRANSLATE) $(SRCDIR)/allrepo.c >$@
1297
1298	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
	@@ -1530,18 +1538,10 @@
1530	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1531	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1532
1533	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1534
1535	$(OBJDIR)/email_.c: $(SRCDIR)/email.c $(TRANSLATE)
1536	$(TRANSLATE) $(SRCDIR)/email.c >$@
1537
1538	$(OBJDIR)/email.o: $(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
1539	$(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
1540
1541	$(OBJDIR)/email.h: $(OBJDIR)/headers
1542
1543	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(TRANSLATE)
1544	$(TRANSLATE) $(SRCDIR)/encode.c >$@
1545
1546	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1547	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
1548

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -437,10 +437,11 @@
437	XBCC = $(BCC) $(CFLAGS)
438	XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR)
439
440	SRC = \
441	$(SRCDIR)/add.c \
442	$(SRCDIR)/alerts.c \
443	$(SRCDIR)/allrepo.c \
444	$(SRCDIR)/attach.c \
445	$(SRCDIR)/backoffice.c \
446	$(SRCDIR)/bag.c \
447	$(SRCDIR)/bisect.c \
	@@ -467,11 +468,10 @@
468	$(SRCDIR)/descendants.c \
469	$(SRCDIR)/diff.c \
470	$(SRCDIR)/diffcmd.c \
471	$(SRCDIR)/dispatch.c \
472	$(SRCDIR)/doc.c \

473	$(SRCDIR)/encode.c \
474	$(SRCDIR)/etag.c \
475	$(SRCDIR)/event.c \
476	$(SRCDIR)/export.c \
477	$(SRCDIR)/file.c \
	@@ -646,10 +646,11 @@
646	$(SRCDIR)/useredit.js \
647	$(SRCDIR)/wiki.wiki
648
649	TRANS_SRC = \
650	$(OBJDIR)/add_.c \
651	$(OBJDIR)/alerts_.c \
652	$(OBJDIR)/allrepo_.c \
653	$(OBJDIR)/attach_.c \
654	$(OBJDIR)/backoffice_.c \
655	$(OBJDIR)/bag_.c \
656	$(OBJDIR)/bisect_.c \
	@@ -676,11 +677,10 @@
677	$(OBJDIR)/descendants_.c \
678	$(OBJDIR)/diff_.c \
679	$(OBJDIR)/diffcmd_.c \
680	$(OBJDIR)/dispatch_.c \
681	$(OBJDIR)/doc_.c \

682	$(OBJDIR)/encode_.c \
683	$(OBJDIR)/etag_.c \
684	$(OBJDIR)/event_.c \
685	$(OBJDIR)/export_.c \
686	$(OBJDIR)/file_.c \
	@@ -783,10 +783,11 @@
783	$(OBJDIR)/xfersetup_.c \
784	$(OBJDIR)/zip_.c
785
786	OBJ = \
787	$(OBJDIR)/add.o \
788	$(OBJDIR)/alerts.o \
789	$(OBJDIR)/allrepo.o \
790	$(OBJDIR)/attach.o \
791	$(OBJDIR)/backoffice.o \
792	$(OBJDIR)/bag.o \
793	$(OBJDIR)/bisect.o \
	@@ -813,11 +814,10 @@
814	$(OBJDIR)/descendants.o \
815	$(OBJDIR)/diff.o \
816	$(OBJDIR)/diffcmd.o \
817	$(OBJDIR)/dispatch.o \
818	$(OBJDIR)/doc.o \

819	$(OBJDIR)/encode.o \
820	$(OBJDIR)/etag.o \
821	$(OBJDIR)/event.o \
822	$(OBJDIR)/export.o \
823	$(OBJDIR)/file.o \
	@@ -1139,10 +1139,11 @@
1139	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1140	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1141
1142	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1143	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1144	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1145	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1146	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1147	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1148	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1149	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
	@@ -1169,11 +1170,10 @@
1170	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1171	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1172	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1173	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1174	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \

1175	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1176	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1177	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1178	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1179	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
	@@ -1289,10 +1289,18 @@
1289
1290	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
1291	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
1292
1293	$(OBJDIR)/add.h: $(OBJDIR)/headers
1294
1295	$(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(TRANSLATE)
1296	$(TRANSLATE) $(SRCDIR)/alerts.c >$@
1297
1298	$(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
1299	$(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
1300
1301	$(OBJDIR)/alerts.h: $(OBJDIR)/headers
1302
1303	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(TRANSLATE)
1304	$(TRANSLATE) $(SRCDIR)/allrepo.c >$@
1305
1306	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
	@@ -1530,18 +1538,10 @@
1538	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1539	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1540
1541	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1542








1543	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(TRANSLATE)
1544	$(TRANSLATE) $(SRCDIR)/encode.c >$@
1545
1546	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1547	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
1548

M win/Makefile.msc

+10 -10

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -379,10 +379,11 @@
379	379	MINIZ_OPTIONS = /DMINIZ_NO_STDIO \
380	380	/DMINIZ_NO_TIME \
381	381	/DMINIZ_NO_ARCHIVE_APIS
382	382
383	383	SRC = add_.c \
	384	+ alerts_.c \
384	385	allrepo_.c \
385	386	attach_.c \
386	387	backoffice_.c \
387	388	bag_.c \
388	389	bisect_.c \
		@@ -409,11 +410,10 @@
409	410	descendants_.c \
410	411	diff_.c \
411	412	diffcmd_.c \
412	413	dispatch_.c \
413	414	doc_.c \
414		- email_.c \
415	415	encode_.c \
416	416	etag_.c \
417	417	event_.c \
418	418	export_.c \
419	419	file_.c \
		@@ -586,10 +586,11 @@
586	586	$(SRCDIR)\tree.js \
587	587	$(SRCDIR)\useredit.js \
588	588	$(SRCDIR)\wiki.wiki
589	589
590	590	OBJ = $(OX)\add$O \
	591	+ $(OX)\alerts$O \
591	592	$(OX)\allrepo$O \
592	593	$(OX)\attach$O \
593	594	$(OX)\backoffice$O \
594	595	$(OX)\bag$O \
595	596	$(OX)\bisect$O \
		@@ -617,11 +618,10 @@
617	618	$(OX)\descendants$O \
618	619	$(OX)\diff$O \
619	620	$(OX)\diffcmd$O \
620	621	$(OX)\dispatch$O \
621	622	$(OX)\doc$O \
622		- $(OX)\email$O \
623	623	$(OX)\encode$O \
624	624	$(OX)\etag$O \
625	625	$(OX)\event$O \
626	626	$(OX)\export$O \
627	627	$(OX)\file$O \
		@@ -782,10 +782,11 @@
782	782	if exist [email protected] \
783	783	$(MTC) -nologo -manifest [email protected] -outputresource:$@;1
784	784
785	785	$(OX)\linkopts: $B\win\Makefile.msc
786	786	echo $(OX)\add.obj > $@
	787	+ echo $(OX)\alerts.obj >> $@
787	788	echo $(OX)\allrepo.obj >> $@
788	789	echo $(OX)\attach.obj >> $@
789	790	echo $(OX)\backoffice.obj >> $@
790	791	echo $(OX)\bag.obj >> $@
791	792	echo $(OX)\bisect.obj >> $@
		@@ -813,11 +814,10 @@
813	814	echo $(OX)\descendants.obj >> $@
814	815	echo $(OX)\diff.obj >> $@
815	816	echo $(OX)\diffcmd.obj >> $@
816	817	echo $(OX)\dispatch.obj >> $@
817	818	echo $(OX)\doc.obj >> $@
818		- echo $(OX)\email.obj >> $@
819	819	echo $(OX)\encode.obj >> $@
820	820	echo $(OX)\etag.obj >> $@
821	821	echo $(OX)\event.obj >> $@
822	822	echo $(OX)\export.obj >> $@
823	823	echo $(OX)\file.obj >> $@
		@@ -1045,10 +1045,16 @@
1045	1045	$(OX)\add$O : add_.c add.h
1046	1046	$(TCC) /Fo$@ -c add_.c
1047	1047
1048	1048	add_.c : $(SRCDIR)\add.c
1049	1049	translate$E $** > $@
	1050	+
	1051	+$(OX)\alerts$O : alerts_.c alerts.h
	1052	+ $(TCC) /Fo$@ -c alerts_.c
	1053	+
	1054	+alerts_.c : $(SRCDIR)\alerts.c
	1055	+ translate$E $** > $@
1050	1056
1051	1057	$(OX)\allrepo$O : allrepo_.c allrepo.h
1052	1058	$(TCC) /Fo$@ -c allrepo_.c
1053	1059
1054	1060	allrepo_.c : $(SRCDIR)\allrepo.c
		@@ -1226,16 +1232,10 @@
1226	1232	$(TCC) /Fo$@ -c doc_.c
1227	1233
1228	1234	doc_.c : $(SRCDIR)\doc.c
1229	1235	translate$E $** > $@
1230	1236
1231		-$(OX)\email$O : email_.c email.h
1232		- $(TCC) /Fo$@ -c email_.c
1233		-
1234		-email_.c : $(SRCDIR)\email.c
1235		- translate$E $** > $@
1236		-
1237	1237	$(OX)\encode$O : encode_.c encode.h
1238	1238	$(TCC) /Fo$@ -c encode_.c
1239	1239
1240	1240	encode_.c : $(SRCDIR)\encode.c
1241	1241	translate$E $** > $@
		@@ -1855,10 +1855,11 @@
1855	1855	fossil.res : $B\win\fossil.rc
1856	1856	$(RCC) /fo $@ $**
1857	1857
1858	1858	headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
1859	1859	makeheaders$E add_.c:add.h \
	1860	+ alerts_.c:alerts.h \
1860	1861	allrepo_.c:allrepo.h \
1861	1862	attach_.c:attach.h \
1862	1863	backoffice_.c:backoffice.h \
1863	1864	bag_.c:bag.h \
1864	1865	bisect_.c:bisect.h \
		@@ -1885,11 +1886,10 @@
1885	1886	descendants_.c:descendants.h \
1886	1887	diff_.c:diff.h \
1887	1888	diffcmd_.c:diffcmd.h \
1888	1889	dispatch_.c:dispatch.h \
1889	1890	doc_.c:doc.h \
1890		- email_.c:email.h \
1891	1891	encode_.c:encode.h \
1892	1892	etag_.c:etag.h \
1893	1893	event_.c:event.h \
1894	1894	export_.c:export.h \
1895	1895	file_.c:file.h \
1896	1896

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -379,10 +379,11 @@
379	MINIZ_OPTIONS = /DMINIZ_NO_STDIO \
380	/DMINIZ_NO_TIME \
381	/DMINIZ_NO_ARCHIVE_APIS
382
383	SRC = add_.c \

384	allrepo_.c \
385	attach_.c \
386	backoffice_.c \
387	bag_.c \
388	bisect_.c \
	@@ -409,11 +410,10 @@
409	descendants_.c \
410	diff_.c \
411	diffcmd_.c \
412	dispatch_.c \
413	doc_.c \
414	email_.c \
415	encode_.c \
416	etag_.c \
417	event_.c \
418	export_.c \
419	file_.c \
	@@ -586,10 +586,11 @@
586	$(SRCDIR)\tree.js \
587	$(SRCDIR)\useredit.js \
588	$(SRCDIR)\wiki.wiki
589
590	OBJ = $(OX)\add$O \

591	$(OX)\allrepo$O \
592	$(OX)\attach$O \
593	$(OX)\backoffice$O \
594	$(OX)\bag$O \
595	$(OX)\bisect$O \
	@@ -617,11 +618,10 @@
617	$(OX)\descendants$O \
618	$(OX)\diff$O \
619	$(OX)\diffcmd$O \
620	$(OX)\dispatch$O \
621	$(OX)\doc$O \
622	$(OX)\email$O \
623	$(OX)\encode$O \
624	$(OX)\etag$O \
625	$(OX)\event$O \
626	$(OX)\export$O \
627	$(OX)\file$O \
	@@ -782,10 +782,11 @@
782	if exist [email protected] \
783	$(MTC) -nologo -manifest [email protected] -outputresource:$@;1
784
785	$(OX)\linkopts: $B\win\Makefile.msc
786	echo $(OX)\add.obj > $@

787	echo $(OX)\allrepo.obj >> $@
788	echo $(OX)\attach.obj >> $@
789	echo $(OX)\backoffice.obj >> $@
790	echo $(OX)\bag.obj >> $@
791	echo $(OX)\bisect.obj >> $@
	@@ -813,11 +814,10 @@
813	echo $(OX)\descendants.obj >> $@
814	echo $(OX)\diff.obj >> $@
815	echo $(OX)\diffcmd.obj >> $@
816	echo $(OX)\dispatch.obj >> $@
817	echo $(OX)\doc.obj >> $@
818	echo $(OX)\email.obj >> $@
819	echo $(OX)\encode.obj >> $@
820	echo $(OX)\etag.obj >> $@
821	echo $(OX)\event.obj >> $@
822	echo $(OX)\export.obj >> $@
823	echo $(OX)\file.obj >> $@
	@@ -1045,10 +1045,16 @@
1045	$(OX)\add$O : add_.c add.h
1046	$(TCC) /Fo$@ -c add_.c
1047
1048	add_.c : $(SRCDIR)\add.c
1049	translate$E $** > $@






1050
1051	$(OX)\allrepo$O : allrepo_.c allrepo.h
1052	$(TCC) /Fo$@ -c allrepo_.c
1053
1054	allrepo_.c : $(SRCDIR)\allrepo.c
	@@ -1226,16 +1232,10 @@
1226	$(TCC) /Fo$@ -c doc_.c
1227
1228	doc_.c : $(SRCDIR)\doc.c
1229	translate$E $** > $@
1230
1231	$(OX)\email$O : email_.c email.h
1232	$(TCC) /Fo$@ -c email_.c
1233
1234	email_.c : $(SRCDIR)\email.c
1235	translate$E $** > $@
1236
1237	$(OX)\encode$O : encode_.c encode.h
1238	$(TCC) /Fo$@ -c encode_.c
1239
1240	encode_.c : $(SRCDIR)\encode.c
1241	translate$E $** > $@
	@@ -1855,10 +1855,11 @@
1855	fossil.res : $B\win\fossil.rc
1856	$(RCC) /fo $@ $**
1857
1858	headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
1859	makeheaders$E add_.c:add.h \

1860	allrepo_.c:allrepo.h \
1861	attach_.c:attach.h \
1862	backoffice_.c:backoffice.h \
1863	bag_.c:bag.h \
1864	bisect_.c:bisect.h \
	@@ -1885,11 +1886,10 @@
1885	descendants_.c:descendants.h \
1886	diff_.c:diff.h \
1887	diffcmd_.c:diffcmd.h \
1888	dispatch_.c:dispatch.h \
1889	doc_.c:doc.h \
1890	email_.c:email.h \
1891	encode_.c:encode.h \
1892	etag_.c:etag.h \
1893	event_.c:event.h \
1894	export_.c:export.h \
1895	file_.c:file.h \
1896

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -379,10 +379,11 @@
379	MINIZ_OPTIONS = /DMINIZ_NO_STDIO \
380	/DMINIZ_NO_TIME \
381	/DMINIZ_NO_ARCHIVE_APIS
382
383	SRC = add_.c \
384	alerts_.c \
385	allrepo_.c \
386	attach_.c \
387	backoffice_.c \
388	bag_.c \
389	bisect_.c \
	@@ -409,11 +410,10 @@
410	descendants_.c \
411	diff_.c \
412	diffcmd_.c \
413	dispatch_.c \
414	doc_.c \

415	encode_.c \
416	etag_.c \
417	event_.c \
418	export_.c \
419	file_.c \
	@@ -586,10 +586,11 @@
586	$(SRCDIR)\tree.js \
587	$(SRCDIR)\useredit.js \
588	$(SRCDIR)\wiki.wiki
589
590	OBJ = $(OX)\add$O \
591	$(OX)\alerts$O \
592	$(OX)\allrepo$O \
593	$(OX)\attach$O \
594	$(OX)\backoffice$O \
595	$(OX)\bag$O \
596	$(OX)\bisect$O \
	@@ -617,11 +618,10 @@
618	$(OX)\descendants$O \
619	$(OX)\diff$O \
620	$(OX)\diffcmd$O \
621	$(OX)\dispatch$O \
622	$(OX)\doc$O \

623	$(OX)\encode$O \
624	$(OX)\etag$O \
625	$(OX)\event$O \
626	$(OX)\export$O \
627	$(OX)\file$O \
	@@ -782,10 +782,11 @@
782	if exist [email protected] \
783	$(MTC) -nologo -manifest [email protected] -outputresource:$@;1
784
785	$(OX)\linkopts: $B\win\Makefile.msc
786	echo $(OX)\add.obj > $@
787	echo $(OX)\alerts.obj >> $@
788	echo $(OX)\allrepo.obj >> $@
789	echo $(OX)\attach.obj >> $@
790	echo $(OX)\backoffice.obj >> $@
791	echo $(OX)\bag.obj >> $@
792	echo $(OX)\bisect.obj >> $@
	@@ -813,11 +814,10 @@
814	echo $(OX)\descendants.obj >> $@
815	echo $(OX)\diff.obj >> $@
816	echo $(OX)\diffcmd.obj >> $@
817	echo $(OX)\dispatch.obj >> $@
818	echo $(OX)\doc.obj >> $@

819	echo $(OX)\encode.obj >> $@
820	echo $(OX)\etag.obj >> $@
821	echo $(OX)\event.obj >> $@
822	echo $(OX)\export.obj >> $@
823	echo $(OX)\file.obj >> $@
	@@ -1045,10 +1045,16 @@
1045	$(OX)\add$O : add_.c add.h
1046	$(TCC) /Fo$@ -c add_.c
1047
1048	add_.c : $(SRCDIR)\add.c
1049	translate$E $** > $@
1050
1051	$(OX)\alerts$O : alerts_.c alerts.h
1052	$(TCC) /Fo$@ -c alerts_.c
1053
1054	alerts_.c : $(SRCDIR)\alerts.c
1055	translate$E $** > $@
1056
1057	$(OX)\allrepo$O : allrepo_.c allrepo.h
1058	$(TCC) /Fo$@ -c allrepo_.c
1059
1060	allrepo_.c : $(SRCDIR)\allrepo.c
	@@ -1226,16 +1232,10 @@
1232	$(TCC) /Fo$@ -c doc_.c
1233
1234	doc_.c : $(SRCDIR)\doc.c
1235	translate$E $** > $@
1236






1237	$(OX)\encode$O : encode_.c encode.h
1238	$(TCC) /Fo$@ -c encode_.c
1239
1240	encode_.c : $(SRCDIR)\encode.c
1241	translate$E $** > $@
	@@ -1855,10 +1855,11 @@
1855	fossil.res : $B\win\fossil.rc
1856	$(RCC) /fo $@ $**
1857
1858	headers: makeheaders$E page_index.h builtin_data.h default_css.h VERSION.h
1859	makeheaders$E add_.c:add.h \
1860	alerts_.c:alerts.h \
1861	allrepo_.c:allrepo.h \
1862	attach_.c:attach.h \
1863	backoffice_.c:backoffice.h \
1864	bag_.c:bag.h \
1865	bisect_.c:bisect.h \
	@@ -1885,11 +1886,10 @@
1886	descendants_.c:descendants.h \
1887	diff_.c:diff.h \
1888	diffcmd_.c:diffcmd.h \
1889	dispatch_.c:dispatch.h \
1890	doc_.c:doc.h \

1891	encode_.c:encode.h \
1892	etag_.c:etag.h \
1893	event_.c:event.h \
1894	export_.c:export.h \
1895	file_.c:file.h \
1896

Fossil SCM

Keyboard Shortcuts