Fossil SCM

Merge trunk changes into the retro-sbsdiff branch.

drh 2012-01-18 13:22 UTC retro-sbsdiff merge

Commit 6daee94fac51d294944fa3095bde87be9715d099

Parent 5b38dbb20ef4ed4…

14 files changed +5 -1 +21 -5 +154 -37 +2 +5 +5 +1 -1 +35 +8 +5 -2 +16 -6 +137 -27 +178 -23 +16 -5

~ src/configure.c ~ src/main.mk ~ src/makemake.tcl ~ src/setup.c ~ src/style.c ~ src/style.c ~ src/th_main.c ~ src/xfer.c ~ src/xfersetup.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc

M src/configure.c

+5 -1

		--- src/configure.c
		+++ src/configure.c
		@@ -33,10 +33,11 @@
33	33	#define CONFIGSET_TKT 0x000002 /* Ticket configuration */
34	34	#define CONFIGSET_PROJ 0x000004 /* Project name */
35	35	#define CONFIGSET_SHUN 0x000008 /* Shun settings */
36	36	#define CONFIGSET_USER 0x000010 /* The USER table */
37	37	#define CONFIGSET_ADDR 0x000020 /* The CONCEALED table */
	38	+#define CONFIGSET_XFER 0x000040 /* Transfer configuration */
38	39
39	40	#define CONFIGSET_ALL 0x0000ff /* Everything */
40	41
41	42	#define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
42	43	#define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
		@@ -55,10 +56,11 @@
55	56	{ "/project", CONFIGSET_PROJ, "Project name and description" },
56	57	{ "/skin", CONFIGSET_SKIN, "Web interface apparance settings" },
57	58	{ "/shun", CONFIGSET_SHUN, "List of shunned artifacts" },
58	59	{ "/ticket", CONFIGSET_TKT, "Ticket setup", },
59	60	{ "/user", CONFIGSET_USER, "Users and privilege settings" },
	61	+ { "/xfer", CONFIGSET_XFER, "Transfer setup", },
60	62	{ "/all", CONFIGSET_ALL, "All of the above" },
61	63	};
62	64
63	65
64	66	/*
		@@ -85,11 +87,11 @@
85	87	{ "crnl-glob", CONFIGSET_PROJ },
86	88	{ "empty-dirs", CONFIGSET_PROJ },
87	89	{ "allow-symlinks", CONFIGSET_PROJ },
88	90	{ "index-page", CONFIGSET_SKIN },
89	91	#ifdef FOSSIL_ENABLE_TCL
90		- { "tcl", CONFIGSET_SKIN\|CONFIGSET_TKT },
	92	+ { "tcl", CONFIGSET_SKIN\|CONFIGSET_TKT\|CONFIGSET_XFER },
91	93	#endif
92	94	{ "timeline-block-markup", CONFIGSET_SKIN },
93	95	{ "timeline-max-comment", CONFIGSET_SKIN },
94	96	{ "ticket-table", CONFIGSET_TKT },
95	97	{ "ticket-common", CONFIGSET_TKT },
		@@ -103,10 +105,12 @@
103	105	{ "ticket-closed-expr", CONFIGSET_TKT },
104	106	{ "@reportfmt", CONFIGSET_TKT },
105	107	{ "@user", CONFIGSET_USER },
106	108	{ "@concealed", CONFIGSET_ADDR },
107	109	{ "@shun", CONFIGSET_SHUN },
	110	+ { "xfer-common-script", CONFIGSET_XFER },
	111	+ { "xfer-push-script", CONFIGSET_XFER },
108	112	};
109	113	static int iConfig = 0;
110	114
111	115	/*
112	116	** Return name of first configuration property matching the given mask.
113	117

	--- src/configure.c
	+++ src/configure.c
	@@ -33,10 +33,11 @@
33	#define CONFIGSET_TKT 0x000002 /* Ticket configuration */
34	#define CONFIGSET_PROJ 0x000004 /* Project name */
35	#define CONFIGSET_SHUN 0x000008 /* Shun settings */
36	#define CONFIGSET_USER 0x000010 /* The USER table */
37	#define CONFIGSET_ADDR 0x000020 /* The CONCEALED table */

38
39	#define CONFIGSET_ALL 0x0000ff /* Everything */
40
41	#define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
42	#define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
	@@ -55,10 +56,11 @@
55	{ "/project", CONFIGSET_PROJ, "Project name and description" },
56	{ "/skin", CONFIGSET_SKIN, "Web interface apparance settings" },
57	{ "/shun", CONFIGSET_SHUN, "List of shunned artifacts" },
58	{ "/ticket", CONFIGSET_TKT, "Ticket setup", },
59	{ "/user", CONFIGSET_USER, "Users and privilege settings" },

60	{ "/all", CONFIGSET_ALL, "All of the above" },
61	};
62
63
64	/*
	@@ -85,11 +87,11 @@
85	{ "crnl-glob", CONFIGSET_PROJ },
86	{ "empty-dirs", CONFIGSET_PROJ },
87	{ "allow-symlinks", CONFIGSET_PROJ },
88	{ "index-page", CONFIGSET_SKIN },
89	#ifdef FOSSIL_ENABLE_TCL
90	{ "tcl", CONFIGSET_SKIN\|CONFIGSET_TKT },
91	#endif
92	{ "timeline-block-markup", CONFIGSET_SKIN },
93	{ "timeline-max-comment", CONFIGSET_SKIN },
94	{ "ticket-table", CONFIGSET_TKT },
95	{ "ticket-common", CONFIGSET_TKT },
	@@ -103,10 +105,12 @@
103	{ "ticket-closed-expr", CONFIGSET_TKT },
104	{ "@reportfmt", CONFIGSET_TKT },
105	{ "@user", CONFIGSET_USER },
106	{ "@concealed", CONFIGSET_ADDR },
107	{ "@shun", CONFIGSET_SHUN },


108	};
109	static int iConfig = 0;
110
111	/*
112	** Return name of first configuration property matching the given mask.
113

	--- src/configure.c
	+++ src/configure.c
	@@ -33,10 +33,11 @@
33	#define CONFIGSET_TKT 0x000002 /* Ticket configuration */
34	#define CONFIGSET_PROJ 0x000004 /* Project name */
35	#define CONFIGSET_SHUN 0x000008 /* Shun settings */
36	#define CONFIGSET_USER 0x000010 /* The USER table */
37	#define CONFIGSET_ADDR 0x000020 /* The CONCEALED table */
38	#define CONFIGSET_XFER 0x000040 /* Transfer configuration */
39
40	#define CONFIGSET_ALL 0x0000ff /* Everything */
41
42	#define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
43	#define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
	@@ -55,10 +56,11 @@
