Fossil SCM

Merge latest changes from trunk.

jan 2012-02-19 02:31 jan-buildfixes merge

Commit 0c3af1ecf89b9795b94332b4735778d8836f2b4c

Parent 2ce353f5b0b0ca1…

4 files changed +8 -12 +6 -2 +6 -2 +21 -2

~ src/cson_amalgamation.c ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin

M src/cson_amalgamation.c

+8 -12

		--- src/cson_amalgamation.c
		+++ src/cson_amalgamation.c
		@@ -2200,14 +2200,13 @@
2200	2200	# define VALUE_T_IS_PTR 1
2201	2201	#else
2202	2202	#endif
2203	2203
2204	2204	/**
2205		- Allocates a new value of the specified type ownership of it to the
2206		- caller. It must eventually be destroyed, by the caller or its
2207		- owning container, by passing it to cson_value_free() or transfering
2208		- ownership to a container.
	2205	+ Allocates a new value of the specified type. Ownership is
	2206	+ transfered to the caller, who must eventually free it by passing it
	2207	+ to cson_value_free() or transfering ownership to a container.
2209	2208
2210	2209	extra is only valid for type CSON_TYPE_STRING, and must be the length
2211	2210	of the string to allocate + 1 byte (for the NUL).
2212	2211
2213	2212	The returned value->api member will be set appropriately and
		@@ -2249,10 +2248,15 @@
2249	2248	tx = sizeof(cson_double_t);
2250	2249	reason = "cson_value:double";
2251	2250	break;
2252	2251	case CSON_TYPE_INTEGER:
2253	2252	assert( 0 == extra );
	2253	+ /* FIXME: if sizeof(void*) >= sizeof(cson_int_t) then store
	2254	+ the int value directly in the void pointer (requires no
	2255	+ extra alloc). The current behaviour requires 32
	2256	+ bytes(!!!) on 64-bit builds.
	2257	+ */
2254	2258	def = cson_value_integer_empty;
2255	2259	tx = sizeof(cson_int_t);
2256	2260	reason = "cson_value:int";
2257	2261	break;
2258	2262	case CSON_TYPE_STRING:
		@@ -2281,11 +2285,10 @@
2281	2285	}
2282	2286	}
2283	2287	return v;
2284	2288	}
2285	2289
2286		-
2287	2290	void cson_value_free(cson_value *v)
2288	2291	{
2289	2292	cson_refcount_decr( v );
2290	2293	}
2291	2294
		@@ -2304,15 +2307,10 @@
2304	2307	}
2305	2308	#endif
2306	2309
2307	2310	char cson_value_is_undef( cson_value const * v )
2308	2311	{
2309		- /**
2310		- This special-case impl is needed because the underlying
2311		- (generic) list operations do not know how to populate
2312		- new entries
2313		- */
2314	2312	return ( !v \|\| !v->api \|\| (v->api==&cson_value_api_undef))
2315	2313	? 1 : 0;
2316	2314	}
2317	2315	#define ISA(T,TID) char cson_value_is_##T( cson_value const * v ) { \
2318	2316	/return (v && v->api) ? cson_value_is_a(v,CSON_TYPE_##TID) : 0;/ \
		@@ -5504,11 +5502,10 @@
5504	5502	else
5505	5503	{
5506	5504	cson_value * rootV = NULL;
5507	5505	cson_object * root = NULL;
5508	5506	cson_value * aryV = NULL;
5509		- cson_array * ary = NULL;
5510	5507	cson_value * rowsV = NULL;
5511	5508	cson_array * rows = NULL;
5512	5509	int rc = 0;
5513	5510	int const colCount = sqlite3_column_count(st);
5514	5511	if( colCount <= 0 ) return cson_rc.ArgError;
		@@ -5526,11 +5523,10 @@
5526	5523	{
5527	5524	cson_value_free( aryV );
5528	5525	RETURN(rc);
5529	5526	}
5530	5527	aryV = NULL;
5531		- ary = NULL;
5532	5528	rowsV = cson_value_new_array();
5533	5529	if( ! rowsV ) RETURN(cson_rc.AllocError);
5534	5530	rc = cson_object_set( root, "rows", rowsV );
5535	5531	if( 0 != rc )
5536	5532	{
5537	5533

	--- src/cson_amalgamation.c
	+++ src/cson_amalgamation.c
	@@ -2200,14 +2200,13 @@
2200	# define VALUE_T_IS_PTR 1
2201	#else
2202	#endif
2203
2204	/**
2205	Allocates a new value of the specified type ownership of it to the
2206	caller. It must eventually be destroyed, by the caller or its
2207	owning container, by passing it to cson_value_free() or transfering
2208	ownership to a container.
2209
2210	extra is only valid for type CSON_TYPE_STRING, and must be the length
2211	of the string to allocate + 1 byte (for the NUL).
2212
2213	The returned value->api member will be set appropriately and
	@@ -2249,10 +2248,15 @@
2249	tx = sizeof(cson_double_t);
2250	reason = "cson_value:double";
2251	break;
2252	case CSON_TYPE_INTEGER:
2253	assert( 0 == extra );





2254	def = cson_value_integer_empty;
2255	tx = sizeof(cson_int_t);
2256	reason = "cson_value:int";
2257	break;
2258	case CSON_TYPE_STRING:
	@@ -2281,11 +2285,10 @@
2281	}
2282	}
2283	return v;
2284	}
2285
2286
2287	void cson_value_free(cson_value *v)
2288	{
2289	cson_refcount_decr( v );
2290	}
2291
	@@ -2304,15 +2307,10 @@
2304	}
2305	#endif
2306
2307	char cson_value_is_undef( cson_value const * v )
2308	{
2309	/**
2310	This special-case impl is needed because the underlying
2311	(generic) list operations do not know how to populate
2312	new entries
2313	*/
2314	return ( !v \|\| !v->api \|\| (v->api==&cson_value_api_undef))
2315	? 1 : 0;
2316	}
2317	#define ISA(T,TID) char cson_value_is_##T( cson_value const * v ) { \
2318	/return (v && v->api) ? cson_value_is_a(v,CSON_TYPE_##TID) : 0;/ \
	@@ -5504,11 +5502,10 @@
5504	else
5505	{
5506	cson_value * rootV = NULL;
5507	cson_object * root = NULL;
5508	cson_value * aryV = NULL;
5509	cson_array * ary = NULL;
5510	cson_value * rowsV = NULL;
5511	cson_array * rows = NULL;
5512	int rc = 0;
5513	int const colCount = sqlite3_column_count(st);
5514	if( colCount <= 0 ) return cson_rc.ArgError;
	@@ -5526,11 +5523,10 @@
5526	{
5527	cson_value_free( aryV );
5528	RETURN(rc);
5529	}
5530	aryV = NULL;
5531	ary = NULL;
5532	rowsV = cson_value_new_array();
5533	if( ! rowsV ) RETURN(cson_rc.AllocError);
5534	rc = cson_object_set( root, "rows", rowsV );
5535	if( 0 != rc )
5536	{
5537

	--- src/cson_amalgamation.c
	+++ src/cson_amalgamation.c
	@@ -2200,14 +2200,13 @@
2200	# define VALUE_T_IS_PTR 1
2201	#else
2202	#endif
2203
2204	/**
2205	Allocates a new value of the specified type. Ownership is
2206	transfered to the caller, who must eventually free it by passing it
2207	to cson_value_free() or transfering ownership to a container.

2208
2209	extra is only valid for type CSON_TYPE_STRING, and must be the length
2210	of the string to allocate + 1 byte (for the NUL).
2211
2212	The returned value->api member will be set appropriately and
	@@ -2249,10 +2248,15 @@
2248	tx = sizeof(cson_double_t);
2249	reason = "cson_value:double";
2250	break;
2251	case CSON_TYPE_INTEGER:
2252	assert( 0 == extra );
2253	/* FIXME: if sizeof(void*) >= sizeof(cson_int_t) then store
2254	the int value directly in the void pointer (requires no
2255	extra alloc). The current behaviour requires 32
2256	bytes(!!!) on 64-bit builds.
2257	*/
2258	def = cson_value_integer_empty;
2259	tx = sizeof(cson_int_t);
2260	reason = "cson_value:int";
2261	break;
2262	case CSON_TYPE_STRING:
	@@ -2281,11 +2285,10 @@
2285	}
2286	}
2287	return v;
2288	}
2289

2290	void cson_value_free(cson_value *v)
2291	{
2292	cson_refcount_decr( v );
2293	}
2294
	@@ -2304,15 +2307,10 @@
2307	}
2308	#endif
2309
2310	char cson_value_is_undef( cson_value const * v )
2311	{





2312	return ( !v \|\| !v->api \|\| (v->api==&cson_value_api_undef))
2313	? 1 : 0;
2314	}
2315	#define ISA(T,TID) char cson_value_is_##T( cson_value const * v ) { \
2316	/return (v && v->api) ? cson_value_is_a(v,CSON_TYPE_##TID) : 0;/ \
	@@ -5504,11 +5502,10 @@
5502	else
5503	{
5504	cson_value * rootV = NULL;
5505	cson_object * root = NULL;
5506	cson_value * aryV = NULL;

5507	cson_value * rowsV = NULL;
5508	cson_array * rows = NULL;
5509	int rc = 0;
5510	int const colCount = sqlite3_column_count(st);
5511	if( colCount <= 0 ) return cson_rc.ArgError;
	@@ -5526,11 +5523,10 @@
5523	{
5524	cson_value_free( aryV );
5525	RETURN(rc);
5526	}
5527	aryV = NULL;

5528	rowsV = cson_value_new_array();
5529	if( ! rowsV ) RETURN(cson_rc.AllocError);
5530	rc = cson_object_set( root, "rows", rowsV );
5531	if( 0 != rc )
5532	{
5533

M src/makemake.tcl

+6 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -341,10 +341,14 @@
341	341	# will run on the platform that is doing the build. This is used
342	342	# to compile code-generator programs as part of the build process.
343	343	# See TCC below for the C compiler for building the finished binary.
344	344	#
345	345	BCC = gcc
	346	+
	347	+#### Enable JSON (http://www.json.org) support using "cson"
	348	+#
	349	+# FOSSIL_ENABLE_JSON = 1
346	350
347	351	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
348	352	#
349	353	# FOSSIL_ENABLE_SSL = 1
350	354
		@@ -433,13 +437,13 @@
433	437	# With Tcl support (statically linked)
434	438	ifdef FOSSIL_ENABLE_TCL
435	439	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
436	440	endif
437	441
438		-# With Tcl support (statically linked)
	442	+# With JSON support
439	443	ifdef FOSSIL_ENABLE_JSON
440		-TCC += -DFOSSIL_ENABLE_JSON
	444	+TCC += -DFOSSIL_ENABLE_JSON=1
441	445	endif
442	446
443	447	#### Extra arguments for linking the finished binary. Fossil needs
444	448	# to link against the Z-Lib compression library. There are no
445	449	# other mandatory dependencies. We add the -static option here
446	450

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -341,10 +341,14 @@
341	# will run on the platform that is doing the build. This is used
342	# to compile code-generator programs as part of the build process.
343	# See TCC below for the C compiler for building the finished binary.
344	#
345	BCC = gcc




346
347	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
348	#
349	# FOSSIL_ENABLE_SSL = 1
350
	@@ -433,13 +437,13 @@
433	# With Tcl support (statically linked)
434	ifdef FOSSIL_ENABLE_TCL
435	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
436	endif
437
438	# With Tcl support (statically linked)
439	ifdef FOSSIL_ENABLE_JSON
440	TCC += -DFOSSIL_ENABLE_JSON
441	endif
442
443	#### Extra arguments for linking the finished binary. Fossil needs
444	# to link against the Z-Lib compression library. There are no
445	# other mandatory dependencies. We add the -static option here
446

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -341,10 +341,14 @@
341	# will run on the platform that is doing the build. This is used
342	# to compile code-generator programs as part of the build process.
343	# See TCC below for the C compiler for building the finished binary.
344	#
345	BCC = gcc
346
347	#### Enable JSON (http://www.json.org) support using "cson"
348	#
349	# FOSSIL_ENABLE_JSON = 1
350
351	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
352	#
353	# FOSSIL_ENABLE_SSL = 1
354
	@@ -433,13 +437,13 @@
437	# With Tcl support (statically linked)
438	ifdef FOSSIL_ENABLE_TCL
439	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
440	endif
441
442	# With JSON support
443	ifdef FOSSIL_ENABLE_JSON
444	TCC += -DFOSSIL_ENABLE_JSON=1
445	endif
446
447	#### Extra arguments for linking the finished binary. Fossil needs
448	# to link against the Z-Lib compression library. There are no
449	# other mandatory dependencies. We add the -static option here
450

M win/Makefile.mingw

+6 -2

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -24,10 +24,14 @@
24	24	# will run on the platform that is doing the build. This is used
25	25	# to compile code-generator programs as part of the build process.
26	26	# See TCC below for the C compiler for building the finished binary.
27	27	#
28	28	BCC = gcc
	29	+
	30	+#### Enable JSON (http://www.json.org) support using "cson"
	31	+#
	32	+# FOSSIL_ENABLE_JSON = 1
29	33
30	34	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
31	35	#
32	36	# FOSSIL_ENABLE_SSL = 1
33	37
		@@ -116,13 +120,13 @@
116	120	# With Tcl support (statically linked)
117	121	ifdef FOSSIL_ENABLE_TCL
118	122	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
119	123	endif
120	124
121		-# With Tcl support (statically linked)
	125	+# With JSON support
122	126	ifdef FOSSIL_ENABLE_JSON
123		-TCC += -DFOSSIL_ENABLE_JSON
	127	+TCC += -DFOSSIL_ENABLE_JSON=1
124	128	endif
125	129
126	130	#### Extra arguments for linking the finished binary. Fossil needs
127	131	# to link against the Z-Lib compression library. There are no
128	132	# other mandatory dependencies. We add the -static option here
129	133

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -24,10 +24,14 @@
24	# will run on the platform that is doing the build. This is used
25	# to compile code-generator programs as part of the build process.
26	# See TCC below for the C compiler for building the finished binary.
27	#
28	BCC = gcc




29
30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
31	#
32	# FOSSIL_ENABLE_SSL = 1
33
	@@ -116,13 +120,13 @@
116	# With Tcl support (statically linked)
117	ifdef FOSSIL_ENABLE_TCL
118	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
119	endif
120
121	# With Tcl support (statically linked)
122	ifdef FOSSIL_ENABLE_JSON
123	TCC += -DFOSSIL_ENABLE_JSON
124	endif
125
126	#### Extra arguments for linking the finished binary. Fossil needs
127	# to link against the Z-Lib compression library. There are no
128	# other mandatory dependencies. We add the -static option here
129

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -24,10 +24,14 @@
24	# will run on the platform that is doing the build. This is used
25	# to compile code-generator programs as part of the build process.
26	# See TCC below for the C compiler for building the finished binary.
27	#
28	BCC = gcc
29
30	#### Enable JSON (http://www.json.org) support using "cson"
31	#
32	# FOSSIL_ENABLE_JSON = 1
33
34	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
35	#
36	# FOSSIL_ENABLE_SSL = 1
37
	@@ -116,13 +120,13 @@
120	# With Tcl support (statically linked)
121	ifdef FOSSIL_ENABLE_TCL
122	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
123	endif
124
125	# With JSON support
126	ifdef FOSSIL_ENABLE_JSON
127	TCC += -DFOSSIL_ENABLE_JSON=1
128	endif
129
130	#### Extra arguments for linking the finished binary. Fossil needs
131	# to link against the Z-Lib compression library. There are no
132	# other mandatory dependencies. We add the -static option here
133

M win/Makefile.mingw.mistachkin

+21 -2

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -24,10 +24,14 @@
24	24	# will run on the platform that is doing the build. This is used
25	25	# to compile code-generator programs as part of the build process.
26	26	# See TCC below for the C compiler for building the finished binary.
27	27	#
28	28	BCC = gcc
	29	+
	30	+#### Enable JSON (http://www.json.org) support using "cson"
	31	+#
	32	+FOSSIL_ENABLE_JSON = 1
29	33
30	34	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
31	35	#
32	36	FOSSIL_ENABLE_SSL = 1
33	37
		@@ -115,10 +119,15 @@
115	119
116	120	# With Tcl support (statically linked)
117	121	ifdef FOSSIL_ENABLE_TCL
118	122	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
119	123	endif
	124	+
	125	+# With JSON support
	126	+ifdef FOSSIL_ENABLE_JSON
	127	+TCC += -DFOSSIL_ENABLE_JSON=1
	128	+endif
120	129
121	130	#### Extra arguments for linking the finished binary. Fossil needs
122	131	# to link against the Z-Lib compression library. There are no
123	132	# other mandatory dependencies. We add the -static option here
124	133	# so that we can build a static executable that will run in a
		@@ -204,10 +213,11 @@
204	213	$(SRCDIR)/import.c \
205	214	$(SRCDIR)/info.c \
206	215	$(SRCDIR)/json.c \
207	216	$(SRCDIR)/json_artifact.c \
208	217	$(SRCDIR)/json_branch.c \
	218	+ $(SRCDIR)/json_config.c \
209	219	$(SRCDIR)/json_diff.c \
210	220	$(SRCDIR)/json_login.c \
211	221	$(SRCDIR)/json_query.c \
212	222	$(SRCDIR)/json_report.c \
213	223	$(SRCDIR)/json_tag.c \
		@@ -300,10 +310,11 @@
300	310	$(OBJDIR)/import_.c \
301	311	$(OBJDIR)/info_.c \
302	312	$(OBJDIR)/json_.c \
303	313	$(OBJDIR)/json_artifact_.c \
304	314	$(OBJDIR)/json_branch_.c \
	315	+ $(OBJDIR)/json_config_.c \
305	316	$(OBJDIR)/json_diff_.c \
306	317	$(OBJDIR)/json_login_.c \
307	318	$(OBJDIR)/json_query_.c \
308	319	$(OBJDIR)/json_report_.c \
309	320	$(OBJDIR)/json_tag_.c \
		@@ -396,10 +407,11 @@
396	407	$(OBJDIR)/import.o \
397	408	$(OBJDIR)/info.o \
398	409	$(OBJDIR)/json.o \
399	410	$(OBJDIR)/json_artifact.o \
400	411	$(OBJDIR)/json_branch.o \
	412	+ $(OBJDIR)/json_config.o \
401	413	$(OBJDIR)/json_diff.o \
402	414	$(OBJDIR)/json_login.o \
403	415	$(OBJDIR)/json_query.o \
404	416	$(OBJDIR)/json_report.o \
405	417	$(OBJDIR)/json_tag.o \
		@@ -519,11 +531,11 @@
519	531
520	532
521	533	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
522	534	$(MKINDEX) $(TRANS_SRC) >$@
523	535	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
524		- $(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
	536	+ $(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_config_.c:$(OBJDIR)/json_config.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
525	537	echo Done >$(OBJDIR)/headers
526	538
527	539	$(OBJDIR)/headers: Makefile
528	540	Makefile:
529	541	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
		@@ -811,10 +823,17 @@
811	823
812	824	$(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
813	825	$(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
814	826
815	827	json_branch.h: $(OBJDIR)/headers
	828	+$(OBJDIR)/json_config_.c: $(SRCDIR)/json_config.c $(OBJDIR)/translate
	829	+ $(TRANSLATE) $(SRCDIR)/json_config.c >$(OBJDIR)/json_config_.c
	830	+
	831	+$(OBJDIR)/json_config.o: $(OBJDIR)/json_config_.c $(OBJDIR)/json_config.h $(SRCDIR)/config.h
	832	+ $(XTCC) -o $(OBJDIR)/json_config.o -c $(OBJDIR)/json_config_.c
	833	+
	834	+json_config.h: $(OBJDIR)/headers
816	835	$(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
817	836	$(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
818	837
819	838	$(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
820	839	$(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
		@@ -1188,11 +1207,11 @@
1188	1207	$(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
1189	1208
1190	1209	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1191	1210	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1192	1211
1193		-$(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
	1212	+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.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
1194	1213
1195	1214	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1196	1215	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1197	1216
1198	1217	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1199	1218

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -24,10 +24,14 @@
24	# will run on the platform that is doing the build. This is used
25	# to compile code-generator programs as part of the build process.
26	# See TCC below for the C compiler for building the finished binary.
27	#
28	BCC = gcc




29
30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
31	#
32	FOSSIL_ENABLE_SSL = 1
33
	@@ -115,10 +119,15 @@
115
116	# With Tcl support (statically linked)
117	ifdef FOSSIL_ENABLE_TCL
118	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
119	endif





120
121	#### Extra arguments for linking the finished binary. Fossil needs
122	# to link against the Z-Lib compression library. There are no
123	# other mandatory dependencies. We add the -static option here
124	# so that we can build a static executable that will run in a
	@@ -204,10 +213,11 @@
204	$(SRCDIR)/import.c \
205	$(SRCDIR)/info.c \
206	$(SRCDIR)/json.c \
207	$(SRCDIR)/json_artifact.c \
208	$(SRCDIR)/json_branch.c \

209	$(SRCDIR)/json_diff.c \
210	$(SRCDIR)/json_login.c \
211	$(SRCDIR)/json_query.c \
212	$(SRCDIR)/json_report.c \
213	$(SRCDIR)/json_tag.c \
	@@ -300,10 +310,11 @@
300	$(OBJDIR)/import_.c \
301	$(OBJDIR)/info_.c \
302	$(OBJDIR)/json_.c \
303	$(OBJDIR)/json_artifact_.c \
304	$(OBJDIR)/json_branch_.c \

305	$(OBJDIR)/json_diff_.c \
306	$(OBJDIR)/json_login_.c \
307	$(OBJDIR)/json_query_.c \
308	$(OBJDIR)/json_report_.c \
309	$(OBJDIR)/json_tag_.c \
	@@ -396,10 +407,11 @@
396	$(OBJDIR)/import.o \
397	$(OBJDIR)/info.o \
398	$(OBJDIR)/json.o \
399	$(OBJDIR)/json_artifact.o \
400	$(OBJDIR)/json_branch.o \

401	$(OBJDIR)/json_diff.o \
402	$(OBJDIR)/json_login.o \
403	$(OBJDIR)/json_query.o \
404	$(OBJDIR)/json_report.o \
405	$(OBJDIR)/json_tag.o \
	@@ -519,11 +531,11 @@
519
520
521	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
522	$(MKINDEX) $(TRANS_SRC) >$@
523	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
524	$(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
525	echo Done >$(OBJDIR)/headers
526
527	$(OBJDIR)/headers: Makefile
528	Makefile:
529	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -811,10 +823,17 @@
811
812	$(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
813	$(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
814
815	json_branch.h: $(OBJDIR)/headers







816	$(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
817	$(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
818
819	$(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
820	$(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
	@@ -1188,11 +1207,11 @@
1188	$(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
1189
1190	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1191	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1192
1193	$(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
1194
1195	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1196	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1197
1198	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1199

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -24,10 +24,14 @@
24	# will run on the platform that is doing the build. This is used
25	# to compile code-generator programs as part of the build process.
26	# See TCC below for the C compiler for building the finished binary.
27	#
28	BCC = gcc
29
30	#### Enable JSON (http://www.json.org) support using "cson"
31	#
32	FOSSIL_ENABLE_JSON = 1
33
34	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
35	#
36	FOSSIL_ENABLE_SSL = 1
37
	@@ -115,10 +119,15 @@
119
120	# With Tcl support (statically linked)
121	ifdef FOSSIL_ENABLE_TCL
122	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
123	endif
124
125	# With JSON support
126	ifdef FOSSIL_ENABLE_JSON
127	TCC += -DFOSSIL_ENABLE_JSON=1
128	endif
129
130	#### Extra arguments for linking the finished binary. Fossil needs
131	# to link against the Z-Lib compression library. There are no
132	# other mandatory dependencies. We add the -static option here
133	# so that we can build a static executable that will run in a
	@@ -204,10 +213,11 @@
213	$(SRCDIR)/import.c \
214	$(SRCDIR)/info.c \
215	$(SRCDIR)/json.c \
216	$(SRCDIR)/json_artifact.c \
217	$(SRCDIR)/json_branch.c \
218	$(SRCDIR)/json_config.c \
219	$(SRCDIR)/json_diff.c \
220	$(SRCDIR)/json_login.c \
221	$(SRCDIR)/json_query.c \
222	$(SRCDIR)/json_report.c \
223	$(SRCDIR)/json_tag.c \
	@@ -300,10 +310,11 @@
310	$(OBJDIR)/import_.c \
311	$(OBJDIR)/info_.c \
312	$(OBJDIR)/json_.c \
313	$(OBJDIR)/json_artifact_.c \
314	$(OBJDIR)/json_branch_.c \
315	$(OBJDIR)/json_config_.c \
316	$(OBJDIR)/json_diff_.c \
317	$(OBJDIR)/json_login_.c \
318	$(OBJDIR)/json_query_.c \
319	$(OBJDIR)/json_report_.c \
320	$(OBJDIR)/json_tag_.c \
	@@ -396,10 +407,11 @@
407	$(OBJDIR)/import.o \
408	$(OBJDIR)/info.o \
409	$(OBJDIR)/json.o \
410	$(OBJDIR)/json_artifact.o \
411	$(OBJDIR)/json_branch.o \
412	$(OBJDIR)/json_config.o \
413	$(OBJDIR)/json_diff.o \
414	$(OBJDIR)/json_login.o \
415	$(OBJDIR)/json_query.o \
416	$(OBJDIR)/json_report.o \
417	$(OBJDIR)/json_tag.o \
	@@ -519,11 +531,11 @@
531
532
533	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
534	$(MKINDEX) $(TRANS_SRC) >$@
535	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
536	$(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_config_.c:$(OBJDIR)/json_config.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
537	echo Done >$(OBJDIR)/headers
538
539	$(OBJDIR)/headers: Makefile
540	Makefile:
541	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -811,10 +823,17 @@
823
824	$(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
825	$(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
826
827	json_branch.h: $(OBJDIR)/headers
828	$(OBJDIR)/json_config_.c: $(SRCDIR)/json_config.c $(OBJDIR)/translate
829	$(TRANSLATE) $(SRCDIR)/json_config.c >$(OBJDIR)/json_config_.c
830
831	$(OBJDIR)/json_config.o: $(OBJDIR)/json_config_.c $(OBJDIR)/json_config.h $(SRCDIR)/config.h
832	$(XTCC) -o $(OBJDIR)/json_config.o -c $(OBJDIR)/json_config_.c
833
834	json_config.h: $(OBJDIR)/headers
835	$(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
836	$(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
837
838	$(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
839	$(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
	@@ -1188,11 +1207,11 @@
1207	$(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
1208
1209	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1210	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1211
1212	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.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
1213
1214	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1215	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1216
1217	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1218

Fossil SCM

Keyboard Shortcuts