56	{ "/project", CONFIGSET_PROJ, "Project name and description" },
57	{ "/skin", CONFIGSET_SKIN, "Web interface apparance settings" },
58	{ "/shun", CONFIGSET_SHUN, "List of shunned artifacts" },
59	{ "/ticket", CONFIGSET_TKT, "Ticket setup", },
60	{ "/user", CONFIGSET_USER, "Users and privilege settings" },
61	{ "/xfer", CONFIGSET_XFER, "Transfer setup", },
62	{ "/all", CONFIGSET_ALL, "All of the above" },
63	};
64
65
66	/*
	@@ -85,11 +87,11 @@
87	{ "crnl-glob", CONFIGSET_PROJ },
88	{ "empty-dirs", CONFIGSET_PROJ },
89	{ "allow-symlinks", CONFIGSET_PROJ },
90	{ "index-page", CONFIGSET_SKIN },
91	#ifdef FOSSIL_ENABLE_TCL
92	{ "tcl", CONFIGSET_SKIN\|CONFIGSET_TKT\|CONFIGSET_XFER },
93	#endif
94	{ "timeline-block-markup", CONFIGSET_SKIN },
95	{ "timeline-max-comment", CONFIGSET_SKIN },
96	{ "ticket-table", CONFIGSET_TKT },
97	{ "ticket-common", CONFIGSET_TKT },
	@@ -103,10 +105,12 @@
105	{ "ticket-closed-expr", CONFIGSET_TKT },
106	{ "@reportfmt", CONFIGSET_TKT },
107	{ "@user", CONFIGSET_USER },
108	{ "@concealed", CONFIGSET_ADDR },
109	{ "@shun", CONFIGSET_SHUN },
110	{ "xfer-common-script", CONFIGSET_XFER },
111	{ "xfer-push-script", CONFIGSET_XFER },
112	};
113	static int iConfig = 0;
114
115	/*
116	** Return name of first configuration property matching the given mask.
117

M src/main.mk

+21 -5

		--- src/main.mk
		+++ src/main.mk
		@@ -1,6 +1,9 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4	7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
6	9	#
		@@ -101,10 +104,11 @@
101	104	$(SRCDIR)/vfile.c \
102	105	$(SRCDIR)/wiki.c \
103	106	$(SRCDIR)/wikiformat.c \
104	107	$(SRCDIR)/winhttp.c \
105	108	$(SRCDIR)/xfer.c \
	109	+ $(SRCDIR)/xfersetup.c \
106	110	$(SRCDIR)/zip.c
107	111
108	112	TRANS_SRC = \
109	113	$(OBJDIR)/add_.c \
110	114	$(OBJDIR)/allrepo_.c \
		@@ -196,10 +200,11 @@
196	200	$(OBJDIR)/vfile_.c \
197	201	$(OBJDIR)/wiki_.c \
198	202	$(OBJDIR)/wikiformat_.c \
199	203	$(OBJDIR)/winhttp_.c \
200	204	$(OBJDIR)/xfer_.c \
	205	+ $(OBJDIR)/xfersetup_.c \
201	206	$(OBJDIR)/zip_.c
202	207
203	208	OBJ = \
204	209	$(OBJDIR)/add.o \
205	210	$(OBJDIR)/allrepo.o \
		@@ -291,10 +296,11 @@
291	296	$(OBJDIR)/vfile.o \
292	297	$(OBJDIR)/wiki.o \
293	298	$(OBJDIR)/wikiformat.o \
294	299	$(OBJDIR)/winhttp.o \
295	300	$(OBJDIR)/xfer.o \
	301	+ $(OBJDIR)/xfersetup.o \
296	302	$(OBJDIR)/zip.o
297	303
298	304	APPNAME = fossil$(E)
299	305
300	306
		@@ -317,11 +323,11 @@
317	323	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
318	324
319	325	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
320	326	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
321	327
322		-# WARNING. DANGER. Running the testsuite modifies the repository the
	328	+# WARNING. DANGER. Running the test suite modifies the repository the
323	329	# build is done from, i.e. the checkout belongs to. Do not sync/push
324	330	# the repository after running the tests.
325	331	test: $(OBJDIR) $(APPNAME)
326	332	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
327	333
		@@ -334,12 +340,15 @@
334	340	# using -lsqlite3.
335	341	SQLITE3_OBJ.1 =
336	342	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
337	343	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
338	344
339		-TCL_OBJ.1 =
340		-TCL_OBJ.0 = $(OBJDIR)/th_tcl.o
	345	+# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
	346	+# If it is set to 1, then we need to build the Tcl integration code and
	347	+# link to the Tcl library.
	348	+TCL_OBJ.0 =
	349	+TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
341	350	TCL_OBJ. = $(TCL_OBJ.0)
342	351
343	352	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
344	353
345	354	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
		@@ -356,11 +365,11 @@
356	365
357	366
358	367	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
359	368	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
360	369	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
361		- $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
	370	+ $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
362	371	touch $(OBJDIR)/headers
363	372	$(OBJDIR)/headers: Makefile
364	373	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
365	374	Makefile:
366	375	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
		@@ -1005,10 +1014,17 @@
1005	1014
1006	1015	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1007	1016	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1008	1017
1009	1018	$(OBJDIR)/xfer.h: $(OBJDIR)/headers
	1019	+$(OBJDIR)/xfersetup_.c: $(SRCDIR)/xfersetup.c $(OBJDIR)/translate
	1020	+ $(OBJDIR)/translate $(SRCDIR)/xfersetup.c >$(OBJDIR)/xfersetup_.c
	1021	+
	1022	+$(OBJDIR)/xfersetup.o: $(OBJDIR)/xfersetup_.c $(OBJDIR)/xfersetup.h $(SRCDIR)/config.h
	1023	+ $(XTCC) -o $(OBJDIR)/xfersetup.o -c $(OBJDIR)/xfersetup_.c
	1024	+
	1025	+$(OBJDIR)/xfersetup.h: $(OBJDIR)/headers
1010	1026	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1011	1027	$(OBJDIR)/translate $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1012	1028
1013	1029	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1014	1030	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1015	1031

	--- src/main.mk
	+++ src/main.mk
	@@ -1,6 +1,9 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	# to regenerate this file.
6	#
	@@ -101,10 +104,11 @@
101	$(SRCDIR)/vfile.c \
102	$(SRCDIR)/wiki.c \
103	$(SRCDIR)/wikiformat.c \
104	$(SRCDIR)/winhttp.c \
105	$(SRCDIR)/xfer.c \

106	$(SRCDIR)/zip.c
107
108	TRANS_SRC = \
109	$(OBJDIR)/add_.c \
110	$(OBJDIR)/allrepo_.c \
	@@ -196,10 +200,11 @@
196	$(OBJDIR)/vfile_.c \
197	$(OBJDIR)/wiki_.c \
198	$(OBJDIR)/wikiformat_.c \
199	$(OBJDIR)/winhttp_.c \
200	$(OBJDIR)/xfer_.c \

201	$(OBJDIR)/zip_.c
202
203	OBJ = \
204	$(OBJDIR)/add.o \
205	$(OBJDIR)/allrepo.o \
	@@ -291,10 +296,11 @@
291	$(OBJDIR)/vfile.o \
292	$(OBJDIR)/wiki.o \
293	$(OBJDIR)/wikiformat.o \
294	$(OBJDIR)/winhttp.o \
295	$(OBJDIR)/xfer.o \

296	$(OBJDIR)/zip.o
297
298	APPNAME = fossil$(E)
299
300
	@@ -317,11 +323,11 @@
317	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
318
319	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
320	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
321
322	# WARNING. DANGER. Running the testsuite modifies the repository the
323	# build is done from, i.e. the checkout belongs to. Do not sync/push
324	# the repository after running the tests.
325	test: $(OBJDIR) $(APPNAME)
326	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
327
	@@ -334,12 +340,15 @@
334	# using -lsqlite3.
335	SQLITE3_OBJ.1 =
336	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
337	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
338
339	TCL_OBJ.1 =
340	TCL_OBJ.0 = $(OBJDIR)/th_tcl.o



341	TCL_OBJ. = $(TCL_OBJ.0)
342
343	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
344
345	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
	@@ -356,11 +365,11 @@
356
357
358	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
359	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
360	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
361	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
362	touch $(OBJDIR)/headers
363	$(OBJDIR)/headers: Makefile
364	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
365	Makefile:
366	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -1005,10 +1014,17 @@
1005
1006	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1007	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1008
1009	$(OBJDIR)/xfer.h: $(OBJDIR)/headers







1010	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1011	$(OBJDIR)/translate $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1012
1013	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1014	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1015

	--- src/main.mk
	+++ src/main.mk
	@@ -1,6 +1,9 @@
1	#
2	##############################################################################
3	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4	##############################################################################
5	#
6	# This file is automatically generated. Instead of editing this
7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8	# to regenerate this file.
9	#
	@@ -101,10 +104,11 @@
104	$(SRCDIR)/vfile.c \
105	$(SRCDIR)/wiki.c \
106	$(SRCDIR)/wikiformat.c \
107	$(SRCDIR)/winhttp.c \
108	$(SRCDIR)/xfer.c \
109	$(SRCDIR)/xfersetup.c \
110	$(SRCDIR)/zip.c
111
112	TRANS_SRC = \
113	$(OBJDIR)/add_.c \
114	$(OBJDIR)/allrepo_.c \
	@@ -196,10 +200,11 @@
200	$(OBJDIR)/vfile_.c \
201	$(OBJDIR)/wiki_.c \
202	$(OBJDIR)/wikiformat_.c \
203	$(OBJDIR)/winhttp_.c \
204	$(OBJDIR)/xfer_.c \
205	$(OBJDIR)/xfersetup_.c \
206	$(OBJDIR)/zip_.c
207
208	OBJ = \
209	$(OBJDIR)/add.o \
210	$(OBJDIR)/allrepo.o \
	@@ -291,10 +296,11 @@
296	$(OBJDIR)/vfile.o \
297	$(OBJDIR)/wiki.o \
298	$(OBJDIR)/wikiformat.o \
299	$(OBJDIR)/winhttp.o \
300	$(OBJDIR)/xfer.o \
301	$(OBJDIR)/xfersetup.o \
302	$(OBJDIR)/zip.o
303
304	APPNAME = fossil$(E)
305
306
	@@ -317,11 +323,11 @@
323	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
324
325	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
326	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
327
328	# WARNING. DANGER. Running the test suite modifies the repository the
329	# build is done from, i.e. the checkout belongs to. Do not sync/push
330	# the repository after running the tests.
331	test: $(OBJDIR) $(APPNAME)
332	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
333
	@@ -334,12 +340,15 @@
340	# using -lsqlite3.
341	SQLITE3_OBJ.1 =
342	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
343	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
344
345	# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
346	# If it is set to 1, then we need to build the Tcl integration code and
347	# link to the Tcl library.
348	TCL_OBJ.0 =
349	TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
350	TCL_OBJ. = $(TCL_OBJ.0)
351
352	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
353
354	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
	@@ -356,11 +365,11 @@
365
366
367	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
368	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
369	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
370	$(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
371	touch $(OBJDIR)/headers
372	$(OBJDIR)/headers: Makefile
373	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
374	Makefile:
375	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -1005,10 +1014,17 @@
1014
1015	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1016	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1017
1018	$(OBJDIR)/xfer.h: $(OBJDIR)/headers
1019	$(OBJDIR)/xfersetup_.c: $(SRCDIR)/xfersetup.c $(OBJDIR)/translate
1020	$(OBJDIR)/translate $(SRCDIR)/xfersetup.c >$(OBJDIR)/xfersetup_.c
1021
1022	$(OBJDIR)/xfersetup.o: $(OBJDIR)/xfersetup_.c $(OBJDIR)/xfersetup.h $(SRCDIR)/config.h
1023	$(XTCC) -o $(OBJDIR)/xfersetup.o -c $(OBJDIR)/xfersetup_.c
1024
1025	$(OBJDIR)/xfersetup.h: $(OBJDIR)/headers
1026	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1027	$(OBJDIR)/translate $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1028
1029	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1030	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1031

M src/makemake.tcl

+154 -37

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -107,10 +107,11 @@
107	107	vfile
108	108	wiki
109	109	wikiformat
110	110	winhttp
111	111	xfer
	112	+ xfersetup
112	113	zip
113	114	http_ssl
114	115	}
115	116
116	117	# Name of the final application
		@@ -139,11 +140,14 @@
139	140	#
140	141	puts "building main.mk"
141	142	set output_file [open main.mk w]
142	143	fconfigure $output_file -translation binary
143	144
144		-writeln {# DO NOT EDIT
	145	+writeln {#
	146	+##############################################################################
	147	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	148	+##############################################################################
145	149	#
146	150	# This file is automatically generated. Instead of editing this
147	151	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
148	152	# to regenerate this file.
149	153	#
		@@ -190,11 +194,11 @@
190	194	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
191	195
192	196	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
193	197	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
194	198
195		-# WARNING. DANGER. Running the testsuite modifies the repository the
	199	+# WARNING. DANGER. Running the test suite modifies the repository the
196	200	# build is done from, i.e. the checkout belongs to. Do not sync/push
197	201	# the repository after running the tests.
198	202	test: $(OBJDIR) $(APPNAME)
199	203	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
200	204
		@@ -209,12 +213,15 @@
209	213	# using -lsqlite3.
210	214	SQLITE3_OBJ.1 =
211	215	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
212	216	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
213	217
214		-TCL_OBJ.1 =
215		-TCL_OBJ.0 = $(OBJDIR)/th_tcl.o
	218	+# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
	219	+# If it is set to 1, then we need to build the Tcl integration code and
	220	+# link to the Tcl library.
	221	+TCL_OBJ.0 =
	222	+TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
216	223	TCL_OBJ. = $(TCL_OBJ.0)
217	224
218	225	EXTRAOBJ = \
219	226	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
220	227	$(OBJDIR)/shell.o \
		@@ -307,20 +314,27 @@
307	314	set output_file [open ../win/Makefile.mingw w]
308	315	fconfigure $output_file -translation binary
309	316
310	317	writeln {#!/usr/bin/make
311	318	#
312		-# This is a makefile for us on windows using mingw.
	319	+##############################################################################
	320	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	321	+##############################################################################
	322	+#
	323	+# This file is automatically generated. Instead of editing this
	324	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
	325	+# to regenerate this file.
	326	+#
	327	+# This is a makefile for us on windows using MinGW.
313	328	#
314	329	#### The toplevel directory of the source tree. Fossil can be built
315	330	# in a directory that is separate from the source tree. Just change
316	331	# the following to point from the build directory to the src/ folder.
317	332	#
318	333	SRCDIR = src
319	334
320	335	#### The directory into which object code files should be written.
321		-#
322	336	#
323	337	OBJDIR = wbld
324	338
325	339	#### C Compiler and options for use in building executables that
326	340	# will run on the platform that is doing the build. This is used
		@@ -329,51 +343,134 @@
329	343	#
330	344	BCC = gcc
331	345
332	346	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
333	347	#
334		-# FOSSIL_ENABLE_SSL=1
335		-
336		-#### The directory in which the zlib compression library is installed.
337		-#
338		-#
339		-ZLIBDIR = /programs/gnuwin32
340		-
341		-#### C Compile and options for use in building executables that
	348	+# FOSSIL_ENABLE_SSL = 1
	349	+
	350	+#### Enable scripting support via Tcl/Tk
	351	+#
	352	+# FOSSIL_ENABLE_TCL = 1
	353	+
	354	+#### Use the Tcl source directory instead of the install directory?
	355	+# This is useful when Tcl has been compiled statically with MinGW.
	356	+#
	357	+FOSSIL_TCL_SOURCE = 1
	358	+
	359	+#### The directories where the zlib include and library files are located.
	360	+# The recommended usage here is to use the Sysinternals junction tool
	361	+# to create a hard link between an "zlib-1.x.y" sub-directory of the
	362	+# Fossil source code directory and the target zlib source directory.
	363	+#
	364	+ZINCDIR = $(SRCDIR)/../zlib-1.2.5
	365	+ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
	366	+
	367	+#### The directories where the OpenSSL include and library files are located.
	368	+# The recommended usage here is to use the Sysinternals junction tool
	369	+# to create a hard link between an "openssl-1.x" sub-directory of the
	370	+# Fossil source code directory and the target OpenSSL source directory.
	371	+#
	372	+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
	373	+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
	374	+
	375	+#### Either the directory where the Tcl library is installed or the Tcl
	376	+# source code directory resides (depending on the value of the macro
	377	+# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
	378	+# this directory must have "include" and "lib" sub-directories. If
	379	+# this points to the Tcl source code directory, this directory must
	380	+# have "generic" and "win" sub-directories. The recommended usage
	381	+# here is to use the Sysinternals junction tool to create a hard
	382	+# link between a "tcl-8.x" sub-directory of the Fossil source code
	383	+# directory and the target Tcl directory. This removes the need to
	384	+# hard-code the necessary paths in this Makefile.
	385	+#
	386	+TCLDIR = $(SRCDIR)/../tcl-8.6
	387	+
	388	+#### The Tcl source code directory. This defaults to the same value as
	389	+# TCLDIR macro (above), which may not be correct. This value will
	390	+# only be used if the FOSSIL_TCL_SOURCE macro is defined.
	391	+#
	392	+TCLSRCDIR = $(TCLDIR)
	393	+
	394	+#### The Tcl include and library directories. These values will only be
	395	+# used if the FOSSIL_TCL_SOURCE macro is not defined.
	396	+#
	397	+TCLINCDIR = $(TCLDIR)/include
	398	+TCLLIBDIR = $(TCLDIR)/lib
	399	+
	400	+#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	401	+#
	402	+LIBTCL = -ltcl86
	403	+
	404	+#### C Compile and options for use in building executables that
342	405	# will run on the target platform. This is usually the same
343	406	# as BCC, unless you are cross-compiling. This C compiler builds
344	407	# the finished binary for fossil. The BCC compiler above is used
345	408	# for building intermediate code-generator tools.
346	409	#
347		-TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
	410	+TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	411	+
	412	+# With HTTPS support
	413	+ifdef FOSSIL_ENABLE_SSL
	414	+TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
	415	+endif
	416	+
	417	+# With Tcl support
	418	+ifdef FOSSIL_ENABLE_TCL
	419	+ifdef FOSSIL_TCL_SOURCE
	420	+TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
	421	+else
	422	+TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
	423	+endif
	424	+endif
348	425
349	426	# With HTTPS support
350	427	ifdef FOSSIL_ENABLE_SSL
351		-TCC += -static -DFOSSIL_ENABLE_SSL=1
	428	+TCC += -DFOSSIL_ENABLE_SSL=1
	429	+endif
	430	+
	431	+# With Tcl support (statically linked)
	432	+ifdef FOSSIL_ENABLE_TCL
	433	+TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
352	434	endif
353	435
354	436	#### Extra arguments for linking the finished binary. Fossil needs
355	437	# to link against the Z-Lib compression library. There are no
356		-# other dependencies. We sometimes add the -static option here
	438	+# other mandatory dependencies. We add the -static option here
357	439	# so that we can build a static executable that will run in a
358	440	# chroot jail.
359	441	#
360		-#LIB = -lz -lws2_32
361		-# OpenSSL:
	442	+LIB = -static
	443	+LIB += -lmingwex -lz
	444	+
	445	+# OpenSSL: Add the necessary libaries required, if enabled.
362	446	ifdef FOSSIL_ENABLE_SSL
363	447	LIB += -lssl -lcrypto -lgdi32
364	448	endif
365		-LIB += -lmingwex -lz -lws2_32
366	449
367		-#### Tcl shell for use in running the fossil testsuite. This is only
368		-# used for testing. If you do not run
	450	+# Tcl: Add the necessary libaries required, if enabled.
	451	+ifdef FOSSIL_ENABLE_TCL
	452	+LIB += $(LIBTCL)
	453	+endif
	454	+
	455	+#### These libraries MUST appear in the same order as they do for Tcl
	456	+# or linking with it will not work (exact reason unknown).
	457	+#
	458	+ifdef FOSSIL_ENABLE_TCL
	459	+LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	460	+else
	461	+LIB += -lws2_32
	462	+endif
	463	+
	464	+#### Tcl shell for use in running the fossil test suite. This is only
	465	+# used for testing.
369	466	#
370	467	TCLSH = tclsh
371	468
372		-#### Nullsoft installer makensis location
	469	+#### Nullsoft installer MakeNSIS location
373	470	#
374		-MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
	471	+MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
375	472
376	473	#### Include a configuration file that can override any one of these settings.
377	474	#
378	475	-include config.w32
379	476
		@@ -427,15 +524,15 @@
427	524	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
428	525
429	526	$(VERSION): $(SRCDIR)/mkversion.c
430	527	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
431	528
432		-# WARNING. DANGER. Running the testsuite modifies the repository the
	529	+# WARNING. DANGER. Running the test suite modifies the repository the
433	530	# build is done from, i.e. the checkout belongs to. Do not sync/push
434	531	# the repository after running the tests.
435		-test: $(APPNAME)
436		- $(TCLSH) test/tester.tcl $(APPNAME)
	532	+test: $(OBJDIR) $(APPNAME)
	533	+ $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
437	534
438	535	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
439	536	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
440	537
441	538	EXTRAOBJ = \
		@@ -442,25 +539,29 @@
442	539	$(OBJDIR)/sqlite3.o \
443	540	$(OBJDIR)/shell.o \
444	541	$(OBJDIR)/th.o \
445	542	$(OBJDIR)/th_lang.o \
446	543	$(OBJDIR)/cson_amalgamation.o
	544	+
	545	+ifdef FOSSIL_ENABLE_TCL
	546	+EXTRAOBJ += $(OBJDIR)/th_tcl.o
	547	+endif
447	548
448	549	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
449	550	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
450	551
451	552	# This rule prevents make from using its default rules to try build
452	553	# an executable named "manifest" out of the file named "manifest.c"
453	554	#
454		-$(SRCDIR)/../manifest:
	555	+$(SRCDIR)/../manifest:
455	556	# noop
456	557
457		-# Requires msys to be installed in addition to the mingw, for the "rm"
	558	+# Requires MSYS to be installed in addition to the MinGW, for the "rm"
458	559	# command. "del" will not work here because it is not a separate command
459	560	# but a MSDOS-shell builtin.
460	561	#
461		-clean:
	562	+clean:
462	563	rm -rf $(OBJDIR) $(APPNAME)
463	564
464	565	setup: $(OBJDIR) $(APPNAME)
465	566	$(MAKENSIS) ./fossil.nsi
466	567
		@@ -498,11 +599,11 @@
498	599	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
499	600
500	601	set opt {}
501	602	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
502	603	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
503		-writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
	604	+writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
504	605
505	606	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
506	607	set opt {-Dmain=sqlite3_shell}
507	608	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
508	609	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
		@@ -511,10 +612,15 @@
511	612	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
512	613
513	614	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
514	615	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
515	616
	617	+writeln {ifdef FOSSIL_ENABLE_TCL
	618	+$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
	619	+ $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
	620	+endif
	621	+}
516	622
517	623	close $output_file
518	624	#
519	625	# End of the main.mk output
520	626	##############################################################################
		@@ -524,15 +630,19 @@
524	630	#
525	631	puts "building ../win/Makefile.dmc"
526	632	set output_file [open ../win/Makefile.dmc w]
527	633	fconfigure $output_file -translation binary
528	634
529		-writeln {# DO NOT EDIT
	635	+writeln {#
	636	+##############################################################################
	637	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	638	+##############################################################################
530	639	#
531	640	# This file is automatically generated. Instead of editing this
532		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	641	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
533	642	# to regenerate this file.
	643	+#
534	644	B = ..
535	645	SRCDIR = $B\src
536	646	OBJDIR = .
537	647	O = .obj
538	648	E = .exe
		@@ -668,15 +778,19 @@
668	778	#
669	779	puts "building ../win/Makefile.msc"
670	780	set output_file [open ../win/Makefile.msc w]
671	781	fconfigure $output_file -translation binary
672	782
673		-writeln {# DO NOT EDIT
	783	+writeln {#
	784	+##############################################################################
	785	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	786	+##############################################################################
674	787	#
675	788	# This file is automatically generated. Instead of editing this
676		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	789	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
677	790	# to regenerate this file.
	791	+#
678	792	B = ..
679	793	SRCDIR = $B\src
680	794	OBJDIR = .
681	795	OX = .
682	796	O = .obj
		@@ -821,14 +935,17 @@
821	935	#
822	936	puts "building ../win/Makefile.PellesCGMake"
823	937	set output_file [open ../win/Makefile.PellesCGMake w]
824	938	fconfigure $output_file -translation binary
825	939
826		-writeln {# DO NOT EDIT
	940	+writeln {#
	941	+##############################################################################
	942	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	943	+##############################################################################
827	944	#
828	945	# This file is automatically generated. Instead of editing this
829		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	946	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
830	947	# to regenerate this file.
831	948	#
832	949	# HowTo
833	950	# -----
834	951	#
835	952

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -107,10 +107,11 @@
107	vfile
108	wiki
109	wikiformat
110	winhttp
111	xfer

112	zip
113	http_ssl
114	}
115
116	# Name of the final application
	@@ -139,11 +140,14 @@
139	#
140	puts "building main.mk"
141	set output_file [open main.mk w]
142	fconfigure $output_file -translation binary
143
144	writeln {# DO NOT EDIT



145	#
146	# This file is automatically generated. Instead of editing this
147	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
148	# to regenerate this file.
149	#
	@@ -190,11 +194,11 @@
190	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
191
192	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
193	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
194
195	# WARNING. DANGER. Running the testsuite modifies the repository the
196	# build is done from, i.e. the checkout belongs to. Do not sync/push
197	# the repository after running the tests.
198	test: $(OBJDIR) $(APPNAME)
199	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
200
	@@ -209,12 +213,15 @@
209	# using -lsqlite3.
210	SQLITE3_OBJ.1 =
211	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
212	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
213
214	TCL_OBJ.1 =
215	TCL_OBJ.0 = $(OBJDIR)/th_tcl.o



216	TCL_OBJ. = $(TCL_OBJ.0)
217
218	EXTRAOBJ = \
219	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
220	$(OBJDIR)/shell.o \
	@@ -307,20 +314,27 @@
307	set output_file [open ../win/Makefile.mingw w]
308	fconfigure $output_file -translation binary
309
310	writeln {#!/usr/bin/make
311	#
312	# This is a makefile for us on windows using mingw.








313	#
314	#### The toplevel directory of the source tree. Fossil can be built
315	# in a directory that is separate from the source tree. Just change
316	# the following to point from the build directory to the src/ folder.
317	#
318	SRCDIR = src
319
320	#### The directory into which object code files should be written.
321	#
322	#
323	OBJDIR = wbld
324
325	#### C Compiler and options for use in building executables that
326	# will run on the platform that is doing the build. This is used
	@@ -329,51 +343,134 @@
329	#
330	BCC = gcc
331
332	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
333	#
334	# FOSSIL_ENABLE_SSL=1
335
336	#### The directory in which the zlib compression library is installed.
337	#
338	#
339	ZLIBDIR = /programs/gnuwin32
340
341	#### C Compile and options for use in building executables that

















































342	# will run on the target platform. This is usually the same
343	# as BCC, unless you are cross-compiling. This C compiler builds
344	# the finished binary for fossil. The BCC compiler above is used
345	# for building intermediate code-generator tools.
346	#
347	TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include














348
349	# With HTTPS support
350	ifdef FOSSIL_ENABLE_SSL
351	TCC += -static -DFOSSIL_ENABLE_SSL=1





352	endif
353
354	#### Extra arguments for linking the finished binary. Fossil needs
355	# to link against the Z-Lib compression library. There are no
356	# other dependencies. We sometimes add the -static option here
357	# so that we can build a static executable that will run in a
358	# chroot jail.
359	#
360	#LIB = -lz -lws2_32
361	# OpenSSL:


362	ifdef FOSSIL_ENABLE_SSL
363	LIB += -lssl -lcrypto -lgdi32
364	endif
365	LIB += -lmingwex -lz -lws2_32
366
367	#### Tcl shell for use in running the fossil testsuite. This is only
368	# used for testing. If you do not run














369	#
370	TCLSH = tclsh
371
372	#### Nullsoft installer makensis location
373	#
374	MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
375
376	#### Include a configuration file that can override any one of these settings.
377	#
378	-include config.w32
379
	@@ -427,15 +524,15 @@
427	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
428
429	$(VERSION): $(SRCDIR)/mkversion.c
430	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
431
432	# WARNING. DANGER. Running the testsuite modifies the repository the
433	# build is done from, i.e. the checkout belongs to. Do not sync/push
434	# the repository after running the tests.
435	test: $(APPNAME)
436	$(TCLSH) test/tester.tcl $(APPNAME)
437
438	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
439	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
440
441	EXTRAOBJ = \
	@@ -442,25 +539,29 @@
442	$(OBJDIR)/sqlite3.o \
443	$(OBJDIR)/shell.o \
444	$(OBJDIR)/th.o \
445	$(OBJDIR)/th_lang.o \
446	$(OBJDIR)/cson_amalgamation.o




447
448	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
449	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
450
451	# This rule prevents make from using its default rules to try build
452	# an executable named "manifest" out of the file named "manifest.c"
453	#
454	$(SRCDIR)/../manifest:
455	# noop
456
457	# Requires msys to be installed in addition to the mingw, for the "rm"
458	# command. "del" will not work here because it is not a separate command
459	# but a MSDOS-shell builtin.
460	#
461	clean:
462	rm -rf $(OBJDIR) $(APPNAME)
463
464	setup: $(OBJDIR) $(APPNAME)
465	$(MAKENSIS) ./fossil.nsi
466
	@@ -498,11 +599,11 @@
498	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
499
500	set opt {}
501	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
502	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
503	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
504
505	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
506	set opt {-Dmain=sqlite3_shell}
507	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
508	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
	@@ -511,10 +612,15 @@
511	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
512
513	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
514	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
515





516
517	close $output_file
518	#
519	# End of the main.mk output
520	##############################################################################
	@@ -524,15 +630,19 @@
524	#
525	puts "building ../win/Makefile.dmc"
526	set output_file [open ../win/Makefile.dmc w]
527	fconfigure $output_file -translation binary
528
529	writeln {# DO NOT EDIT



530	#
531	# This file is automatically generated. Instead of editing this
532	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
533	# to regenerate this file.

534	B = ..
535	SRCDIR = $B\src
536	OBJDIR = .
537	O = .obj
538	E = .exe
	@@ -668,15 +778,19 @@
668	#
669	puts "building ../win/Makefile.msc"
670	set output_file [open ../win/Makefile.msc w]
671	fconfigure $output_file -translation binary
672
673	writeln {# DO NOT EDIT



674	#
675	# This file is automatically generated. Instead of editing this
676	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
677	# to regenerate this file.

678	B = ..
679	SRCDIR = $B\src
680	OBJDIR = .
681	OX = .
682	O = .obj
	@@ -821,14 +935,17 @@
821	#
822	puts "building ../win/Makefile.PellesCGMake"
823	set output_file [open ../win/Makefile.PellesCGMake w]
824	fconfigure $output_file -translation binary
825
826	writeln {# DO NOT EDIT



827	#
828	# This file is automatically generated. Instead of editing this
829	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
830	# to regenerate this file.
831	#
832	# HowTo
833	# -----
834	#
835

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -107,10 +107,11 @@
107	vfile
108	wiki
109	wikiformat
110	winhttp
111	xfer
112	xfersetup
113	zip
114	http_ssl
115	}
116
117	# Name of the final application
	@@ -139,11 +140,14 @@
140	#
141	puts "building main.mk"
142	set output_file [open main.mk w]
143	fconfigure $output_file -translation binary
144
145	writeln {#
146	##############################################################################
147	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
148	##############################################################################
149	#
150	# This file is automatically generated. Instead of editing this
151	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
152	# to regenerate this file.
153	#
	@@ -190,11 +194,11 @@
194	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
195
196	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
197	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
198
199	# WARNING. DANGER. Running the test suite modifies the repository the
200	# build is done from, i.e. the checkout belongs to. Do not sync/push
201	# the repository after running the tests.
202	test: $(OBJDIR) $(APPNAME)
203	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
204
	@@ -209,12 +213,15 @@
213	# using -lsqlite3.
214	SQLITE3_OBJ.1 =
215	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
216	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
217
218	# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
219	# If it is set to 1, then we need to build the Tcl integration code and
220	# link to the Tcl library.
221	TCL_OBJ.0 =
222	TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
223	TCL_OBJ. = $(TCL_OBJ.0)
224
225	EXTRAOBJ = \
226	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
227	$(OBJDIR)/shell.o \
	@@ -307,20 +314,27 @@
314	set output_file [open ../win/Makefile.mingw w]
315	fconfigure $output_file -translation binary
316
317	writeln {#!/usr/bin/make
318	#
319	##############################################################################
320	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
321	##############################################################################
322	#
323	# This file is automatically generated. Instead of editing this
324	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
325	# to regenerate this file.
326	#
327	# This is a makefile for us on windows using MinGW.
328	#
329	#### The toplevel directory of the source tree. Fossil can be built
330	# in a directory that is separate from the source tree. Just change
331	# the following to point from the build directory to the src/ folder.
332	#
333	SRCDIR = src
334
335	#### The directory into which object code files should be written.

336	#
337	OBJDIR = wbld
338
339	#### C Compiler and options for use in building executables that
340	# will run on the platform that is doing the build. This is used
	@@ -329,51 +343,134 @@
343	#
344	BCC = gcc
345
346	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
347	#
348	# FOSSIL_ENABLE_SSL = 1
349
350	#### Enable scripting support via Tcl/Tk
351	#
352	# FOSSIL_ENABLE_TCL = 1
353
354	#### Use the Tcl source directory instead of the install directory?
355	# This is useful when Tcl has been compiled statically with MinGW.
356	#
357	FOSSIL_TCL_SOURCE = 1
358
359	#### The directories where the zlib include and library files are located.
360	# The recommended usage here is to use the Sysinternals junction tool
361	# to create a hard link between an "zlib-1.x.y" sub-directory of the
362	# Fossil source code directory and the target zlib source directory.
363	#
364	ZINCDIR = $(SRCDIR)/../zlib-1.2.5
365	ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
366
367	#### The directories where the OpenSSL include and library files are located.
368	# The recommended usage here is to use the Sysinternals junction tool
369	# to create a hard link between an "openssl-1.x" sub-directory of the
370	# Fossil source code directory and the target OpenSSL source directory.
371	#
372	OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
373	OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
374
375	#### Either the directory where the Tcl library is installed or the Tcl
376	# source code directory resides (depending on the value of the macro
377	# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
378	# this directory must have "include" and "lib" sub-directories. If
379	# this points to the Tcl source code directory, this directory must
380	# have "generic" and "win" sub-directories. The recommended usage
381	# here is to use the Sysinternals junction tool to create a hard
382	# link between a "tcl-8.x" sub-directory of the Fossil source code
383	# directory and the target Tcl directory. This removes the need to
384	# hard-code the necessary paths in this Makefile.
385	#
386	TCLDIR = $(SRCDIR)/../tcl-8.6
387
388	#### The Tcl source code directory. This defaults to the same value as
389	# TCLDIR macro (above), which may not be correct. This value will
390	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
391	#
392	TCLSRCDIR = $(TCLDIR)
393
394	#### The Tcl include and library directories. These values will only be
395	# used if the FOSSIL_TCL_SOURCE macro is not defined.
396	#
397	TCLINCDIR = $(TCLDIR)/include
398	TCLLIBDIR = $(TCLDIR)/lib
399
400	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
401	#
402	LIBTCL = -ltcl86
403
404	#### C Compile and options for use in building executables that
405	# will run on the target platform. This is usually the same
406	# as BCC, unless you are cross-compiling. This C compiler builds
407	# the finished binary for fossil. The BCC compiler above is used
408	# for building intermediate code-generator tools.
409	#
410	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
411
412	# With HTTPS support
413	ifdef FOSSIL_ENABLE_SSL
414	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
415	endif
416
417	# With Tcl support
418	ifdef FOSSIL_ENABLE_TCL
419	ifdef FOSSIL_TCL_SOURCE
420	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
421	else
422	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
423	endif
424	endif
425
426	# With HTTPS support
427	ifdef FOSSIL_ENABLE_SSL
428	TCC += -DFOSSIL_ENABLE_SSL=1
429	endif
430
431	# With Tcl support (statically linked)
432	ifdef FOSSIL_ENABLE_TCL
433	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
434	endif
435
436	#### Extra arguments for linking the finished binary. Fossil needs
437	# to link against the Z-Lib compression library. There are no
438	# other mandatory dependencies. We add the -static option here
439	# so that we can build a static executable that will run in a
440	# chroot jail.
441	#
442	LIB = -static
443	LIB += -lmingwex -lz
444
445	# OpenSSL: Add the necessary libaries required, if enabled.
446	ifdef FOSSIL_ENABLE_SSL
447	LIB += -lssl -lcrypto -lgdi32
448	endif

449
450	# Tcl: Add the necessary libaries required, if enabled.
451	ifdef FOSSIL_ENABLE_TCL
452	LIB += $(LIBTCL)
453	endif
454
455	#### These libraries MUST appear in the same order as they do for Tcl
456	# or linking with it will not work (exact reason unknown).
457	#
458	ifdef FOSSIL_ENABLE_TCL
459	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
460	else
461	LIB += -lws2_32
462	endif
463
464	#### Tcl shell for use in running the fossil test suite. This is only
465	# used for testing.
466	#
467	TCLSH = tclsh
468
469	#### Nullsoft installer MakeNSIS location
470	#
471	MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
472
473	#### Include a configuration file that can override any one of these settings.
474	#
475	-include config.w32
476
	@@ -427,15 +524,15 @@
524	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
525
526	$(VERSION): $(SRCDIR)/mkversion.c
527	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
528
529	# WARNING. DANGER. Running the test suite modifies the repository the
530	# build is done from, i.e. the checkout belongs to. Do not sync/push
531	# the repository after running the tests.
532	test: $(OBJDIR) $(APPNAME)
533	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
534
535	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
536	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
537
538	EXTRAOBJ = \
	@@ -442,25 +539,29 @@
539	$(OBJDIR)/sqlite3.o \
540	$(OBJDIR)/shell.o \
541	$(OBJDIR)/th.o \
542	$(OBJDIR)/th_lang.o \
543	$(OBJDIR)/cson_amalgamation.o
544
545	ifdef FOSSIL_ENABLE_TCL
546	EXTRAOBJ += $(OBJDIR)/th_tcl.o
547	endif
548
549	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
550	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
551
552	# This rule prevents make from using its default rules to try build
553	# an executable named "manifest" out of the file named "manifest.c"
554	#
555	$(SRCDIR)/../manifest:
556	# noop
557
558	# Requires MSYS to be installed in addition to the MinGW, for the "rm"
559	# command. "del" will not work here because it is not a separate command
560	# but a MSDOS-shell builtin.
561	#
562	clean:
563	rm -rf $(OBJDIR) $(APPNAME)
564
565	setup: $(OBJDIR) $(APPNAME)
566	$(MAKENSIS) ./fossil.nsi
567
	@@ -498,11 +599,11 @@
599	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
600
601	set opt {}
602	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
603	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
604	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
605
606	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
607	set opt {-Dmain=sqlite3_shell}
608	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
609	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
	@@ -511,10 +612,15 @@
612	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
613
614	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
615	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
616
617	writeln {ifdef FOSSIL_ENABLE_TCL
618	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
619	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
620	endif
621	}
622
623	close $output_file
624	#
625	# End of the main.mk output
626	##############################################################################
	@@ -524,15 +630,19 @@
630	#
631	puts "building ../win/Makefile.dmc"
632	set output_file [open ../win/Makefile.dmc w]
633	fconfigure $output_file -translation binary
634
635	writeln {#
636	##############################################################################
637	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
638	##############################################################################
639	#
640	# This file is automatically generated. Instead of editing this
641	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
642	# to regenerate this file.
643	#
644	B = ..
645	SRCDIR = $B\src
646	OBJDIR = .
647	O = .obj
648	E = .exe
	@@ -668,15 +778,19 @@
778	#
779	puts "building ../win/Makefile.msc"
780	set output_file [open ../win/Makefile.msc w]
781	fconfigure $output_file -translation binary
782
783	writeln {#
784	##############################################################################
785	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
786	##############################################################################
787	#
788	# This file is automatically generated. Instead of editing this
789	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
790	# to regenerate this file.
791	#
792	B = ..
793	SRCDIR = $B\src
794	OBJDIR = .
795	OX = .
796	O = .obj
	@@ -821,14 +935,17 @@
935	#
936	puts "building ../win/Makefile.PellesCGMake"
937	set output_file [open ../win/Makefile.PellesCGMake w]
938	fconfigure $output_file -translation binary
939
940	writeln {#
941	##############################################################################
942	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
943	##############################################################################
944	#
945	# This file is automatically generated. Instead of editing this
946	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
947	# to regenerate this file.
948	#
949	# HowTo
950	# -----
951	#
952

M src/setup.c

		--- src/setup.c
		+++ src/setup.c
		@@ -73,10 +73,12 @@
73	73	setup_menu_entry("Login-Group", "setup_login_group",
74	74	"Manage single sign-on between this repository and others"
75	75	" on the same server");
76	76	setup_menu_entry("Tickets", "tktsetup",
77	77	"Configure the trouble-ticketing system for this repository");
	78	+ setup_menu_entry("Transfers", "xfersetup",
	79	+ "Configure the transfer system for this repository");
78	80	setup_menu_entry("Skins", "setup_skin",
79	81	"Select from a menu of prepackaged \"skins\" for the web interface");
80	82	setup_menu_entry("CSS", "setup_editcss",
81	83	"Edit the Cascading Style Sheet used by all pages of this repository");
82	84	setup_menu_entry("Header", "setup_header",
83	85

	--- src/setup.c
	+++ src/setup.c
	@@ -73,10 +73,12 @@
73	setup_menu_entry("Login-Group", "setup_login_group",
74	"Manage single sign-on between this repository and others"
75	" on the same server");
76	setup_menu_entry("Tickets", "tktsetup",
77	"Configure the trouble-ticketing system for this repository");


78	setup_menu_entry("Skins", "setup_skin",
79	"Select from a menu of prepackaged \"skins\" for the web interface");
80	setup_menu_entry("CSS", "setup_editcss",
81	"Edit the Cascading Style Sheet used by all pages of this repository");
82	setup_menu_entry("Header", "setup_header",
83

	--- src/setup.c
	+++ src/setup.c
	@@ -73,10 +73,12 @@
73	setup_menu_entry("Login-Group", "setup_login_group",
74	"Manage single sign-on between this repository and others"
75	" on the same server");
76	setup_menu_entry("Tickets", "tktsetup",
77	"Configure the trouble-ticketing system for this repository");
78	setup_menu_entry("Transfers", "xfersetup",
79	"Configure the transfer system for this repository");
80	setup_menu_entry("Skins", "setup_skin",
81	"Select from a menu of prepackaged \"skins\" for the web interface");
82	setup_menu_entry("CSS", "setup_editcss",
83	"Edit the Cascading Style Sheet used by all pages of this repository");
84	setup_menu_entry("Header", "setup_header",
85

M src/style.c

		--- src/style.c
		+++ src/style.c
		@@ -710,10 +710,15 @@
710	710	{ "p.tktsetupError",
711	711	"format for tktsetup errors",
712	712	@ color: red;
713	713	@ font-weight: bold;
714	714	},
	715	+ { "p.xfersetupError",
	716	+ "format for xfersetup errors",
	717	+ @ color: red;
	718	+ @ font-weight: bold;
	719	+ },
715	720	{ "p.thmainError",
716	721	"format for th script errors",
717	722	@ color: red;
718	723	@ font-weight: bold;
719	724	},
720	725

	--- src/style.c
	+++ src/style.c
	@@ -710,10 +710,15 @@
710	{ "p.tktsetupError",
711	"format for tktsetup errors",
712	@ color: red;
713	@ font-weight: bold;
714	},





715	{ "p.thmainError",
716	"format for th script errors",
717	@ color: red;
718	@ font-weight: bold;
719	},
720

	--- src/style.c
	+++ src/style.c
	@@ -710,10 +710,15 @@
710	{ "p.tktsetupError",
711	"format for tktsetup errors",
712	@ color: red;
713	@ font-weight: bold;
714	},
715	{ "p.xfersetupError",
716	"format for xfersetup errors",
717	@ color: red;
718	@ font-weight: bold;
719	},
720	{ "p.thmainError",
721	"format for th script errors",
722	@ color: red;
723	@ font-weight: bold;
724	},
725

M src/style.c

		--- src/style.c
		+++ src/style.c
		@@ -710,10 +710,15 @@
710	710	{ "p.tktsetupError",
711	711	"format for tktsetup errors",
712	712	@ color: red;
713	713	@ font-weight: bold;
714	714	},
	715	+ { "p.xfersetupError",
	716	+ "format for xfersetup errors",
	717	+ @ color: red;
	718	+ @ font-weight: bold;
	719	+ },
715	720	{ "p.thmainError",
716	721	"format for th script errors",
717	722	@ color: red;
718	723	@ font-weight: bold;
719	724	},
720	725

	--- src/style.c
	+++ src/style.c
	@@ -710,10 +710,15 @@
710	{ "p.tktsetupError",
711	"format for tktsetup errors",
712	@ color: red;
713	@ font-weight: bold;
714	},





715	{ "p.thmainError",
716	"format for th script errors",
717	@ color: red;
718	@ font-weight: bold;
719	},
720

	--- src/style.c
	+++ src/style.c
	@@ -710,10 +710,15 @@
710	{ "p.tktsetupError",
711	"format for tktsetup errors",
712	@ color: red;
713	@ font-weight: bold;
714	},
715	{ "p.xfersetupError",
716	"format for xfersetup errors",
717	@ color: red;
718	@ font-weight: bold;
719	},
720	{ "p.thmainError",
721	"format for th script errors",
722	@ color: red;
723	@ font-weight: bold;
724	},
725

M src/th_main.c

+1 -1

		--- src/th_main.c
		+++ src/th_main.c
		@@ -569,10 +569,10 @@
569	569	void test_th_render(void){
570	570	Blob in;
571	571	if( g.argc<3 ){
572	572	usage("FILE");
573	573	}
574		- db_open_config(0); /* Needed for "tcl" setting. */
	574	+ db_open_config(0); /* Needed for global "tcl" setting. */
575	575	blob_zero(&in);
576	576	blob_read_from_file(&in, g.argv[2]);
577	577	Th_Render(blob_str(&in));
578	578	}
579	579

	--- src/th_main.c
	+++ src/th_main.c
	@@ -569,10 +569,10 @@
569	void test_th_render(void){
570	Blob in;
571	if( g.argc<3 ){
572	usage("FILE");
573	}
574	db_open_config(0); /* Needed for "tcl" setting. */
575	blob_zero(&in);
576	blob_read_from_file(&in, g.argv[2]);
577	Th_Render(blob_str(&in));
578	}
579

	--- src/th_main.c
	+++ src/th_main.c
	@@ -569,10 +569,10 @@
569	void test_th_render(void){
570	Blob in;
571	if( g.argc<3 ){
572	usage("FILE");
573	}
574	db_open_config(0); /* Needed for global "tcl" setting. */
575	blob_zero(&in);
576	blob_read_from_file(&in, g.argv[2]);
577	Th_Render(blob_str(&in));
578	}
579

M src/xfer.c

+35

		--- src/xfer.c
		+++ src/xfer.c
		@@ -790,10 +790,35 @@
790	790	*/
791	791	static void server_private_xfer_not_authorized(void){
792	792	@ error not\sauthorized\sto\ssync\sprivate\scontent
793	793	}
794	794
	795	+/*
	796	+** Run the specified TH1 script, if any, and returns the return code or TH_OK
	797	+** when there is no script.
	798	+*/
	799	+static int run_script(const char *zScript){
	800	+ if( !zScript ){
	801	+ return TH_OK; /* No script, return success. */
	802	+ }
	803	+ Th_FossilInit(); /* Make sure TH1 is ready. */
	804	+ return Th_Eval(g.interp, 0, zScript, -1);
	805	+}
	806	+
	807	+/*
	808	+** Run the pre-transfer TH1 script, if any, and returns the return code.
	809	+*/
	810	+static int run_common_script(void){
	811	+ return run_script(db_get("xfer-common-script", 0));
	812	+}
	813	+
	814	+/*
	815	+** Run the post-push TH1 script, if any, and returns the return code.
	816	+*/
	817	+static int run_push_script(void){
	818	+ return run_script(db_get("xfer-push-script", 0));
	819	+}
795	820
796	821	/*
797	822	** If this variable is set, disable login checks. Used for debugging
798	823	** only.
799	824	*/
		@@ -847,10 +872,15 @@
847	872	db_begin_transaction();
848	873	db_multi_exec(
849	874	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
850	875	);
851	876	manifest_crosslink_begin();
	877	+ if( run_common_script()==TH_ERROR ){
	878	+ cgi_reset_content();
	879	+ @ error common\sscript\sfailed:\s%F(Th_GetResult(g.interp, 0))
	880	+ nErr++;
	881	+ }
852	882	while( blob_line(xfer.pIn, &xfer.line) ){
853	883	if( blob_buffer(&xfer.line)[0]=='#' ) continue;
854	884	if( blob_size(&xfer.line)==0 ) continue;
855	885	xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
856	886
		@@ -1160,10 +1190,15 @@
1160	1190	@ error bad\scommand:\s%F(blob_str(&xfer.line))
1161	1191	}
1162	1192	blobarray_reset(xfer.aToken, xfer.nToken);
1163	1193	}
1164	1194	if( isPush ){
	1195	+ if( run_push_script()==TH_ERROR ){
	1196	+ cgi_reset_content();
	1197	+ @ error push\sscript\sfailed:\s%F(Th_GetResult(g.interp, 0))
	1198	+ nErr++;
	1199	+ }
1165	1200	request_phantoms(&xfer, 500);
1166	1201	}
1167	1202	if( isClone && nGimme==0 ){
1168	1203	/* The initial "clone" message from client to server contains no
1169	1204	** "gimme" cards. On that initial message, send the client an "igot"
1170	1205
1171	1206	ADDED src/xfersetup.c

	--- src/xfer.c
	+++ src/xfer.c
	@@ -790,10 +790,35 @@
790	*/
791	static void server_private_xfer_not_authorized(void){
792	@ error not\sauthorized\sto\ssync\sprivate\scontent
793	}
794

























795
796	/*
797	** If this variable is set, disable login checks. Used for debugging
798	** only.
799	*/
	@@ -847,10 +872,15 @@
847	db_begin_transaction();
848	db_multi_exec(
849	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
850	);
851	manifest_crosslink_begin();





852	while( blob_line(xfer.pIn, &xfer.line) ){
853	if( blob_buffer(&xfer.line)[0]=='#' ) continue;
854	if( blob_size(&xfer.line)==0 ) continue;
855	xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
856
	@@ -1160,10 +1190,15 @@
1160	@ error bad\scommand:\s%F(blob_str(&xfer.line))
1161	}
1162	blobarray_reset(xfer.aToken, xfer.nToken);
1163	}
1164	if( isPush ){





1165	request_phantoms(&xfer, 500);
1166	}
1167	if( isClone && nGimme==0 ){
1168	/* The initial "clone" message from client to server contains no
1169	** "gimme" cards. On that initial message, send the client an "igot"
1170
1171	DDED src/xfersetup.c

	--- src/xfer.c
	+++ src/xfer.c
	@@ -790,10 +790,35 @@
790	*/
791	static void server_private_xfer_not_authorized(void){
792	@ error not\sauthorized\sto\ssync\sprivate\scontent
793	}
794
795	/*
796	** Run the specified TH1 script, if any, and returns the return code or TH_OK
797	** when there is no script.
798	*/
799	static int run_script(const char *zScript){
800	if( !zScript ){
801	return TH_OK; /* No script, return success. */
802	}
803	Th_FossilInit(); /* Make sure TH1 is ready. */
804	return Th_Eval(g.interp, 0, zScript, -1);
805	}
806
807	/*
808	** Run the pre-transfer TH1 script, if any, and returns the return code.
809	*/
810	static int run_common_script(void){
811	return run_script(db_get("xfer-common-script", 0));
812	}
813
814	/*
815	** Run the post-push TH1 script, if any, and returns the return code.
816	*/
817	static int run_push_script(void){
818	return run_script(db_get("xfer-push-script", 0));
819	}
820
821	/*
822	** If this variable is set, disable login checks. Used for debugging
823	** only.
824	*/
	@@ -847,10 +872,15 @@
872	db_begin_transaction();
873	db_multi_exec(
874	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
875	);
876	manifest_crosslink_begin();
877	if( run_common_script()==TH_ERROR ){
878	cgi_reset_content();
879	@ error common\sscript\sfailed:\s%F(Th_GetResult(g.interp, 0))
880	nErr++;
881	}
882	while( blob_line(xfer.pIn, &xfer.line) ){
883	if( blob_buffer(&xfer.line)[0]=='#' ) continue;
884	if( blob_size(&xfer.line)==0 ) continue;
885	xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
886
	@@ -1160,10 +1190,15 @@
1190	@ error bad\scommand:\s%F(blob_str(&xfer.line))
1191	}
1192	blobarray_reset(xfer.aToken, xfer.nToken);
1193	}
1194	if( isPush ){
1195	if( run_push_script()==TH_ERROR ){
1196	cgi_reset_content();
1197	@ error push\sscript\sfailed:\s%F(Th_GetResult(g.interp, 0))
1198	nErr++;
1199	}
1200	request_phantoms(&xfer, 500);
1201	}
1202	if( isClone && nGimme==0 ){
1203	/* The initial "clone" message from client to server contains no
1204	** "gimme" cards. On that initial message, send the client an "igot"
1205
1206	DDED src/xfersetup.c

M src/xfersetup.c

		--- a/src/xfersetup.c
		+++ b/src/xfersetup.c
		@@ -0,0 +1,8 @@
	1	+/body_and_footer(c)y_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footer/body_and(char*) synchronize with the
	2	+ @footer(footer(on/body_a/body_border="0" cellspacing="20}p>Press the %h(zButton)"%h(g.url.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footer/bter(footer(on/body_ablockquote></blockquote>
	3	+@ <hr /"push"))PCC/body_and_footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footer/body_and(char*) synchronize with the
	4	+ @footer(footer(on/body_a/body_border="0" cellspacing="20}p>Press the %h(zButton)"%h(g.url.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop(furl.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooteronize with the
	5	+ @footer(footer(on/body_a/body_border="0" cellspacing="20}p>Press the %h(zButton)"%h(g.url.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooterbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footer/body_and(char*) synchronize with the
	6	+ @footer(footer(on/body_a/body_border="0" cellspacing="20}p>Press the %h(zButton)"%h(g.url.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbod(footer(on/body_and_footerbody_anSyncer/bter(footer(on/body_ablockquote>ulflockquote>
	7	+@ <hr /"push"))PCCfor eacSyncket" change in aSyncSyncthe local repository
	8	+ @ooter(footer(on/body_and_foote/body_and_footerbody@Syncticket-change

	--- a/src/xfersetup.c
	+++ b/src/xfersetup.c
	@@ -0,0 +1,8 @@

	--- a/src/xfersetup.c
	+++ b/src/xfersetup.c
	@@ -0,0 +1,8 @@
1	/body_and_footer(c)y_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footer/body_and(char*) synchronize with the
2	@footer(footer(on/body_a/body_border="0" cellspacing="20}p>Press the %h(zButton)"%h(g.url.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footer/bter(footer(on/body_ablockquote></blockquote>
3	@ <hr /"push"))PCC/body_and_footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footer/body_and(char*) synchronize with the
4	@footer(footer(on/body_a/body_border="0" cellspacing="20}p>Press the %h(zButton)"%h(g.url.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop(furl.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooteronize with the
5	@footer(footer(on/body_a/body_border="0" cellspacing="20}p>Press the %h(zButton)"%h(g.url.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooterbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footer/body_and(char*) synchronize with the
6	@footer(footer(on/body_a/body_border="0" cellspacing="20}p>Press the %h(zButton)"%h(g.url.ca"http -async""th1-uri-regexp"blockquote>/body_and_footerbody_and_footerfooter(footer(on/body_and_footerbody_and_footers(g.zTop)footerbody_and_footerfooter(footer(on/body_and_footerbod(footer(on/body_and_footerbody_anSyncer/bter(footer(on/body_ablockquote>ulflockquote>
7	@ <hr /"push"))PCCfor eacSyncket" change in aSyncSyncthe local repository
8	@ooter(footer(on/body_and_foote/body_and_footerbody@Syncticket-change

M win/Makefile.PellesCGMake

+5 -2

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -1,9 +1,12 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	7	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
6	9	#
7	10	# HowTo
8	11	# -----
9	12	#
10	13

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -1,9 +1,12 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
5	# to regenerate this file.
6	#
7	# HowTo
8	# -----
9	#
10

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -1,9 +1,12 @@
1	#
2	##############################################################################
3	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4	##############################################################################
5	#
6	# This file is automatically generated. Instead of editing this
7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8	# to regenerate this file.
9	#
10	# HowTo
11	# -----
12	#
13

M win/Makefile.dmc

+16 -6

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -1,10 +1,14 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	7	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
	9	+#
6	10	B = ..
7	11	SRCDIR = $B\src
8	12	OBJDIR = .
9	13	O = .obj
10	14	E = .exe
		@@ -22,13 +26,13 @@
22	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
23	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
24	28
25	29	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
26	30
27		-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
	31	+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
28	32
29		-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$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)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
	33	+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$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)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
30	34
31	35
32	36	RC=$(DMDIR)\bin\rcc
33	37	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
34	38
		@@ -42,11 +46,11 @@
42	46
43	47	$(OBJDIR)\fossil.res: $B\win\fossil.rc
44	48	$(RC) $(RCFLAGS) -o$@ $**
45	49
46	50	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
47		- +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
	51	+ +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
48	52	+echo fossil >> $@
49	53	+echo fossil >> $@
50	54	+echo $(LIBS) >> $@
51	55	+echo. >> $@
52	56	+echo fossil >> $@
		@@ -654,15 +658,21 @@
654	658	$(OBJDIR)\xfer$O : xfer_.c xfer.h
655	659	$(TCC) -o$@ -c xfer_.c
656	660
657	661	xfer_.c : $(SRCDIR)\xfer.c
658	662	+translate$E $** > $@
	663	+
	664	+$(OBJDIR)\xfersetup$O : xfersetup_.c xfersetup.h
	665	+ $(TCC) -o$@ -c xfersetup_.c
	666	+
	667	+xfersetup_.c : $(SRCDIR)\xfersetup.c
	668	+ +translate$E $** > $@
659	669
660	670	$(OBJDIR)\zip$O : zip_.c zip.h
661	671	$(TCC) -o$@ -c zip_.c
662	672
663	673	zip_.c : $(SRCDIR)\zip.c
664	674	+translate$E $** > $@
665	675
666	676	headers: makeheaders$E page_index.h VERSION.h
667		- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.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 login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.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 update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
	677	+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.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 login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.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 update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
668	678	@copy /Y nul: headers
669	679

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -1,10 +1,14 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
5	# to regenerate this file.

6	B = ..
7	SRCDIR = $B\src
8	OBJDIR = .
9	O = .obj
10	E = .exe
	@@ -22,13 +26,13 @@
22	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
23	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
24
25	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
26
27	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
28
29	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$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)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
30
31
32	RC=$(DMDIR)\bin\rcc
33	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
34
	@@ -42,11 +46,11 @@
42
43	$(OBJDIR)\fossil.res: $B\win\fossil.rc
44	$(RC) $(RCFLAGS) -o$@ $**
45
46	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
47	+echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
48	+echo fossil >> $@
49	+echo fossil >> $@
50	+echo $(LIBS) >> $@
51	+echo. >> $@
52	+echo fossil >> $@
	@@ -654,15 +658,21 @@
654	$(OBJDIR)\xfer$O : xfer_.c xfer.h
655	$(TCC) -o$@ -c xfer_.c
656
657	xfer_.c : $(SRCDIR)\xfer.c
658	+translate$E $** > $@






659
660	$(OBJDIR)\zip$O : zip_.c zip.h
661	$(TCC) -o$@ -c zip_.c
662
663	zip_.c : $(SRCDIR)\zip.c
664	+translate$E $** > $@
665
666	headers: makeheaders$E page_index.h VERSION.h
667	+makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.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 login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.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 update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
668	@copy /Y nul: headers
669

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -1,10 +1,14 @@
1	#
2	##############################################################################
3	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4	##############################################################################
5	#
6	# This file is automatically generated. Instead of editing this
7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8	# to regenerate this file.
9	#
10	B = ..
11	SRCDIR = $B\src
12	OBJDIR = .
13	O = .obj
14	E = .exe
	@@ -22,13 +26,13 @@
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
30
31	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
32
33	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$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)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
34
35
36	RC=$(DMDIR)\bin\rcc
37	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
38
	@@ -42,11 +46,11 @@
46
47	$(OBJDIR)\fossil.res: $B\win\fossil.rc
48	$(RC) $(RCFLAGS) -o$@ $**
49
50	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
51	+echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
52	+echo fossil >> $@
53	+echo fossil >> $@
54	+echo $(LIBS) >> $@
55	+echo. >> $@
56	+echo fossil >> $@
	@@ -654,15 +658,21 @@
658	$(OBJDIR)\xfer$O : xfer_.c xfer.h
659	$(TCC) -o$@ -c xfer_.c
660
661	xfer_.c : $(SRCDIR)\xfer.c
662	+translate$E $** > $@
663
664	$(OBJDIR)\xfersetup$O : xfersetup_.c xfersetup.h
665	$(TCC) -o$@ -c xfersetup_.c
666
667	xfersetup_.c : $(SRCDIR)\xfersetup.c
668	+translate$E $** > $@
669
670	$(OBJDIR)\zip$O : zip_.c zip.h
671	$(TCC) -o$@ -c zip_.c
672
673	zip_.c : $(SRCDIR)\zip.c
674	+translate$E $** > $@
675
676	headers: makeheaders$E page_index.h VERSION.h
677	+makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.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 login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.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 update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
678	@copy /Y nul: headers
679

M win/Makefile.mingw

+137 -27

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1,17 +1,24 @@
1	1	#!/usr/bin/make
2	2	#
3		-# This is a makefile for us on windows using mingw.
	3	+##############################################################################
	4	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	5	+##############################################################################
	6	+#
	7	+# This file is automatically generated. Instead of editing this
	8	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
	9	+# to regenerate this file.
	10	+#
	11	+# This is a makefile for us on windows using MinGW.
4	12	#
5	13	#### The toplevel directory of the source tree. Fossil can be built
6	14	# in a directory that is separate from the source tree. Just change
7	15	# the following to point from the build directory to the src/ folder.
8	16	#
9	17	SRCDIR = src
10	18
11	19	#### The directory into which object code files should be written.
12		-#
13	20	#
14	21	OBJDIR = wbld
15	22
16	23	#### C Compiler and options for use in building executables that
17	24	# will run on the platform that is doing the build. This is used
		@@ -20,51 +27,134 @@
20	27	#
21	28	BCC = gcc
22	29
23	30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
24	31	#
25		-# FOSSIL_ENABLE_SSL=1
26		-
27		-#### The directory in which the zlib compression library is installed.
28		-#
29		-#
30		-ZLIBDIR = /programs/gnuwin32
31		-
32		-#### C Compile and options for use in building executables that
	32	+# FOSSIL_ENABLE_SSL = 1
	33	+
	34	+#### Enable scripting support via Tcl/Tk
	35	+#
	36	+# FOSSIL_ENABLE_TCL = 1
	37	+
	38	+#### Use the Tcl source directory instead of the install directory?
	39	+# This is useful when Tcl has been compiled statically with MinGW.
	40	+#
	41	+FOSSIL_TCL_SOURCE = 1
	42	+
	43	+#### The directories where the zlib include and library files are located.
	44	+# The recommended usage here is to use the Sysinternals junction tool
	45	+# to create a hard link between an "zlib-1.x.y" sub-directory of the
	46	+# Fossil source code directory and the target zlib source directory.
	47	+#
	48	+ZINCDIR = $(SRCDIR)/../zlib-1.2.5
	49	+ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
	50	+
	51	+#### The directories where the OpenSSL include and library files are located.
	52	+# The recommended usage here is to use the Sysinternals junction tool
	53	+# to create a hard link between an "openssl-1.x" sub-directory of the
	54	+# Fossil source code directory and the target OpenSSL source directory.
	55	+#
	56	+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
	57	+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
	58	+
	59	+#### Either the directory where the Tcl library is installed or the Tcl
	60	+# source code directory resides (depending on the value of the macro
	61	+# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
	62	+# this directory must have "include" and "lib" sub-directories. If
	63	+# this points to the Tcl source code directory, this directory must
	64	+# have "generic" and "win" sub-directories. The recommended usage
	65	+# here is to use the Sysinternals junction tool to create a hard
	66	+# link between a "tcl-8.x" sub-directory of the Fossil source code
	67	+# directory and the target Tcl directory. This removes the need to
	68	+# hard-code the necessary paths in this Makefile.
	69	+#
	70	+TCLDIR = $(SRCDIR)/../tcl-8.6
	71	+
	72	+#### The Tcl source code directory. This defaults to the same value as
	73	+# TCLDIR macro (above), which may not be correct. This value will
	74	+# only be used if the FOSSIL_TCL_SOURCE macro is defined.
	75	+#
	76	+TCLSRCDIR = $(TCLDIR)
	77	+
	78	+#### The Tcl include and library directories. These values will only be
	79	+# used if the FOSSIL_TCL_SOURCE macro is not defined.
	80	+#
	81	+TCLINCDIR = $(TCLDIR)/include
	82	+TCLLIBDIR = $(TCLDIR)/lib
	83	+
	84	+#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	85	+#
	86	+LIBTCL = -ltcl86
	87	+
	88	+#### C Compile and options for use in building executables that
33	89	# will run on the target platform. This is usually the same
34	90	# as BCC, unless you are cross-compiling. This C compiler builds
35	91	# the finished binary for fossil. The BCC compiler above is used
36	92	# for building intermediate code-generator tools.
37	93	#
38		-TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
	94	+TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	95	+
	96	+# With HTTPS support
	97	+ifdef FOSSIL_ENABLE_SSL
	98	+TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
	99	+endif
	100	+
	101	+# With Tcl support
	102	+ifdef FOSSIL_ENABLE_TCL
	103	+ifdef FOSSIL_TCL_SOURCE
	104	+TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
	105	+else
	106	+TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
	107	+endif
	108	+endif
39	109
40	110	# With HTTPS support
41	111	ifdef FOSSIL_ENABLE_SSL
42		-TCC += -static -DFOSSIL_ENABLE_SSL=1
	112	+TCC += -DFOSSIL_ENABLE_SSL=1
	113	+endif
	114	+
	115	+# With Tcl support (statically linked)
	116	+ifdef FOSSIL_ENABLE_TCL
	117	+TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
43	118	endif
44	119
45	120	#### Extra arguments for linking the finished binary. Fossil needs
46	121	# to link against the Z-Lib compression library. There are no
47		-# other dependencies. We sometimes add the -static option here
	122	+# other mandatory dependencies. We add the -static option here
48	123	# so that we can build a static executable that will run in a
49	124	# chroot jail.
50	125	#
51		-#LIB = -lz -lws2_32
52		-# OpenSSL:
	126	+LIB = -static
	127	+LIB += -lmingwex -lz
	128	+
	129	+# OpenSSL: Add the necessary libaries required, if enabled.
53	130	ifdef FOSSIL_ENABLE_SSL
54	131	LIB += -lssl -lcrypto -lgdi32
55	132	endif
56		-LIB += -lmingwex -lz -lws2_32
57	133
58		-#### Tcl shell for use in running the fossil testsuite. This is only
59		-# used for testing. If you do not run
	134	+# Tcl: Add the necessary libaries required, if enabled.
	135	+ifdef FOSSIL_ENABLE_TCL
	136	+LIB += $(LIBTCL)
	137	+endif
	138	+
	139	+#### These libraries MUST appear in the same order as they do for Tcl
	140	+# or linking with it will not work (exact reason unknown).
	141	+#
	142	+ifdef FOSSIL_ENABLE_TCL
	143	+LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	144	+else
	145	+LIB += -lws2_32
	146	+endif
	147	+
	148	+#### Tcl shell for use in running the fossil test suite. This is only
	149	+# used for testing.
60	150	#
61	151	TCLSH = tclsh
62	152
63		-#### Nullsoft installer makensis location
	153	+#### Nullsoft installer MakeNSIS location
64	154	#
65		-MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
	155	+MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
66	156
67	157	#### Include a configuration file that can override any one of these settings.
68	158	#
69	159	-include config.w32
70	160
		@@ -164,10 +254,11 @@
164	254	$(SRCDIR)/vfile.c \
165	255	$(SRCDIR)/wiki.c \
166	256	$(SRCDIR)/wikiformat.c \
167	257	$(SRCDIR)/winhttp.c \
168	258	$(SRCDIR)/xfer.c \
	259	+ $(SRCDIR)/xfersetup.c \
169	260	$(SRCDIR)/zip.c
170	261
171	262	TRANS_SRC = \
172	263	$(OBJDIR)/add_.c \
173	264	$(OBJDIR)/allrepo_.c \
		@@ -259,10 +350,11 @@
259	350	$(OBJDIR)/vfile_.c \
260	351	$(OBJDIR)/wiki_.c \
261	352	$(OBJDIR)/wikiformat_.c \
262	353	$(OBJDIR)/winhttp_.c \
263	354	$(OBJDIR)/xfer_.c \
	355	+ $(OBJDIR)/xfersetup_.c \
264	356	$(OBJDIR)/zip_.c
265	357
266	358	OBJ = \
267	359	$(OBJDIR)/add.o \
268	360	$(OBJDIR)/allrepo.o \
		@@ -354,10 +446,11 @@
354	446	$(OBJDIR)/vfile.o \
355	447	$(OBJDIR)/wiki.o \
356	448	$(OBJDIR)/wikiformat.o \
357	449	$(OBJDIR)/winhttp.o \
358	450	$(OBJDIR)/xfer.o \
	451	+ $(OBJDIR)/xfersetup.o \
359	452	$(OBJDIR)/zip.o
360	453
361	454	APPNAME = fossil.exe
362	455	TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
363	456	MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
		@@ -387,45 +480,49 @@
387	480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
388	481
389	482	$(VERSION): $(SRCDIR)/mkversion.c
390	483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
391	484
392		-# WARNING. DANGER. Running the testsuite modifies the repository the
	485	+# WARNING. DANGER. Running the test suite modifies the repository the
393	486	# build is done from, i.e. the checkout belongs to. Do not sync/push
394	487	# the repository after running the tests.
395		-test: $(APPNAME)
396		- $(TCLSH) test/tester.tcl $(APPNAME)
	488	+test: $(OBJDIR) $(APPNAME)
	489	+ $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
397	490
398	491	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
399	492	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
400	493
401	494	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
	495	+
	496	+ifdef FOSSIL_ENABLE_TCL
	497	+EXTRAOBJ += $(OBJDIR)/th_tcl.o
	498	+endif
402	499
403	500	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
404	501	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
405	502
406	503	# This rule prevents make from using its default rules to try build
407	504	# an executable named "manifest" out of the file named "manifest.c"
408	505	#
409		-$(SRCDIR)/../manifest:
	506	+$(SRCDIR)/../manifest:
410	507	# noop
411	508
412		-# Requires msys to be installed in addition to the mingw, for the "rm"
	509	+# Requires MSYS to be installed in addition to the MinGW, for the "rm"
413	510	# command. "del" will not work here because it is not a separate command
414	511	# but a MSDOS-shell builtin.
415	512	#
416		-clean:
	513	+clean:
417	514	rm -rf $(OBJDIR) $(APPNAME)
418	515
419	516	setup: $(OBJDIR) $(APPNAME)
420	517	$(MAKENSIS) ./fossil.nsi
421	518
422	519
423	520	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
424	521	$(MKINDEX) $(TRANS_SRC) >$@
425	522	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
426		- $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
	523	+ $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
427	524	echo Done >$(OBJDIR)/headers
428	525
429	526	$(OBJDIR)/headers: Makefile
430	527	Makefile:
431	528	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
		@@ -1070,10 +1167,17 @@
1070	1167
1071	1168	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1072	1169	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1073	1170
1074	1171	xfer.h: $(OBJDIR)/headers
	1172	+$(OBJDIR)/xfersetup_.c: $(SRCDIR)/xfersetup.c $(OBJDIR)/translate
	1173	+ $(TRANSLATE) $(SRCDIR)/xfersetup.c >$(OBJDIR)/xfersetup_.c
	1174	+
	1175	+$(OBJDIR)/xfersetup.o: $(OBJDIR)/xfersetup_.c $(OBJDIR)/xfersetup.h $(SRCDIR)/config.h
	1176	+ $(XTCC) -o $(OBJDIR)/xfersetup.o -c $(OBJDIR)/xfersetup_.c
	1177	+
	1178	+xfersetup.h: $(OBJDIR)/headers
1075	1179	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1076	1180	$(TRANSLATE) $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1077	1181
1078	1182	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1079	1183	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
		@@ -1084,14 +1188,20 @@
1084	1188
1085	1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1086	1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1087	1191
1088	1192	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
	1193	+
1089	1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1090	1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1091	1196
1092	1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1093	1198	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1094	1199
1095	1200	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1096	1201	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
	1202	+
	1203	+ifdef FOSSIL_ENABLE_TCL
	1204	+$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
	1205	+ $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
	1206	+endif
1097	1207
1098	1208

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1,17 +1,24 @@
1	#!/usr/bin/make
2	#
3	# This is a makefile for us on windows using mingw.








4	#
5	#### The toplevel directory of the source tree. Fossil can be built
6	# in a directory that is separate from the source tree. Just change
7	# the following to point from the build directory to the src/ folder.
8	#
9	SRCDIR = src
10
11	#### The directory into which object code files should be written.
12	#
13	#
14	OBJDIR = wbld
15
16	#### C Compiler and options for use in building executables that
17	# will run on the platform that is doing the build. This is used
	@@ -20,51 +27,134 @@
20	#
21	BCC = gcc
22
23	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
24	#
25	# FOSSIL_ENABLE_SSL=1
26
27	#### The directory in which the zlib compression library is installed.
28	#
29	#
30	ZLIBDIR = /programs/gnuwin32
31
32	#### C Compile and options for use in building executables that

















































33	# will run on the target platform. This is usually the same
34	# as BCC, unless you are cross-compiling. This C compiler builds
35	# the finished binary for fossil. The BCC compiler above is used
36	# for building intermediate code-generator tools.
37	#
38	TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include














39
40	# With HTTPS support
41	ifdef FOSSIL_ENABLE_SSL
42	TCC += -static -DFOSSIL_ENABLE_SSL=1





43	endif
44
45	#### Extra arguments for linking the finished binary. Fossil needs
46	# to link against the Z-Lib compression library. There are no
47	# other dependencies. We sometimes add the -static option here
48	# so that we can build a static executable that will run in a
49	# chroot jail.
50	#
51	#LIB = -lz -lws2_32
52	# OpenSSL:


53	ifdef FOSSIL_ENABLE_SSL
54	LIB += -lssl -lcrypto -lgdi32
55	endif
56	LIB += -lmingwex -lz -lws2_32
57
58	#### Tcl shell for use in running the fossil testsuite. This is only
59	# used for testing. If you do not run














60	#
61	TCLSH = tclsh
62
63	#### Nullsoft installer makensis location
64	#
65	MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
66
67	#### Include a configuration file that can override any one of these settings.
68	#
69	-include config.w32
70
	@@ -164,10 +254,11 @@
164	$(SRCDIR)/vfile.c \
165	$(SRCDIR)/wiki.c \
166	$(SRCDIR)/wikiformat.c \
167	$(SRCDIR)/winhttp.c \
168	$(SRCDIR)/xfer.c \

169	$(SRCDIR)/zip.c
170
171	TRANS_SRC = \
172	$(OBJDIR)/add_.c \
173	$(OBJDIR)/allrepo_.c \
	@@ -259,10 +350,11 @@
259	$(OBJDIR)/vfile_.c \
260	$(OBJDIR)/wiki_.c \
261	$(OBJDIR)/wikiformat_.c \
262	$(OBJDIR)/winhttp_.c \
263	$(OBJDIR)/xfer_.c \

264	$(OBJDIR)/zip_.c
265
266	OBJ = \
267	$(OBJDIR)/add.o \
268	$(OBJDIR)/allrepo.o \
	@@ -354,10 +446,11 @@
354	$(OBJDIR)/vfile.o \
355	$(OBJDIR)/wiki.o \
356	$(OBJDIR)/wikiformat.o \
357	$(OBJDIR)/winhttp.o \
358	$(OBJDIR)/xfer.o \

359	$(OBJDIR)/zip.o
360
361	APPNAME = fossil.exe
362	TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
363	MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
	@@ -387,45 +480,49 @@
387	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
388
389	$(VERSION): $(SRCDIR)/mkversion.c
390	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
391
392	# WARNING. DANGER. Running the testsuite modifies the repository the
393	# build is done from, i.e. the checkout belongs to. Do not sync/push
394	# the repository after running the tests.
395	test: $(APPNAME)
396	$(TCLSH) test/tester.tcl $(APPNAME)
397
398	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
399	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
400
401	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o




402
403	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
404	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
405
406	# This rule prevents make from using its default rules to try build
407	# an executable named "manifest" out of the file named "manifest.c"
408	#
409	$(SRCDIR)/../manifest:
410	# noop
411
412	# Requires msys to be installed in addition to the mingw, for the "rm"
413	# command. "del" will not work here because it is not a separate command
414	# but a MSDOS-shell builtin.
415	#
416	clean:
417	rm -rf $(OBJDIR) $(APPNAME)
418
419	setup: $(OBJDIR) $(APPNAME)
420	$(MAKENSIS) ./fossil.nsi
421
422
423	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
424	$(MKINDEX) $(TRANS_SRC) >$@
425	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
426	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
427	echo Done >$(OBJDIR)/headers
428
429	$(OBJDIR)/headers: Makefile
430	Makefile:
431	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -1070,10 +1167,17 @@
1070
1071	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1072	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1073
1074	xfer.h: $(OBJDIR)/headers







1075	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1076	$(TRANSLATE) $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1077
1078	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1079	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
	@@ -1084,14 +1188,20 @@
1084
1085	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1086	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1087
1088	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h

1089	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1090	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1091
1092	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1093	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1094
1095	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1096	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o





1097
1098

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1,17 +1,24 @@
1	#!/usr/bin/make
2	#
3	##############################################################################
4	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
5	##############################################################################
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for us on windows using MinGW.
12	#
13	#### The toplevel directory of the source tree. Fossil can be built
14	# in a directory that is separate from the source tree. Just change
15	# the following to point from the build directory to the src/ folder.
16	#
17	SRCDIR = src
18
19	#### The directory into which object code files should be written.

20	#
21	OBJDIR = wbld
22
23	#### C Compiler and options for use in building executables that
24	# will run on the platform that is doing the build. This is used
	@@ -20,51 +27,134 @@
27	#
28	BCC = gcc
29
30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
31	#
32	# FOSSIL_ENABLE_SSL = 1
33
34	#### Enable scripting support via Tcl/Tk
35	#
36	# FOSSIL_ENABLE_TCL = 1
37
38	#### Use the Tcl source directory instead of the install directory?
39	# This is useful when Tcl has been compiled statically with MinGW.
40	#
41	FOSSIL_TCL_SOURCE = 1
42
43	#### The directories where the zlib include and library files are located.
44	# The recommended usage here is to use the Sysinternals junction tool
45	# to create a hard link between an "zlib-1.x.y" sub-directory of the
46	# Fossil source code directory and the target zlib source directory.
47	#
48	ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49	ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
50
51	#### The directories where the OpenSSL include and library files are located.
52	# The recommended usage here is to use the Sysinternals junction tool
53	# to create a hard link between an "openssl-1.x" sub-directory of the
54	# Fossil source code directory and the target OpenSSL source directory.
55	#
56	OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57	OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
58
59	#### Either the directory where the Tcl library is installed or the Tcl
60	# source code directory resides (depending on the value of the macro
61	# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62	# this directory must have "include" and "lib" sub-directories. If
63	# this points to the Tcl source code directory, this directory must
64	# have "generic" and "win" sub-directories. The recommended usage
65	# here is to use the Sysinternals junction tool to create a hard
66	# link between a "tcl-8.x" sub-directory of the Fossil source code
67	# directory and the target Tcl directory. This removes the need to
68	# hard-code the necessary paths in this Makefile.
69	#
70	TCLDIR = $(SRCDIR)/../tcl-8.6
71
72	#### The Tcl source code directory. This defaults to the same value as
73	# TCLDIR macro (above), which may not be correct. This value will
74	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
75	#
76	TCLSRCDIR = $(TCLDIR)
77
78	#### The Tcl include and library directories. These values will only be
79	# used if the FOSSIL_TCL_SOURCE macro is not defined.
80	#
81	TCLINCDIR = $(TCLDIR)/include
82	TCLLIBDIR = $(TCLDIR)/lib
83
84	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
85	#
86	LIBTCL = -ltcl86
87
88	#### C Compile and options for use in building executables that
89	# will run on the target platform. This is usually the same
90	# as BCC, unless you are cross-compiling. This C compiler builds
91	# the finished binary for fossil. The BCC compiler above is used
92	# for building intermediate code-generator tools.
93	#
94	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
95
96	# With HTTPS support
97	ifdef FOSSIL_ENABLE_SSL
98	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
99	endif
100
101	# With Tcl support
102	ifdef FOSSIL_ENABLE_TCL
103	ifdef FOSSIL_TCL_SOURCE
104	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
105	else
106	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
107	endif
108	endif
109
110	# With HTTPS support
111	ifdef FOSSIL_ENABLE_SSL
112	TCC += -DFOSSIL_ENABLE_SSL=1
113	endif
114
115	# With Tcl support (statically linked)
116	ifdef FOSSIL_ENABLE_TCL
117	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
118	endif
119
120	#### Extra arguments for linking the finished binary. Fossil needs
121	# to link against the Z-Lib compression library. There are no
122	# other mandatory dependencies. We add the -static option here
123	# so that we can build a static executable that will run in a
124	# chroot jail.
125	#
126	LIB = -static
127	LIB += -lmingwex -lz
128
129	# OpenSSL: Add the necessary libaries required, if enabled.
130	ifdef FOSSIL_ENABLE_SSL
131	LIB += -lssl -lcrypto -lgdi32
132	endif

133
134	# Tcl: Add the necessary libaries required, if enabled.
135	ifdef FOSSIL_ENABLE_TCL
136	LIB += $(LIBTCL)
137	endif
138
139	#### These libraries MUST appear in the same order as they do for Tcl
140	# or linking with it will not work (exact reason unknown).
141	#
142	ifdef FOSSIL_ENABLE_TCL
143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
144	else
145	LIB += -lws2_32
146	endif
147
148	#### Tcl shell for use in running the fossil test suite. This is only
149	# used for testing.
150	#
151	TCLSH = tclsh
152
153	#### Nullsoft installer MakeNSIS location
154	#
155	MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
156
157	#### Include a configuration file that can override any one of these settings.
158	#
159	-include config.w32
160
	@@ -164,10 +254,11 @@
254	$(SRCDIR)/vfile.c \
255	$(SRCDIR)/wiki.c \
256	$(SRCDIR)/wikiformat.c \
257	$(SRCDIR)/winhttp.c \
258	$(SRCDIR)/xfer.c \
259	$(SRCDIR)/xfersetup.c \
260	$(SRCDIR)/zip.c
261
262	TRANS_SRC = \
263	$(OBJDIR)/add_.c \
264	$(OBJDIR)/allrepo_.c \
	@@ -259,10 +350,11 @@
350	$(OBJDIR)/vfile_.c \
351	$(OBJDIR)/wiki_.c \
352	$(OBJDIR)/wikiformat_.c \
353	$(OBJDIR)/winhttp_.c \
354	$(OBJDIR)/xfer_.c \
355	$(OBJDIR)/xfersetup_.c \
356	$(OBJDIR)/zip_.c
357
358	OBJ = \
359	$(OBJDIR)/add.o \
360	$(OBJDIR)/allrepo.o \
	@@ -354,10 +446,11 @@
446	$(OBJDIR)/vfile.o \
447	$(OBJDIR)/wiki.o \
448	$(OBJDIR)/wikiformat.o \
449	$(OBJDIR)/winhttp.o \
450	$(OBJDIR)/xfer.o \
451	$(OBJDIR)/xfersetup.o \
452	$(OBJDIR)/zip.o
453
454	APPNAME = fossil.exe
455	TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
456	MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
	@@ -387,45 +480,49 @@
480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
481
482	$(VERSION): $(SRCDIR)/mkversion.c
483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
484
485	# WARNING. DANGER. Running the test suite modifies the repository the
486	# build is done from, i.e. the checkout belongs to. Do not sync/push
487	# the repository after running the tests.
488	test: $(OBJDIR) $(APPNAME)
489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
490
491	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
492	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
493
494	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
495
496	ifdef FOSSIL_ENABLE_TCL
497	EXTRAOBJ += $(OBJDIR)/th_tcl.o
498	endif
499
500	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
501	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
502
503	# This rule prevents make from using its default rules to try build
504	# an executable named "manifest" out of the file named "manifest.c"
505	#
506	$(SRCDIR)/../manifest:
507	# noop
508
509	# Requires MSYS to be installed in addition to the MinGW, for the "rm"
510	# command. "del" will not work here because it is not a separate command
511	# but a MSDOS-shell builtin.
512	#
513	clean:
514	rm -rf $(OBJDIR) $(APPNAME)
515
516	setup: $(OBJDIR) $(APPNAME)
517	$(MAKENSIS) ./fossil.nsi
518
519
520	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
521	$(MKINDEX) $(TRANS_SRC) >$@
522	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
523	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
524	echo Done >$(OBJDIR)/headers
525
526	$(OBJDIR)/headers: Makefile
527	Makefile:
528	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -1070,10 +1167,17 @@
1167
1168	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1169	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1170
1171	xfer.h: $(OBJDIR)/headers
1172	$(OBJDIR)/xfersetup_.c: $(SRCDIR)/xfersetup.c $(OBJDIR)/translate
1173	$(TRANSLATE) $(SRCDIR)/xfersetup.c >$(OBJDIR)/xfersetup_.c
1174
1175	$(OBJDIR)/xfersetup.o: $(OBJDIR)/xfersetup_.c $(OBJDIR)/xfersetup.h $(SRCDIR)/config.h
1176	$(XTCC) -o $(OBJDIR)/xfersetup.o -c $(OBJDIR)/xfersetup_.c
1177
1178	xfersetup.h: $(OBJDIR)/headers
1179	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1180	$(TRANSLATE) $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1181
1182	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1183	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
	@@ -1084,14 +1188,20 @@
1188
1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1191
1192	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1193
1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1196
1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1198	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1199
1200	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1201	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1202
1203	ifdef FOSSIL_ENABLE_TCL
1204	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1205	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1206	endif
1207
1208

M win/Makefile.mingw.mistachkin

+178 -23

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1,8 +1,16 @@
1	1	#!/usr/bin/make
2	2	#
3		-# This is a makefile for us on windows using mingw.
	3	+##############################################################################
	4	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	5	+##############################################################################
	6	+#
	7	+# This file is automatically generated. Instead of editing this
	8	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
	9	+# to regenerate this file.
	10	+#
	11	+# This is a makefile for us on windows using MinGW.
4	12	#
5	13	#### The toplevel directory of the source tree. Fossil can be built
6	14	# in a directory that is separate from the source tree. Just change
7	15	# the following to point from the build directory to the src/ folder.
8	16	#
		@@ -19,34 +27,36 @@
19	27	#
20	28	BCC = gcc
21	29
22	30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
23	31	#
24		-FOSSIL_ENABLE_SSL=1
	32	+FOSSIL_ENABLE_SSL = 1
25	33
26	34	#### Enable scripting support via Tcl/Tk
27	35	#
28		-FOSSIL_ENABLE_TCL=1
	36	+FOSSIL_ENABLE_TCL = 1
29	37
30	38	#### Use the Tcl source directory instead of the install directory?
31	39	# This is useful when Tcl has been compiled statically with MinGW.
32	40	#
33		-FOSSIL_TCL_SOURCE=1
	41	+FOSSIL_TCL_SOURCE = 1
34	42
35		-#### The directory where the zlib library source code is located.
	43	+#### The directories where the zlib include and library files are located.
36	44	# The recommended usage here is to use the Sysinternals junction tool
37	45	# to create a hard link between an "zlib-1.x.y" sub-directory of the
38	46	# Fossil source code directory and the target zlib source directory.
39	47	#
	48	+ZINCDIR = $(SRCDIR)/../zlib-1.2.5
40	49	ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
41	50
42		-#### The directory where the OpenSSL library source code is located.
	51	+#### The directories where the OpenSSL include and library files are located.
43	52	# The recommended usage here is to use the Sysinternals junction tool
44	53	# to create a hard link between an "openssl-1.x" sub-directory of the
45	54	# Fossil source code directory and the target OpenSSL source directory.
46	55	#
47		-OPENSSLDIR = $(SRCDIR)/../openssl-1.0.0e
	56	+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
	57	+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
48	58
49	59	#### Either the directory where the Tcl library is installed or the Tcl
50	60	# source code directory resides (depending on the value of the macro
51	61	# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
52	62	# this directory must have "include" and "lib" sub-directories. If
		@@ -56,30 +66,46 @@
56	66	# link between a "tcl-8.x" sub-directory of the Fossil source code
57	67	# directory and the target Tcl directory. This removes the need to
58	68	# hard-code the necessary paths in this Makefile.
59	69	#
60	70	TCLDIR = $(SRCDIR)/../tcl-8.6
	71	+
	72	+#### The Tcl source code directory. This defaults to the same value as
	73	+# TCLDIR macro (above), which may not be correct. This value will
	74	+# only be used if the FOSSIL_TCL_SOURCE macro is defined.
	75	+#
	76	+TCLSRCDIR = $(TCLDIR)
	77	+
	78	+#### The Tcl include and library directories. These values will only be
	79	+# used if the FOSSIL_TCL_SOURCE macro is not defined.
	80	+#
	81	+TCLINCDIR = $(TCLDIR)/include
	82	+TCLLIBDIR = $(TCLDIR)/lib
	83	+
	84	+#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	85	+#
	86	+LIBTCL = -ltcl86
61	87
62	88	#### C Compile and options for use in building executables that
63	89	# will run on the target platform. This is usually the same
64	90	# as BCC, unless you are cross-compiling. This C compiler builds
65	91	# the finished binary for fossil. The BCC compiler above is used
66	92	# for building intermediate code-generator tools.
67	93	#
68		-TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZLIBDIR)
	94	+TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
69	95
70	96	# With HTTPS support
71	97	ifdef FOSSIL_ENABLE_SSL
72		-TCC += -L$(OPENSSLDIR) -I$(OPENSSLDIR)/include
	98	+TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
73	99	endif
74	100
75	101	# With Tcl support
76	102	ifdef FOSSIL_ENABLE_TCL
77	103	ifdef FOSSIL_TCL_SOURCE
78		-TCC += -L$(TCLDIR)/win -I$(TCLDIR)/generic -I$(TCLDIR)/win
	104	+TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
79	105	else
80		-TCC += -L$(TCLDIR)/lib -I$(TCLDIR)/include
	106	+TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
81	107	endif
82	108	endif
83	109
84	110	# With HTTPS support
85	111	ifdef FOSSIL_ENABLE_SSL
		@@ -98,33 +124,37 @@
98	124	# chroot jail.
99	125	#
100	126	LIB = -static
101	127	LIB += -lmingwex -lz
102	128
103		-# OpenSSL: Add the necessary libaries required.
	129	+# OpenSSL: Add the necessary libaries required, if enabled.
104	130	ifdef FOSSIL_ENABLE_SSL
105	131	LIB += -lssl -lcrypto -lgdi32
106	132	endif
107	133
108		-# Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	134	+# Tcl: Add the necessary libaries required, if enabled.
109	135	ifdef FOSSIL_ENABLE_TCL
110		-LIB += -ltcl86
	136	+LIB += $(LIBTCL)
111	137	endif
112	138
113	139	#### These libraries MUST appear in the same order as they do for Tcl
114	140	# or linking with it will not work (exact reason unknown).
115	141	#
	142	+ifdef FOSSIL_ENABLE_TCL
116	143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	144	+else
	145	+LIB += -lws2_32
	146	+endif
117	147
118		-#### Tcl shell for use in running the fossil testsuite. This is only
119		-# used for testing. If you do not run
	148	+#### Tcl shell for use in running the fossil test suite. This is only
	149	+# used for testing.
120	150	#
121	151	TCLSH = tclsh
122	152
123		-#### Nullsoft installer makensis location
	153	+#### Nullsoft installer MakeNSIS location
124	154	#
125		-MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
	155	+MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
126	156
127	157	#### Include a configuration file that can override any one of these settings.
128	158	#
129	159	-include config.w32
130	160
		@@ -170,10 +200,21 @@
170	200	$(SRCDIR)/http_socket.c \
171	201	$(SRCDIR)/http_ssl.c \
172	202	$(SRCDIR)/http_transport.c \
173	203	$(SRCDIR)/import.c \
174	204	$(SRCDIR)/info.c \
	205	+ $(SRCDIR)/json.c \
	206	+ $(SRCDIR)/json_artifact.c \
	207	+ $(SRCDIR)/json_branch.c \
	208	+ $(SRCDIR)/json_diff.c \
	209	+ $(SRCDIR)/json_login.c \
	210	+ $(SRCDIR)/json_query.c \
	211	+ $(SRCDIR)/json_report.c \
	212	+ $(SRCDIR)/json_tag.c \
	213	+ $(SRCDIR)/json_timeline.c \
	214	+ $(SRCDIR)/json_user.c \
	215	+ $(SRCDIR)/json_wiki.c \
175	216	$(SRCDIR)/leaf.c \
176	217	$(SRCDIR)/login.c \
177	218	$(SRCDIR)/main.c \
178	219	$(SRCDIR)/manifest.c \
179	220	$(SRCDIR)/md5.c \
		@@ -213,10 +254,11 @@
213	254	$(SRCDIR)/vfile.c \
214	255	$(SRCDIR)/wiki.c \
215	256	$(SRCDIR)/wikiformat.c \
216	257	$(SRCDIR)/winhttp.c \
217	258	$(SRCDIR)/xfer.c \
	259	+ $(SRCDIR)/xfersetup.c \
218	260	$(SRCDIR)/zip.c
219	261
220	262	TRANS_SRC = \
221	263	$(OBJDIR)/add_.c \
222	264	$(OBJDIR)/allrepo_.c \
		@@ -254,10 +296,21 @@
254	296	$(OBJDIR)/http_socket_.c \
255	297	$(OBJDIR)/http_ssl_.c \
256	298	$(OBJDIR)/http_transport_.c \
257	299	$(OBJDIR)/import_.c \
258	300	$(OBJDIR)/info_.c \
	301	+ $(OBJDIR)/json_.c \
	302	+ $(OBJDIR)/json_artifact_.c \
	303	+ $(OBJDIR)/json_branch_.c \
	304	+ $(OBJDIR)/json_diff_.c \
	305	+ $(OBJDIR)/json_login_.c \
	306	+ $(OBJDIR)/json_query_.c \
	307	+ $(OBJDIR)/json_report_.c \
	308	+ $(OBJDIR)/json_tag_.c \
	309	+ $(OBJDIR)/json_timeline_.c \
	310	+ $(OBJDIR)/json_user_.c \
	311	+ $(OBJDIR)/json_wiki_.c \
259	312	$(OBJDIR)/leaf_.c \
260	313	$(OBJDIR)/login_.c \
261	314	$(OBJDIR)/main_.c \
262	315	$(OBJDIR)/manifest_.c \
263	316	$(OBJDIR)/md5_.c \
		@@ -297,10 +350,11 @@
297	350	$(OBJDIR)/vfile_.c \
298	351	$(OBJDIR)/wiki_.c \
299	352	$(OBJDIR)/wikiformat_.c \
300	353	$(OBJDIR)/winhttp_.c \
301	354	$(OBJDIR)/xfer_.c \
	355	+ $(OBJDIR)/xfersetup_.c \
302	356	$(OBJDIR)/zip_.c
303	357
304	358	OBJ = \
305	359	$(OBJDIR)/add.o \
306	360	$(OBJDIR)/allrepo.o \
		@@ -338,10 +392,21 @@
338	392	$(OBJDIR)/http_socket.o \
339	393	$(OBJDIR)/http_ssl.o \
340	394	$(OBJDIR)/http_transport.o \
341	395	$(OBJDIR)/import.o \
342	396	$(OBJDIR)/info.o \
	397	+ $(OBJDIR)/json.o \
	398	+ $(OBJDIR)/json_artifact.o \
	399	+ $(OBJDIR)/json_branch.o \
	400	+ $(OBJDIR)/json_diff.o \
	401	+ $(OBJDIR)/json_login.o \
	402	+ $(OBJDIR)/json_query.o \
	403	+ $(OBJDIR)/json_report.o \
	404	+ $(OBJDIR)/json_tag.o \
	405	+ $(OBJDIR)/json_timeline.o \
	406	+ $(OBJDIR)/json_user.o \
	407	+ $(OBJDIR)/json_wiki.o \
343	408	$(OBJDIR)/leaf.o \
344	409	$(OBJDIR)/login.o \
345	410	$(OBJDIR)/main.o \
346	411	$(OBJDIR)/manifest.o \
347	412	$(OBJDIR)/md5.o \
		@@ -381,10 +446,11 @@
381	446	$(OBJDIR)/vfile.o \
382	447	$(OBJDIR)/wiki.o \
383	448	$(OBJDIR)/wikiformat.o \
384	449	$(OBJDIR)/winhttp.o \
385	450	$(OBJDIR)/xfer.o \
	451	+ $(OBJDIR)/xfersetup.o \
386	452	$(OBJDIR)/zip.o
387	453
388	454	APPNAME = fossil.exe
389	455	TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
390	456	MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
		@@ -414,20 +480,20 @@
414	480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
415	481
416	482	$(VERSION): $(SRCDIR)/mkversion.c
417	483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
418	484
419		-# WARNING. DANGER. Running the testsuite modifies the repository the
	485	+# WARNING. DANGER. Running the test suite modifies the repository the
420	486	# build is done from, i.e. the checkout belongs to. Do not sync/push
421	487	# the repository after running the tests.
422	488	test: $(OBJDIR) $(APPNAME)
423	489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
424	490
425	491	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
426	492	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
427	493
428		-EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
	494	+EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
429	495
430	496	ifdef FOSSIL_ENABLE_TCL
431	497	EXTRAOBJ += $(OBJDIR)/th_tcl.o
432	498	endif
433	499
		@@ -438,11 +504,11 @@
438	504	# an executable named "manifest" out of the file named "manifest.c"
439	505	#
440	506	$(SRCDIR)/../manifest:
441	507	# noop
442	508
443		-# Requires msys to be installed in addition to the mingw, for the "rm"
	509	+# Requires MSYS to be installed in addition to the MinGW, for the "rm"
444	510	# command. "del" will not work here because it is not a separate command
445	511	# but a MSDOS-shell builtin.
446	512	#
447	513	clean:
448	514	rm -rf $(OBJDIR) $(APPNAME)
		@@ -452,11 +518,11 @@
452	518
453	519
454	520	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
455	521	$(MKINDEX) $(TRANS_SRC) >$@
456	522	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
457		- $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
	523	+ $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
458	524	echo Done >$(OBJDIR)/headers
459	525
460	526	$(OBJDIR)/headers: Makefile
461	527	Makefile:
462	528	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
		@@ -723,10 +789,87 @@
723	789
724	790	$(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
725	791	$(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
726	792
727	793	info.h: $(OBJDIR)/headers
	794	+$(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
	795	+ $(TRANSLATE) $(SRCDIR)/json.c >$(OBJDIR)/json_.c
	796	+
	797	+$(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
	798	+ $(XTCC) -o $(OBJDIR)/json.o -c $(OBJDIR)/json_.c
	799	+
	800	+json.h: $(OBJDIR)/headers
	801	+$(OBJDIR)/json_artifact_.c: $(SRCDIR)/json_artifact.c $(OBJDIR)/translate
	802	+ $(TRANSLATE) $(SRCDIR)/json_artifact.c >$(OBJDIR)/json_artifact_.c
	803	+
	804	+$(OBJDIR)/json_artifact.o: $(OBJDIR)/json_artifact_.c $(OBJDIR)/json_artifact.h $(SRCDIR)/config.h
	805	+ $(XTCC) -o $(OBJDIR)/json_artifact.o -c $(OBJDIR)/json_artifact_.c
	806	+
	807	+json_artifact.h: $(OBJDIR)/headers
	808	+$(OBJDIR)/json_branch_.c: $(SRCDIR)/json_branch.c $(OBJDIR)/translate
	809	+ $(TRANSLATE) $(SRCDIR)/json_branch.c >$(OBJDIR)/json_branch_.c
	810	+
	811	+$(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
	812	+ $(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
	813	+
	814	+json_branch.h: $(OBJDIR)/headers
	815	+$(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
	816	+ $(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
	817	+
	818	+$(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
	819	+ $(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
	820	+
	821	+json_diff.h: $(OBJDIR)/headers
	822	+$(OBJDIR)/json_login_.c: $(SRCDIR)/json_login.c $(OBJDIR)/translate
	823	+ $(TRANSLATE) $(SRCDIR)/json_login.c >$(OBJDIR)/json_login_.c
	824	+
	825	+$(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
	826	+ $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
	827	+
	828	+json_login.h: $(OBJDIR)/headers
	829	+$(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
	830	+ $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
	831	+
	832	+$(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
	833	+ $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
	834	+
	835	+json_query.h: $(OBJDIR)/headers
	836	+$(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
	837	+ $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
	838	+
	839	+$(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
	840	+ $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
	841	+
	842	+json_report.h: $(OBJDIR)/headers
	843	+$(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
	844	+ $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
	845	+
	846	+$(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
	847	+ $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
	848	+
	849	+json_tag.h: $(OBJDIR)/headers
	850	+$(OBJDIR)/json_timeline_.c: $(SRCDIR)/json_timeline.c $(OBJDIR)/translate
	851	+ $(TRANSLATE) $(SRCDIR)/json_timeline.c >$(OBJDIR)/json_timeline_.c
	852	+
	853	+$(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h
	854	+ $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c
	855	+
	856	+json_timeline.h: $(OBJDIR)/headers
	857	+$(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate
	858	+ $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c
	859	+
	860	+$(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h
	861	+ $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c
	862	+
	863	+json_user.h: $(OBJDIR)/headers
	864	+$(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate
	865	+ $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c
	866	+
	867	+$(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h
	868	+ $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c
	869	+
	870	+json_wiki.h: $(OBJDIR)/headers
728	871	$(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
729	872	$(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
730	873
731	874	$(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
732	875	$(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
		@@ -1024,19 +1167,31 @@
1024	1167
1025	1168	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1026	1169	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1027	1170
1028	1171	xfer.h: $(OBJDIR)/headers
	1172	+$(OBJDIR)/xfersetup_.c: $(SRCDIR)/xfersetup.c $(OBJDIR)/translate
	1173	+ $(TRANSLATE) $(SRCDIR)/xfersetup.c >$(OBJDIR)/xfersetup_.c
	1174	+
	1175	+$(OBJDIR)/xfersetup.o: $(OBJDIR)/xfersetup_.c $(OBJDIR)/xfersetup.h $(SRCDIR)/config.h
	1176	+ $(XTCC) -o $(OBJDIR)/xfersetup.o -c $(OBJDIR)/xfersetup_.c
	1177	+
	1178	+xfersetup.h: $(OBJDIR)/headers
1029	1179	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1030	1180	$(TRANSLATE) $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1031	1181
1032	1182	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1033	1183	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1034	1184
1035	1185	zip.h: $(OBJDIR)/headers
1036	1186	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1037		- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1187	+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
	1188	+
	1189	+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
	1190	+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
	1191	+
	1192	+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1038	1193
1039	1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1040	1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1041	1196
1042	1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1043	1198

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	# This is a makefile for us on windows using mingw.








4	#
5	#### The toplevel directory of the source tree. Fossil can be built
6	# in a directory that is separate from the source tree. Just change
7	# the following to point from the build directory to the src/ folder.
8	#
	@@ -19,34 +27,36 @@
19	#
20	BCC = gcc
21
22	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
23	#
24	FOSSIL_ENABLE_SSL=1
25
26	#### Enable scripting support via Tcl/Tk
27	#
28	FOSSIL_ENABLE_TCL=1
29
30	#### Use the Tcl source directory instead of the install directory?
31	# This is useful when Tcl has been compiled statically with MinGW.
32	#
33	FOSSIL_TCL_SOURCE=1
34
35	#### The directory where the zlib library source code is located.
36	# The recommended usage here is to use the Sysinternals junction tool
37	# to create a hard link between an "zlib-1.x.y" sub-directory of the
38	# Fossil source code directory and the target zlib source directory.
39	#

40	ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
41
42	#### The directory where the OpenSSL library source code is located.
43	# The recommended usage here is to use the Sysinternals junction tool
44	# to create a hard link between an "openssl-1.x" sub-directory of the
45	# Fossil source code directory and the target OpenSSL source directory.
46	#
47	OPENSSLDIR = $(SRCDIR)/../openssl-1.0.0e

48
49	#### Either the directory where the Tcl library is installed or the Tcl
50	# source code directory resides (depending on the value of the macro
51	# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
52	# this directory must have "include" and "lib" sub-directories. If
	@@ -56,30 +66,46 @@
56	# link between a "tcl-8.x" sub-directory of the Fossil source code
57	# directory and the target Tcl directory. This removes the need to
58	# hard-code the necessary paths in this Makefile.
59	#
60	TCLDIR = $(SRCDIR)/../tcl-8.6
















61
62	#### C Compile and options for use in building executables that
63	# will run on the target platform. This is usually the same
64	# as BCC, unless you are cross-compiling. This C compiler builds
65	# the finished binary for fossil. The BCC compiler above is used
66	# for building intermediate code-generator tools.
67	#
68	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZLIBDIR)
69
70	# With HTTPS support
71	ifdef FOSSIL_ENABLE_SSL
72	TCC += -L$(OPENSSLDIR) -I$(OPENSSLDIR)/include
73	endif
74
75	# With Tcl support
76	ifdef FOSSIL_ENABLE_TCL
77	ifdef FOSSIL_TCL_SOURCE
78	TCC += -L$(TCLDIR)/win -I$(TCLDIR)/generic -I$(TCLDIR)/win
79	else
80	TCC += -L$(TCLDIR)/lib -I$(TCLDIR)/include
81	endif
82	endif
83
84	# With HTTPS support
85	ifdef FOSSIL_ENABLE_SSL
	@@ -98,33 +124,37 @@
98	# chroot jail.
99	#
100	LIB = -static
101	LIB += -lmingwex -lz
102
103	# OpenSSL: Add the necessary libaries required.
104	ifdef FOSSIL_ENABLE_SSL
105	LIB += -lssl -lcrypto -lgdi32
106	endif
107
108	# Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
109	ifdef FOSSIL_ENABLE_TCL
110	LIB += -ltcl86
111	endif
112
113	#### These libraries MUST appear in the same order as they do for Tcl
114	# or linking with it will not work (exact reason unknown).
115	#

116	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32



117
118	#### Tcl shell for use in running the fossil testsuite. This is only
119	# used for testing. If you do not run
120	#
121	TCLSH = tclsh
122
123	#### Nullsoft installer makensis location
124	#
125	MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
126
127	#### Include a configuration file that can override any one of these settings.
128	#
129	-include config.w32
130
	@@ -170,10 +200,21 @@
170	$(SRCDIR)/http_socket.c \
171	$(SRCDIR)/http_ssl.c \
172	$(SRCDIR)/http_transport.c \
173	$(SRCDIR)/import.c \
174	$(SRCDIR)/info.c \











175	$(SRCDIR)/leaf.c \
176	$(SRCDIR)/login.c \
177	$(SRCDIR)/main.c \
178	$(SRCDIR)/manifest.c \
179	$(SRCDIR)/md5.c \
	@@ -213,10 +254,11 @@
213	$(SRCDIR)/vfile.c \
214	$(SRCDIR)/wiki.c \
215	$(SRCDIR)/wikiformat.c \
216	$(SRCDIR)/winhttp.c \
217	$(SRCDIR)/xfer.c \

218	$(SRCDIR)/zip.c
219
220	TRANS_SRC = \
221	$(OBJDIR)/add_.c \
222	$(OBJDIR)/allrepo_.c \
	@@ -254,10 +296,21 @@
254	$(OBJDIR)/http_socket_.c \
255	$(OBJDIR)/http_ssl_.c \
256	$(OBJDIR)/http_transport_.c \
257	$(OBJDIR)/import_.c \
258	$(OBJDIR)/info_.c \











259	$(OBJDIR)/leaf_.c \
260	$(OBJDIR)/login_.c \
261	$(OBJDIR)/main_.c \
262	$(OBJDIR)/manifest_.c \
263	$(OBJDIR)/md5_.c \
	@@ -297,10 +350,11 @@
297	$(OBJDIR)/vfile_.c \
298	$(OBJDIR)/wiki_.c \
299	$(OBJDIR)/wikiformat_.c \
300	$(OBJDIR)/winhttp_.c \
301	$(OBJDIR)/xfer_.c \

302	$(OBJDIR)/zip_.c
303
304	OBJ = \
305	$(OBJDIR)/add.o \
306	$(OBJDIR)/allrepo.o \
	@@ -338,10 +392,21 @@
338	$(OBJDIR)/http_socket.o \
339	$(OBJDIR)/http_ssl.o \
340	$(OBJDIR)/http_transport.o \
341	$(OBJDIR)/import.o \
342	$(OBJDIR)/info.o \











343	$(OBJDIR)/leaf.o \
344	$(OBJDIR)/login.o \
345	$(OBJDIR)/main.o \
346	$(OBJDIR)/manifest.o \
347	$(OBJDIR)/md5.o \
	@@ -381,10 +446,11 @@
381	$(OBJDIR)/vfile.o \
382	$(OBJDIR)/wiki.o \
383	$(OBJDIR)/wikiformat.o \
384	$(OBJDIR)/winhttp.o \
385	$(OBJDIR)/xfer.o \

386	$(OBJDIR)/zip.o
387
388	APPNAME = fossil.exe
389	TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
390	MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
	@@ -414,20 +480,20 @@
414	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
415
416	$(VERSION): $(SRCDIR)/mkversion.c
417	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
418
419	# WARNING. DANGER. Running the testsuite modifies the repository the
420	# build is done from, i.e. the checkout belongs to. Do not sync/push
421	# the repository after running the tests.
422	test: $(OBJDIR) $(APPNAME)
423	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
424
425	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
426	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
427
428	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
429
430	ifdef FOSSIL_ENABLE_TCL
431	EXTRAOBJ += $(OBJDIR)/th_tcl.o
432	endif
433
	@@ -438,11 +504,11 @@
438	# an executable named "manifest" out of the file named "manifest.c"
439	#
440	$(SRCDIR)/../manifest:
441	# noop
442
443	# Requires msys to be installed in addition to the mingw, for the "rm"
444	# command. "del" will not work here because it is not a separate command
445	# but a MSDOS-shell builtin.
446	#
447	clean:
448	rm -rf $(OBJDIR) $(APPNAME)
	@@ -452,11 +518,11 @@
452
453
454	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
455	$(MKINDEX) $(TRANS_SRC) >$@
456	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
457	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
458	echo Done >$(OBJDIR)/headers
459
460	$(OBJDIR)/headers: Makefile
461	Makefile:
462	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -723,10 +789,87 @@
723
724	$(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
725	$(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
726
727	info.h: $(OBJDIR)/headers













































































728	$(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
729	$(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
730
731	$(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
732	$(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
	@@ -1024,19 +1167,31 @@
1024
1025	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1026	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1027
1028	xfer.h: $(OBJDIR)/headers







1029	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1030	$(TRANSLATE) $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1031
1032	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1033	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1034
1035	zip.h: $(OBJDIR)/headers
1036	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1037	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o





1038
1039	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1040	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1041
1042	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1043

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	##############################################################################
4	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
5	##############################################################################
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for us on windows using MinGW.
12	#
13	#### The toplevel directory of the source tree. Fossil can be built
14	# in a directory that is separate from the source tree. Just change
15	# the following to point from the build directory to the src/ folder.
16	#
	@@ -19,34 +27,36 @@
27	#
28	BCC = gcc
29
30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
31	#
32	FOSSIL_ENABLE_SSL = 1
33
34	#### Enable scripting support via Tcl/Tk
35	#
36	FOSSIL_ENABLE_TCL = 1
37
38	#### Use the Tcl source directory instead of the install directory?
39	# This is useful when Tcl has been compiled statically with MinGW.
40	#
41	FOSSIL_TCL_SOURCE = 1
42
43	#### The directories where the zlib include and library files are located.
44	# The recommended usage here is to use the Sysinternals junction tool
45	# to create a hard link between an "zlib-1.x.y" sub-directory of the
46	# Fossil source code directory and the target zlib source directory.
47	#
48	ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49	ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
50
51	#### The directories where the OpenSSL include and library files are located.
52	# The recommended usage here is to use the Sysinternals junction tool
53	# to create a hard link between an "openssl-1.x" sub-directory of the
54	# Fossil source code directory and the target OpenSSL source directory.
55	#
56	OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57	OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
58
59	#### Either the directory where the Tcl library is installed or the Tcl
60	# source code directory resides (depending on the value of the macro
61	# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62	# this directory must have "include" and "lib" sub-directories. If
	@@ -56,30 +66,46 @@
66	# link between a "tcl-8.x" sub-directory of the Fossil source code
67	# directory and the target Tcl directory. This removes the need to
68	# hard-code the necessary paths in this Makefile.
69	#
70	TCLDIR = $(SRCDIR)/../tcl-8.6
71
72	#### The Tcl source code directory. This defaults to the same value as
73	# TCLDIR macro (above), which may not be correct. This value will
74	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
75	#
76	TCLSRCDIR = $(TCLDIR)
77
78	#### The Tcl include and library directories. These values will only be
79	# used if the FOSSIL_TCL_SOURCE macro is not defined.
80	#
81	TCLINCDIR = $(TCLDIR)/include
82	TCLLIBDIR = $(TCLDIR)/lib
83
84	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
85	#
86	LIBTCL = -ltcl86
87
88	#### C Compile and options for use in building executables that
89	# will run on the target platform. This is usually the same
90	# as BCC, unless you are cross-compiling. This C compiler builds
91	# the finished binary for fossil. The BCC compiler above is used
92	# for building intermediate code-generator tools.
93	#
94	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
95
96	# With HTTPS support
97	ifdef FOSSIL_ENABLE_SSL
98	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
99	endif
100
101	# With Tcl support
102	ifdef FOSSIL_ENABLE_TCL
103	ifdef FOSSIL_TCL_SOURCE
104	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
105	else
106	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
107	endif
108	endif
109
110	# With HTTPS support
111	ifdef FOSSIL_ENABLE_SSL
	@@ -98,33 +124,37 @@
124	# chroot jail.
125	#
126	LIB = -static
127	LIB += -lmingwex -lz
128
129	# OpenSSL: Add the necessary libaries required, if enabled.
130	ifdef FOSSIL_ENABLE_SSL
131	LIB += -lssl -lcrypto -lgdi32
132	endif
133
134	# Tcl: Add the necessary libaries required, if enabled.
135	ifdef FOSSIL_ENABLE_TCL
136	LIB += $(LIBTCL)
137	endif
138
139	#### These libraries MUST appear in the same order as they do for Tcl
140	# or linking with it will not work (exact reason unknown).
141	#
142	ifdef FOSSIL_ENABLE_TCL
143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
144	else
145	LIB += -lws2_32
146	endif
147
148	#### Tcl shell for use in running the fossil test suite. This is only
149	# used for testing.
150	#
151	TCLSH = tclsh
152
153	#### Nullsoft installer MakeNSIS location
154	#
155	MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
156
157	#### Include a configuration file that can override any one of these settings.
158	#
159	-include config.w32
160
	@@ -170,10 +200,21 @@
200	$(SRCDIR)/http_socket.c \
201	$(SRCDIR)/http_ssl.c \
202	$(SRCDIR)/http_transport.c \
203	$(SRCDIR)/import.c \
204	$(SRCDIR)/info.c \
205	$(SRCDIR)/json.c \
206	$(SRCDIR)/json_artifact.c \
207	$(SRCDIR)/json_branch.c \
208	$(SRCDIR)/json_diff.c \
209	$(SRCDIR)/json_login.c \
210	$(SRCDIR)/json_query.c \
211	$(SRCDIR)/json_report.c \
212	$(SRCDIR)/json_tag.c \
213	$(SRCDIR)/json_timeline.c \
214	$(SRCDIR)/json_user.c \
215	$(SRCDIR)/json_wiki.c \
216	$(SRCDIR)/leaf.c \
217	$(SRCDIR)/login.c \
218	$(SRCDIR)/main.c \
219	$(SRCDIR)/manifest.c \
220	$(SRCDIR)/md5.c \
	@@ -213,10 +254,11 @@
254	$(SRCDIR)/vfile.c \
255	$(SRCDIR)/wiki.c \
256	$(SRCDIR)/wikiformat.c \
257	$(SRCDIR)/winhttp.c \
258	$(SRCDIR)/xfer.c \
259	$(SRCDIR)/xfersetup.c \
260	$(SRCDIR)/zip.c
261
262	TRANS_SRC = \
263	$(OBJDIR)/add_.c \
264	$(OBJDIR)/allrepo_.c \
	@@ -254,10 +296,21 @@
296	$(OBJDIR)/http_socket_.c \
297	$(OBJDIR)/http_ssl_.c \
298	$(OBJDIR)/http_transport_.c \
299	$(OBJDIR)/import_.c \
300	$(OBJDIR)/info_.c \
301	$(OBJDIR)/json_.c \
302	$(OBJDIR)/json_artifact_.c \
303	$(OBJDIR)/json_branch_.c \
304	$(OBJDIR)/json_diff_.c \
305	$(OBJDIR)/json_login_.c \
306	$(OBJDIR)/json_query_.c \
307	$(OBJDIR)/json_report_.c \
308	$(OBJDIR)/json_tag_.c \
309	$(OBJDIR)/json_timeline_.c \
310	$(OBJDIR)/json_user_.c \
311	$(OBJDIR)/json_wiki_.c \
312	$(OBJDIR)/leaf_.c \
313	$(OBJDIR)/login_.c \
314	$(OBJDIR)/main_.c \
315	$(OBJDIR)/manifest_.c \
316	$(OBJDIR)/md5_.c \
	@@ -297,10 +350,11 @@
350	$(OBJDIR)/vfile_.c \
351	$(OBJDIR)/wiki_.c \
352	$(OBJDIR)/wikiformat_.c \
353	$(OBJDIR)/winhttp_.c \
354	$(OBJDIR)/xfer_.c \
355	$(OBJDIR)/xfersetup_.c \
356	$(OBJDIR)/zip_.c
357
358	OBJ = \
359	$(OBJDIR)/add.o \
360	$(OBJDIR)/allrepo.o \
	@@ -338,10 +392,21 @@
392	$(OBJDIR)/http_socket.o \
393	$(OBJDIR)/http_ssl.o \
394	$(OBJDIR)/http_transport.o \
395	$(OBJDIR)/import.o \
396	$(OBJDIR)/info.o \
397	$(OBJDIR)/json.o \
398	$(OBJDIR)/json_artifact.o \
399	$(OBJDIR)/json_branch.o \
400	$(OBJDIR)/json_diff.o \
401	$(OBJDIR)/json_login.o \
402	$(OBJDIR)/json_query.o \
403	$(OBJDIR)/json_report.o \
404	$(OBJDIR)/json_tag.o \
405	$(OBJDIR)/json_timeline.o \
406	$(OBJDIR)/json_user.o \
407	$(OBJDIR)/json_wiki.o \
408	$(OBJDIR)/leaf.o \
409	$(OBJDIR)/login.o \
410	$(OBJDIR)/main.o \
411	$(OBJDIR)/manifest.o \
412	$(OBJDIR)/md5.o \
	@@ -381,10 +446,11 @@
446	$(OBJDIR)/vfile.o \
447	$(OBJDIR)/wiki.o \
448	$(OBJDIR)/wikiformat.o \
449	$(OBJDIR)/winhttp.o \
450	$(OBJDIR)/xfer.o \
451	$(OBJDIR)/xfersetup.o \
452	$(OBJDIR)/zip.o
453
454	APPNAME = fossil.exe
455	TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
456	MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
	@@ -414,20 +480,20 @@
480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
481
482	$(VERSION): $(SRCDIR)/mkversion.c
483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
484
485	# WARNING. DANGER. Running the test suite modifies the repository the
486	# build is done from, i.e. the checkout belongs to. Do not sync/push
487	# the repository after running the tests.
488	test: $(OBJDIR) $(APPNAME)
489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
490
491	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
492	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
493
494	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
495
496	ifdef FOSSIL_ENABLE_TCL
497	EXTRAOBJ += $(OBJDIR)/th_tcl.o
498	endif
499
	@@ -438,11 +504,11 @@
504	# an executable named "manifest" out of the file named "manifest.c"
505	#
506	$(SRCDIR)/../manifest:
507	# noop
508
509	# Requires MSYS to be installed in addition to the MinGW, for the "rm"
510	# command. "del" will not work here because it is not a separate command
511	# but a MSDOS-shell builtin.
512	#
513	clean:
514	rm -rf $(OBJDIR) $(APPNAME)
	@@ -452,11 +518,11 @@
518
519
520	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
521	$(MKINDEX) $(TRANS_SRC) >$@
522	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
523	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
524	echo Done >$(OBJDIR)/headers
525
526	$(OBJDIR)/headers: Makefile
527	Makefile:
528	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -723,10 +789,87 @@
789
790	$(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
791	$(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
792
793	info.h: $(OBJDIR)/headers
794	$(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
795	$(TRANSLATE) $(SRCDIR)/json.c >$(OBJDIR)/json_.c
796
797	$(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
798	$(XTCC) -o $(OBJDIR)/json.o -c $(OBJDIR)/json_.c
799
800	json.h: $(OBJDIR)/headers
801	$(OBJDIR)/json_artifact_.c: $(SRCDIR)/json_artifact.c $(OBJDIR)/translate
802	$(TRANSLATE) $(SRCDIR)/json_artifact.c >$(OBJDIR)/json_artifact_.c
803
804	$(OBJDIR)/json_artifact.o: $(OBJDIR)/json_artifact_.c $(OBJDIR)/json_artifact.h $(SRCDIR)/config.h
805	$(XTCC) -o $(OBJDIR)/json_artifact.o -c $(OBJDIR)/json_artifact_.c
806
807	json_artifact.h: $(OBJDIR)/headers
808	$(OBJDIR)/json_branch_.c: $(SRCDIR)/json_branch.c $(OBJDIR)/translate
809	$(TRANSLATE) $(SRCDIR)/json_branch.c >$(OBJDIR)/json_branch_.c
810
811	$(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
812	$(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
813
814	json_branch.h: $(OBJDIR)/headers
815	$(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
816	$(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
817
818	$(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
819	$(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
820
821	json_diff.h: $(OBJDIR)/headers
822	$(OBJDIR)/json_login_.c: $(SRCDIR)/json_login.c $(OBJDIR)/translate
823	$(TRANSLATE) $(SRCDIR)/json_login.c >$(OBJDIR)/json_login_.c
824
825	$(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
826	$(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
827
828	json_login.h: $(OBJDIR)/headers
829	$(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
830	$(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
831
832	$(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
833	$(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
834
835	json_query.h: $(OBJDIR)/headers
836	$(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
837	$(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
838
839	$(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
840	$(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
841
842	json_report.h: $(OBJDIR)/headers
843	$(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
844	$(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
845
846	$(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
847	$(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
848
849	json_tag.h: $(OBJDIR)/headers
850	$(OBJDIR)/json_timeline_.c: $(SRCDIR)/json_timeline.c $(OBJDIR)/translate
851	$(TRANSLATE) $(SRCDIR)/json_timeline.c >$(OBJDIR)/json_timeline_.c
852
853	$(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h
854	$(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c
855
856	json_timeline.h: $(OBJDIR)/headers
857	$(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate
858	$(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c
859
860	$(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h
861	$(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c
862
863	json_user.h: $(OBJDIR)/headers
864	$(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate
865	$(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c
866
867	$(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h
868	$(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c
869
870	json_wiki.h: $(OBJDIR)/headers
871	$(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
872	$(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
873
874	$(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
875	$(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
	@@ -1024,19 +1167,31 @@
1167
1168	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1169	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1170
1171	xfer.h: $(OBJDIR)/headers
1172	$(OBJDIR)/xfersetup_.c: $(SRCDIR)/xfersetup.c $(OBJDIR)/translate
1173	$(TRANSLATE) $(SRCDIR)/xfersetup.c >$(OBJDIR)/xfersetup_.c
1174
1175	$(OBJDIR)/xfersetup.o: $(OBJDIR)/xfersetup_.c $(OBJDIR)/xfersetup.h $(SRCDIR)/config.h
1176	$(XTCC) -o $(OBJDIR)/xfersetup.o -c $(OBJDIR)/xfersetup_.c
1177
1178	xfersetup.h: $(OBJDIR)/headers
1179	$(OBJDIR)/zip_.c: $(SRCDIR)/zip.c $(OBJDIR)/translate
1180	$(TRANSLATE) $(SRCDIR)/zip.c >$(OBJDIR)/zip_.c
1181
1182	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1183	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1184
1185	zip.h: $(OBJDIR)/headers
1186	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1188
1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1191
1192	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1193
1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1196
1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1198

M win/Makefile.msc

+16 -5

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -1,10 +1,14 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	7	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
	9	+#
6	10	B = ..
7	11	SRCDIR = $B\src
8	12	OBJDIR = .
9	13	OX = .
10	14	O = .obj
		@@ -36,13 +40,13 @@
36	40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
37	41	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
38	42
39	43	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40	44
41		-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
	45	+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
42	46
43		-OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
	47	+OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\xfersetup$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
44	48
45	49
46	50	APPNAME = $(OX)\fossil$(E)
47	51
48	52	all: $(OX) $(APPNAME)
		@@ -146,10 +150,11 @@
146	150	echo $(OX)\vfile.obj >> $@
147	151	echo $(OX)\wiki.obj >> $@
148	152	echo $(OX)\wikiformat.obj >> $@
149	153	echo $(OX)\winhttp.obj >> $@
150	154	echo $(OX)\xfer.obj >> $@
	155	+ echo $(OX)\xfersetup.obj >> $@
151	156	echo $(OX)\zip.obj >> $@
152	157	echo $(LIBS) >> $@
153	158
154	159
155	160
		@@ -759,15 +764,21 @@
759	764	$(OX)\xfer$O : xfer_.c xfer.h
760	765	$(TCC) /Fo$@ -c xfer_.c
761	766
762	767	xfer_.c : $(SRCDIR)\xfer.c
763	768	translate$E $** > $@
	769	+
	770	+$(OX)\xfersetup$O : xfersetup_.c xfersetup.h
	771	+ $(TCC) /Fo$@ -c xfersetup_.c
	772	+
	773	+xfersetup_.c : $(SRCDIR)\xfersetup.c
	774	+ translate$E $** > $@
764	775
765	776	$(OX)\zip$O : zip_.c zip.h
766	777	$(TCC) /Fo$@ -c zip_.c
767	778
768	779	zip_.c : $(SRCDIR)\zip.c
769	780	translate$E $** > $@
770	781
771	782	headers: makeheaders$E page_index.h VERSION.h
772		- makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.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 login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.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 update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
	783	+ makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.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 login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.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 update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
773	784	@copy /Y nul: headers
774	785

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1,10 +1,14 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
5	# to regenerate this file.

6	B = ..
7	SRCDIR = $B\src
8	OBJDIR = .
9	OX = .
10	O = .obj
	@@ -36,13 +40,13 @@
36	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
37	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
38
39	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40
41	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
42
43	OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
44
45
46	APPNAME = $(OX)\fossil$(E)
47
48	all: $(OX) $(APPNAME)
	@@ -146,10 +150,11 @@
146	echo $(OX)\vfile.obj >> $@
147	echo $(OX)\wiki.obj >> $@
148	echo $(OX)\wikiformat.obj >> $@
149	echo $(OX)\winhttp.obj >> $@
150	echo $(OX)\xfer.obj >> $@

151	echo $(OX)\zip.obj >> $@
152	echo $(LIBS) >> $@
153
154
155
	@@ -759,15 +764,21 @@
759	$(OX)\xfer$O : xfer_.c xfer.h
760	$(TCC) /Fo$@ -c xfer_.c
761
762	xfer_.c : $(SRCDIR)\xfer.c
763	translate$E $** > $@






764
765	$(OX)\zip$O : zip_.c zip.h
766	$(TCC) /Fo$@ -c zip_.c
767
768	zip_.c : $(SRCDIR)\zip.c
769	translate$E $** > $@
770
771	headers: makeheaders$E page_index.h VERSION.h
772	makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.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 login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.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 update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
773	@copy /Y nul: headers
774

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1,10 +1,14 @@
1	#
2	##############################################################################
3	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4	##############################################################################
5	#
6	# This file is automatically generated. Instead of editing this
7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8	# to regenerate this file.
9	#
10	B = ..
11	SRCDIR = $B\src
12	OBJDIR = .
13	OX = .
14	O = .obj
	@@ -36,13 +40,13 @@
40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
44
45	SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
46
47	OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\xfersetup$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
48
49
50	APPNAME = $(OX)\fossil$(E)
51
52	all: $(OX) $(APPNAME)
	@@ -146,10 +150,11 @@
150	echo $(OX)\vfile.obj >> $@
151	echo $(OX)\wiki.obj >> $@
152	echo $(OX)\wikiformat.obj >> $@
153	echo $(OX)\winhttp.obj >> $@
154	echo $(OX)\xfer.obj >> $@
155	echo $(OX)\xfersetup.obj >> $@
156	echo $(OX)\zip.obj >> $@
157	echo $(LIBS) >> $@
158
159
160
	@@ -759,15 +764,21 @@
764	$(OX)\xfer$O : xfer_.c xfer.h
765	$(TCC) /Fo$@ -c xfer_.c
766
767	xfer_.c : $(SRCDIR)\xfer.c
768	translate$E $** > $@
769
770	$(OX)\xfersetup$O : xfersetup_.c xfersetup.h
771	$(TCC) /Fo$@ -c xfersetup_.c
772
773	xfersetup_.c : $(SRCDIR)\xfersetup.c
774	translate$E $** > $@
775
776	$(OX)\zip$O : zip_.c zip.h
777	$(TCC) /Fo$@ -c zip_.c
778
779	zip_.c : $(SRCDIR)\zip.c
780	translate$E $** > $@
781
782	headers: makeheaders$E page_index.h VERSION.h
783	makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.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 login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.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 update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
784	@copy /Y nul: headers
785

Fossil SCM

Keyboard Shortcuts