81c185f6859… — Fossil SCM

M src/browse.c

+3 -2

		--- src/browse.c
		+++ src/browse.c
		@@ -656,18 +656,19 @@
656	656	@
657	657	@ var outer_ul = document.querySelector('.filetree > ul');
658	658	@ var subdir = outer_ul.querySelector('.subdir');
659	659	@ outer_ul.onclick = function( e ){
660	660	@ var a = e.target;
661		- @ if( a.nodeName!='A' ) return;
	661	+ @ if( a.nodeName!='A' ) return true;
662	662	@ if( a.parentNode==subdir ){
663	663	@ toggleAll(outer_ul);
664	664	@ return false;
665	665	@ }
666		- @ if( !subdir.contains(a) ) return;
	666	+ @ if( !subdir.contains(a) ) return true;
667	667	@ var ul = a.nextSibling;
668	668	@ while( ul && ul.nodeName!='UL' ) ul = ul.nextSibling;
	669	+ @ if( !ul ) return true; /* This is a file link, not a directory */
669	670	@ ul.style.display = style(ul, 'display')=='none' ? 'block' : 'none';
670	671	@ return false;
671	672	@ }
672	673	@ }())</script>
673	674	style_footer();
674	675

	--- src/browse.c
	+++ src/browse.c
	@@ -656,18 +656,19 @@
656	@
657	@ var outer_ul = document.querySelector('.filetree > ul');
658	@ var subdir = outer_ul.querySelector('.subdir');
659	@ outer_ul.onclick = function( e ){
660	@ var a = e.target;
661	@ if( a.nodeName!='A' ) return;
662	@ if( a.parentNode==subdir ){
663	@ toggleAll(outer_ul);
664	@ return false;
665	@ }
666	@ if( !subdir.contains(a) ) return;
667	@ var ul = a.nextSibling;
668	@ while( ul && ul.nodeName!='UL' ) ul = ul.nextSibling;

669	@ ul.style.display = style(ul, 'display')=='none' ? 'block' : 'none';
670	@ return false;
671	@ }
672	@ }())</script>
673	style_footer();
674

	--- src/browse.c
	+++ src/browse.c
	@@ -656,18 +656,19 @@
656	@
657	@ var outer_ul = document.querySelector('.filetree > ul');
658	@ var subdir = outer_ul.querySelector('.subdir');
659	@ outer_ul.onclick = function( e ){
660	@ var a = e.target;
661	@ if( a.nodeName!='A' ) return true;
662	@ if( a.parentNode==subdir ){
663	@ toggleAll(outer_ul);
664	@ return false;
665	@ }
666	@ if( !subdir.contains(a) ) return true;
667	@ var ul = a.nextSibling;
668	@ while( ul && ul.nodeName!='UL' ) ul = ul.nextSibling;
669	@ if( !ul ) return true; /* This is a file link, not a directory */
670	@ ul.style.display = style(ul, 'display')=='none' ? 'block' : 'none';
671	@ return false;
672	@ }
673	@ }())</script>
674	style_footer();
675

M src/diff.c

+2 -2

		--- src/diff.c
		+++ src/diff.c
		@@ -803,11 +803,11 @@
803	803	p->zStart = zClassChng;
804	804	}
805	805	p->iStart2 = nPrefix + aLCS[1];
806	806	p->iEnd2 = nLeft - nSuffix;
807	807	p->zStart2 = aLCS[3]==nRightDiff ? zClassRm : zClassChng;
808		- sbsSimplifyLine(p, zLeft+nPrefix);
	808	+ sbsSimplifyLine(p, zLeft);
809	809	sbsWriteText(p, pLeft, SBS_TXTA);
810	810	sbsWriteMarker(p, " \| ", "\|");
811	811	sbsWriteLineno(p, lnRight, SBS_LNB);
812	812	p->iStart = nPrefix;
813	813	p->iEnd = nPrefix + aLCS[2];
		@@ -818,11 +818,11 @@
818	818	p->zStart = zClassChng;
819	819	}
820	820	p->iStart2 = nPrefix + aLCS[3];
821	821	p->iEnd2 = nRight - nSuffix;
822	822	p->zStart2 = aLCS[1]==nLeftDiff ? zClassAdd : zClassChng;
823		- sbsSimplifyLine(p, zRight+nPrefix);
	823	+ sbsSimplifyLine(p, zRight);
824	824	sbsWriteText(p, pRight, SBS_TXTB);
825	825	return;
826	826	}
827	827
828	828	/* If all else fails, show a single big change between left and right */
829	829

	--- src/diff.c
	+++ src/diff.c
	@@ -803,11 +803,11 @@
803	p->zStart = zClassChng;
804	}
805	p->iStart2 = nPrefix + aLCS[1];
806	p->iEnd2 = nLeft - nSuffix;
807	p->zStart2 = aLCS[3]==nRightDiff ? zClassRm : zClassChng;
808	sbsSimplifyLine(p, zLeft+nPrefix);
809	sbsWriteText(p, pLeft, SBS_TXTA);
810	sbsWriteMarker(p, " \| ", "\|");
811	sbsWriteLineno(p, lnRight, SBS_LNB);
812	p->iStart = nPrefix;
813	p->iEnd = nPrefix + aLCS[2];
	@@ -818,11 +818,11 @@
818	p->zStart = zClassChng;
819	}
820	p->iStart2 = nPrefix + aLCS[3];
821	p->iEnd2 = nRight - nSuffix;
822	p->zStart2 = aLCS[1]==nLeftDiff ? zClassAdd : zClassChng;
823	sbsSimplifyLine(p, zRight+nPrefix);
824	sbsWriteText(p, pRight, SBS_TXTB);
825	return;
826	}
827
828	/* If all else fails, show a single big change between left and right */
829

	--- src/diff.c
	+++ src/diff.c
	@@ -803,11 +803,11 @@
803	p->zStart = zClassChng;
804	}
805	p->iStart2 = nPrefix + aLCS[1];
806	p->iEnd2 = nLeft - nSuffix;
807	p->zStart2 = aLCS[3]==nRightDiff ? zClassRm : zClassChng;
808	sbsSimplifyLine(p, zLeft);
809	sbsWriteText(p, pLeft, SBS_TXTA);
810	sbsWriteMarker(p, " \| ", "\|");
811	sbsWriteLineno(p, lnRight, SBS_LNB);
812	p->iStart = nPrefix;
813	p->iEnd = nPrefix + aLCS[2];
	@@ -818,11 +818,11 @@
818	p->zStart = zClassChng;
819	}
820	p->iStart2 = nPrefix + aLCS[3];
821	p->iEnd2 = nRight - nSuffix;
822	p->zStart2 = aLCS[1]==nLeftDiff ? zClassAdd : zClassChng;
823	sbsSimplifyLine(p, zRight);
824	sbsWriteText(p, pRight, SBS_TXTB);
825	return;
826	}
827
828	/* If all else fails, show a single big change between left and right */
829

M src/main.mk

+1 -2

		--- src/main.mk
		+++ src/main.mk
		@@ -385,12 +385,11 @@
385	385	-DSQLITE_OMIT_DEPRECATED \
386	386	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
387	387
388	388	# Setup the options used to compile the included SQLite shell.
389	389	SHELL_OPTIONS = -Dmain=sqlite3_shell \
390		- -DSQLITE_OMIT_LOAD_EXTENSION=1 \
391		- -Dsqlite3_strglob=strglob
	390	+ -DSQLITE_OMIT_LOAD_EXTENSION=1
392	391
393	392	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
394	393	# to 1. If it is set to 1, then there is no need to build or link
395	394	# the sqlite3.o object. Instead, the system sqlite will be linked
396	395	# using -lsqlite3.
397	396

	--- src/main.mk
	+++ src/main.mk
	@@ -385,12 +385,11 @@
385	-DSQLITE_OMIT_DEPRECATED \
386	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
387
388	# Setup the options used to compile the included SQLite shell.
389	SHELL_OPTIONS = -Dmain=sqlite3_shell \
390	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
391	-Dsqlite3_strglob=strglob
392
393	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
394	# to 1. If it is set to 1, then there is no need to build or link
395	# the sqlite3.o object. Instead, the system sqlite will be linked
396	# using -lsqlite3.
397

	--- src/main.mk
	+++ src/main.mk
	@@ -385,12 +385,11 @@
385	-DSQLITE_OMIT_DEPRECATED \
386	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
387
388	# Setup the options used to compile the included SQLite shell.
389	SHELL_OPTIONS = -Dmain=sqlite3_shell \
390	-DSQLITE_OMIT_LOAD_EXTENSION=1

391
392	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
393	# to 1. If it is set to 1, then there is no need to build or link
394	# the sqlite3.o object. Instead, the system sqlite will be linked
395	# using -lsqlite3.
396

M src/makemake.tcl

-1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -146,11 +146,10 @@
146	146	# Options used to compile the included SQLite shell.
147	147	#
148	148	set SHELL_OPTIONS {
149	149	-Dmain=sqlite3_shell
150	150	-DSQLITE_OMIT_LOAD_EXTENSION=1
151		- -Dsqlite3_strglob=strglob
152	151	}
153	152
154	153	# Options used to compile the included SQLite shell on Windows.
155	154	#
156	155	set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
157	156

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -146,11 +146,10 @@
146	# Options used to compile the included SQLite shell.
147	#
148	set SHELL_OPTIONS {
149	-Dmain=sqlite3_shell
150	-DSQLITE_OMIT_LOAD_EXTENSION=1
151	-Dsqlite3_strglob=strglob
152	}
153
154	# Options used to compile the included SQLite shell on Windows.
155	#
156	set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
157

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -146,11 +146,10 @@
146	# Options used to compile the included SQLite shell.
147	#
148	set SHELL_OPTIONS {
149	-Dmain=sqlite3_shell
150	-DSQLITE_OMIT_LOAD_EXTENSION=1

151	}
152
153	# Options used to compile the included SQLite shell on Windows.
154	#
155	set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
156

M src/rebuild.c

+1 -1

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -412,11 +412,11 @@
412	412	db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
413	413	rebuild_step_done(rid);
414	414	}
415	415	}
416	416	db_finalize(&s);
417		- manifest_crosslink_end(0);
	417	+ manifest_crosslink_end(MC_NONE);
418	418	rebuild_tag_trunk();
419	419	if( ttyOutput && !g.fQuiet && totalSize>0 ){
420	420	processCnt += incrSize;
421	421	percent_complete((processCnt*1000)/totalSize);
422	422	}
423	423

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -412,11 +412,11 @@
412	db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
413	rebuild_step_done(rid);
414	}
415	}
416	db_finalize(&s);
417	manifest_crosslink_end(0);
418	rebuild_tag_trunk();
419	if( ttyOutput && !g.fQuiet && totalSize>0 ){
420	processCnt += incrSize;
421	percent_complete((processCnt*1000)/totalSize);
422	}
423

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -412,11 +412,11 @@
412	db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
413	rebuild_step_done(rid);
414	}
415	}
416	db_finalize(&s);
417	manifest_crosslink_end(MC_NONE);
418	rebuild_tag_trunk();
419	if( ttyOutput && !g.fQuiet && totalSize>0 ){
420	processCnt += incrSize;
421	percent_complete((processCnt*1000)/totalSize);
422	}
423

M src/rebuild.c

+1 -1

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -412,11 +412,11 @@
412	412	db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
413	413	rebuild_step_done(rid);
414	414	}
415	415	}
416	416	db_finalize(&s);
417		- manifest_crosslink_end(0);
	417	+ manifest_crosslink_end(MC_NONE);
418	418	rebuild_tag_trunk();
419	419	if( ttyOutput && !g.fQuiet && totalSize>0 ){
420	420	processCnt += incrSize;
421	421	percent_complete((processCnt*1000)/totalSize);
422	422	}
423	423

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -412,11 +412,11 @@
412	db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
413	rebuild_step_done(rid);
414	}
415	}
416	db_finalize(&s);
417	manifest_crosslink_end(0);
418	rebuild_tag_trunk();
419	if( ttyOutput && !g.fQuiet && totalSize>0 ){
420	processCnt += incrSize;
421	percent_complete((processCnt*1000)/totalSize);
422	}
423

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -412,11 +412,11 @@
412	db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
413	rebuild_step_done(rid);
414	}
415	}
416	db_finalize(&s);
417	manifest_crosslink_end(MC_NONE);
418	rebuild_tag_trunk();
419	if( ttyOutput && !g.fQuiet && totalSize>0 ){
420	processCnt += incrSize;
421	percent_complete((processCnt*1000)/totalSize);
422	}
423

M src/tar.c

+3 -2

		--- src/tar.c
		+++ src/tar.c
		@@ -336,12 +336,13 @@
336	336	unsigned int mTime /* Modification time */
337	337	){
338	338	int i;
339	339	for(i=nName-1; i>0 && zName[i]!='/'; i--){}
340	340	if( i<=0 ) return;
341		- if( i < tball.nPrevDirAlloc && tball.zPrevDir[i]==0 &&
342		- memcmp(tball.zPrevDir, zName, i)==0 ) return;
	341	+ if( i<tball.nPrevDirAlloc
	342	+ && strncmp(tball.zPrevDir, zName, i)==0
	343	+ && tball.zPrevDir[i]==0 ) return;
343	344	db_multi_exec("INSERT OR IGNORE INTO dir VALUES('%#q')", i, zName);
344	345	if( sqlite3_changes(g.db)==0 ) return;
345	346	tar_add_directory_of(zName, i-1, mTime);
346	347	tar_add_header(zName, i, 0755, mTime, 0, '5');
347	348	if( i >= tball.nPrevDirAlloc ){
348	349

	--- src/tar.c
	+++ src/tar.c
	@@ -336,12 +336,13 @@
336	unsigned int mTime /* Modification time */
337	){
338	int i;
339	for(i=nName-1; i>0 && zName[i]!='/'; i--){}
340	if( i<=0 ) return;
341	if( i < tball.nPrevDirAlloc && tball.zPrevDir[i]==0 &&
342	memcmp(tball.zPrevDir, zName, i)==0 ) return;

343	db_multi_exec("INSERT OR IGNORE INTO dir VALUES('%#q')", i, zName);
344	if( sqlite3_changes(g.db)==0 ) return;
345	tar_add_directory_of(zName, i-1, mTime);
346	tar_add_header(zName, i, 0755, mTime, 0, '5');
347	if( i >= tball.nPrevDirAlloc ){
348

	--- src/tar.c
	+++ src/tar.c
	@@ -336,12 +336,13 @@
336	unsigned int mTime /* Modification time */
337	){
338	int i;
339	for(i=nName-1; i>0 && zName[i]!='/'; i--){}
340	if( i<=0 ) return;
341	if( i<tball.nPrevDirAlloc
342	&& strncmp(tball.zPrevDir, zName, i)==0
343	&& tball.zPrevDir[i]==0 ) return;
344	db_multi_exec("INSERT OR IGNORE INTO dir VALUES('%#q')", i, zName);
345	if( sqlite3_changes(g.db)==0 ) return;
346	tar_add_directory_of(zName, i-1, mTime);
347	tar_add_header(zName, i, 0755, mTime, 0, '5');
348	if( i >= tball.nPrevDirAlloc ){
349

M src/tkt.c

+2 -2

		--- src/tkt.c
		+++ src/tkt.c
		@@ -535,16 +535,16 @@
535	535	}else{
536	536	db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d);", rid);
537	537	db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid);
538	538	}
539	539	manifest_crosslink_begin();
540		- result = (manifest_crosslink(rid, pTicket, 0)==0);
	540	+ result = (manifest_crosslink(rid, pTicket, MC_NONE)==0);
541	541	assert( blob_is_reset(pTicket) );
542	542	if( !result ){
543	543	result = manifest_crosslink_end(MC_PERMIT_HOOKS);
544	544	}else{
545		- manifest_crosslink_end(0);
	545	+ manifest_crosslink_end(MC_NONE);
546	546	}
547	547	return result;
548	548	}
549	549
550	550	/*
551	551

	--- src/tkt.c
	+++ src/tkt.c
	@@ -535,16 +535,16 @@
535	}else{
536	db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d);", rid);
537	db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid);
538	}
539	manifest_crosslink_begin();
540	result = (manifest_crosslink(rid, pTicket, 0)==0);
541	assert( blob_is_reset(pTicket) );
542	if( !result ){
543	result = manifest_crosslink_end(MC_PERMIT_HOOKS);
544	}else{
545	manifest_crosslink_end(0);
546	}
547	return result;
548	}
549
550	/*
551

	--- src/tkt.c
	+++ src/tkt.c
	@@ -535,16 +535,16 @@
535	}else{
536	db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d);", rid);
537	db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid);
538	}
539	manifest_crosslink_begin();
540	result = (manifest_crosslink(rid, pTicket, MC_NONE)==0);
541	assert( blob_is_reset(pTicket) );
542	if( !result ){
543	result = manifest_crosslink_end(MC_PERMIT_HOOKS);
544	}else{
545	manifest_crosslink_end(MC_NONE);
546	}
547	return result;
548	}
549
550	/*
551

M src/tkt.c

+2 -2

		--- src/tkt.c
		+++ src/tkt.c
		@@ -535,16 +535,16 @@
535	535	}else{
536	536	db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d);", rid);
537	537	db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid);
538	538	}
539	539	manifest_crosslink_begin();
540		- result = (manifest_crosslink(rid, pTicket, 0)==0);
	540	+ result = (manifest_crosslink(rid, pTicket, MC_NONE)==0);
541	541	assert( blob_is_reset(pTicket) );
542	542	if( !result ){
543	543	result = manifest_crosslink_end(MC_PERMIT_HOOKS);
544	544	}else{
545		- manifest_crosslink_end(0);
	545	+ manifest_crosslink_end(MC_NONE);
546	546	}
547	547	return result;
548	548	}
549	549
550	550	/*
551	551

	--- src/tkt.c
	+++ src/tkt.c
	@@ -535,16 +535,16 @@
535	}else{
536	db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d);", rid);
537	db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid);
538	}
539	manifest_crosslink_begin();
540	result = (manifest_crosslink(rid, pTicket, 0)==0);
541	assert( blob_is_reset(pTicket) );
542	if( !result ){
543	result = manifest_crosslink_end(MC_PERMIT_HOOKS);
544	}else{
545	manifest_crosslink_end(0);
546	}
547	return result;
548	}
549
550	/*
551

	--- src/tkt.c
	+++ src/tkt.c
	@@ -535,16 +535,16 @@
535	}else{
536	db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d);", rid);
537	db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid);
538	}
539	manifest_crosslink_begin();
540	result = (manifest_crosslink(rid, pTicket, MC_NONE)==0);
541	assert( blob_is_reset(pTicket) );
542	if( !result ){
543	result = manifest_crosslink_end(MC_PERMIT_HOOKS);
544	}else{
545	manifest_crosslink_end(MC_NONE);
546	}
547	return result;
548	}
549
550	/*
551

M test/valgrind-www.tcl

+3 -1

		--- test/valgrind-www.tcl
		+++ test/valgrind-www.tcl
		@@ -12,11 +12,13 @@
12	12	#
13	13	proc run_query {url} {
14	14	set fd [open q.txt w]
15	15	puts $fd "GET $url HTTP/1.0\r\n\r"
16	16	close $fd
17		- return [exec valgrind ./fossil test-http <q.txt 2>@ stderr]
	17	+ set msg {}
	18	+ catch {exec valgrind ./fossil test-http <q.txt 2>@ stderr} msg
	19	+ return $msg
18	20	}
19	21	set todo {}
20	22	foreach url {
21	23	/home
22	24	/timeline
23	25

	--- test/valgrind-www.tcl
	+++ test/valgrind-www.tcl
	@@ -12,11 +12,13 @@
12	#
13	proc run_query {url} {
14	set fd [open q.txt w]
15	puts $fd "GET $url HTTP/1.0\r\n\r"
16	close $fd
17	return [exec valgrind ./fossil test-http <q.txt 2>@ stderr]


18	}
19	set todo {}
20	foreach url {
21	/home
22	/timeline
23

	--- test/valgrind-www.tcl
	+++ test/valgrind-www.tcl
	@@ -12,11 +12,13 @@
12	#
13	proc run_query {url} {
14	set fd [open q.txt w]
15	puts $fd "GET $url HTTP/1.0\r\n\r"
16	close $fd
17	set msg {}
18	catch {exec valgrind ./fossil test-http <q.txt 2>@ stderr} msg
19	return $msg
20	}
21	set todo {}
22	foreach url {
23	/home
24	/timeline
25

M win/Makefile.PellesCGMake

+1 -1

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -89,11 +89,11 @@
89	89
90	90	# define the sqlite shell files, which need special flags on compile
91	91	SQLITESHELLSRC=shell.c
92	92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94		-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
	94	+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
95	95
96	96	# define the th scripting files, which need special flags on compile
97	97	THSRC=th.c th_lang.c
98	98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100	100

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -89,11 +89,11 @@
89
90	# define the sqlite shell files, which need special flags on compile
91	SQLITESHELLSRC=shell.c
92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
95
96	# define the th scripting files, which need special flags on compile
97	THSRC=th.c th_lang.c
98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -89,11 +89,11 @@
89
90	# define the sqlite shell files, which need special flags on compile
91	SQLITESHELLSRC=shell.c
92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
95
96	# define the th scripting files, which need special flags on compile
97	THSRC=th.c th_lang.c
98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100

M win/Makefile.dmc

+1 -1

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -26,11 +26,11 @@
26	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28	28
29	29	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30	30
31		-SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
	31	+SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32	32
33	33	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_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.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 unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34	34
35	35	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_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$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)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36	36
37	37

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -26,11 +26,11 @@
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30
31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33	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_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.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 unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\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_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$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)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -26,11 +26,11 @@
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
30
31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
32
33	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_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.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 unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\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_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$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)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
37

M win/Makefile.mingw

-1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1710,11 +1710,10 @@
1710	1710	-DSQLITE_USE_MALLOC_H \
1711	1711	-DSQLITE_USE_MSIZE
1712	1712
1713	1713	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714	1714	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715		- -Dsqlite3_strglob=strglob \
1716	1715	-Dgetenv=fossil_getenv \
1717	1716	-Dfopen=fossil_fopen
1718	1717
1719	1718	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw
1720	1719	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721	1720

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1710,11 +1710,10 @@
1710	-DSQLITE_USE_MALLOC_H \
1711	-DSQLITE_USE_MSIZE
1712
1713	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715	-Dsqlite3_strglob=strglob \
1716	-Dgetenv=fossil_getenv \
1717	-Dfopen=fossil_fopen
1718
1719	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw
1720	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1710,11 +1710,10 @@
1710	-DSQLITE_USE_MALLOC_H \
1711	-DSQLITE_USE_MSIZE
1712
1713	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714	-DSQLITE_OMIT_LOAD_EXTENSION=1 \

1715	-Dgetenv=fossil_getenv \
1716	-Dfopen=fossil_fopen
1717
1718	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw
1719	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1720

M win/Makefile.mingw.mistachkin

-1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1710,11 +1710,10 @@
1710	1710	-DSQLITE_USE_MALLOC_H \
1711	1711	-DSQLITE_USE_MSIZE
1712	1712
1713	1713	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714	1714	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715		- -Dsqlite3_strglob=strglob \
1716	1715	-Dgetenv=fossil_getenv \
1717	1716	-Dfopen=fossil_fopen
1718	1717
1719	1718	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw.mistachkin
1720	1719	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721	1720

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1710,11 +1710,10 @@
1710	-DSQLITE_USE_MALLOC_H \
1711	-DSQLITE_USE_MSIZE
1712
1713	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1715	-Dsqlite3_strglob=strglob \
1716	-Dgetenv=fossil_getenv \
1717	-Dfopen=fossil_fopen
1718
1719	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw.mistachkin
1720	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1721

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1710,11 +1710,10 @@
1710	-DSQLITE_USE_MALLOC_H \
1711	-DSQLITE_USE_MSIZE
1712
1713	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1714	-DSQLITE_OMIT_LOAD_EXTENSION=1 \

1715	-Dgetenv=fossil_getenv \
1716	-Dfopen=fossil_fopen
1717
1718	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c win/Makefile.mingw.mistachkin
1719	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1720

M win/Makefile.msc

-1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -74,11 +74,10 @@
74	74	/DSQLITE_OMIT_DEPRECATED \
75	75	/DSQLITE_ENABLE_EXPLAIN_COMMENTS
76	76
77	77	SHELL_OPTIONS = /Dmain=sqlite3_shell \
78	78	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
79		- /Dsqlite3_strglob=strglob \
80	79	/Dgetenv=fossil_getenv \
81	80	/Dfopen=fossil_fopen
82	81
83	82	SRC = add_.c \
84	83	allrepo_.c \
85	84

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -74,11 +74,10 @@
74	/DSQLITE_OMIT_DEPRECATED \
75	/DSQLITE_ENABLE_EXPLAIN_COMMENTS
76
77	SHELL_OPTIONS = /Dmain=sqlite3_shell \
78	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
79	/Dsqlite3_strglob=strglob \
80	/Dgetenv=fossil_getenv \
81	/Dfopen=fossil_fopen
82
83	SRC = add_.c \
84	allrepo_.c \
85

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -74,11 +74,10 @@
74	/DSQLITE_OMIT_DEPRECATED \
75	/DSQLITE_ENABLE_EXPLAIN_COMMENTS
76
77	SHELL_OPTIONS = /Dmain=sqlite3_shell \
78	/DSQLITE_OMIT_LOAD_EXTENSION=1 \

79	/Dgetenv=fossil_getenv \
80	/Dfopen=fossil_fopen
81
82	SRC = add_.c \
83	allrepo_.c \
84

M www/build.wiki

+1 -1

		--- www/build.wiki
		+++ www/build.wiki
		@@ -56,11 +56,11 @@
56	56	<h2>Aside: Is it really safe to use an unreleased development version of
57	57	the Fossil source code?</h2>
58	58
59	59	Yes! Any check-in on the
60	60	[/timeline?t=trunk \| trunk branch] of the Fossil
61		-[http://www.sqlite.org/src/timeline \| Fossil self-hosting repository]
	61	+[http://fossil-scm.org/fossil/timeline \| Fossil self-hosting repository]
62	62	will work fine. (Dodgy code is always on a branch.) In the unlikely
63	63	event that you pick a version with a serious bug, it still won't
64	64	clobber your files. Fossil uses several
65	65	[./selfcheck.wiki \| self-checks] prior to committing any
66	66	repository change that prevent loss-of-work due to bugs.
67	67

	--- www/build.wiki
	+++ www/build.wiki
	@@ -56,11 +56,11 @@
56	<h2>Aside: Is it really safe to use an unreleased development version of
57	the Fossil source code?</h2>
58
59	Yes! Any check-in on the
60	[/timeline?t=trunk \| trunk branch] of the Fossil
61	[http://www.sqlite.org/src/timeline \| Fossil self-hosting repository]
62	will work fine. (Dodgy code is always on a branch.) In the unlikely
63	event that you pick a version with a serious bug, it still won't
64	clobber your files. Fossil uses several
65	[./selfcheck.wiki \| self-checks] prior to committing any
66	repository change that prevent loss-of-work due to bugs.
67

	--- www/build.wiki
	+++ www/build.wiki
	@@ -56,11 +56,11 @@
56	<h2>Aside: Is it really safe to use an unreleased development version of
57	the Fossil source code?</h2>
58
59	Yes! Any check-in on the
60	[/timeline?t=trunk \| trunk branch] of the Fossil
61	[http://fossil-scm.org/fossil/timeline \| Fossil self-hosting repository]
62	will work fine. (Dodgy code is always on a branch.) In the unlikely
63	event that you pick a version with a serious bug, it still won't
64	clobber your files. Fossil uses several
65	[./selfcheck.wiki \| self-checks] prior to committing any
66	repository change that prevent loss-of-work due to bugs.
67

M www/makefile.wiki

+4 -1

		--- www/makefile.wiki
		+++ www/makefile.wiki
		@@ -207,15 +207,18 @@
207	207
208	208	* -DSQLITE_OMIT_LOAD_EXTENSION=1
209	209	* -DSQLITE_ENABLE_LOCKING_STYLE=0
210	210	* -DSQLITE_THREADSAFE=0
211	211	* -DSQLITE_DEFAULT_FILE_FORMAT=4
	212	+ * -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
212	213
213	214	The first symbol definition above is required; the others
214	215	are merely recommended. Extension loading is omitted
215	216	as a security measure. Fossil is single-threaded so mutexing is disabled
216		-in SQLite as a performance enhancement.
	217	+in SQLite as a performance enhancement. The SQLITE_ENABLE_EXPLAIN_COMMENTS
	218	+option makes the output of "EXPLAIN" queries in the
	219	+"[/help?cmd=sqlite3\|fossil sql]" command much more readable.
217	220
218	221	When compiling the shell.c source file, these macros are required:
219	222
220	223	* -Dmain=sqlite3_main
221	224	* -DSQLITE_OMIT_LOAD_EXTENSION=1
222	225

	--- www/makefile.wiki
	+++ www/makefile.wiki
	@@ -207,15 +207,18 @@
207
208	* -DSQLITE_OMIT_LOAD_EXTENSION=1
209	* -DSQLITE_ENABLE_LOCKING_STYLE=0
210	* -DSQLITE_THREADSAFE=0
211	* -DSQLITE_DEFAULT_FILE_FORMAT=4

212
213	The first symbol definition above is required; the others
214	are merely recommended. Extension loading is omitted
215	as a security measure. Fossil is single-threaded so mutexing is disabled
216	in SQLite as a performance enhancement.


217
218	When compiling the shell.c source file, these macros are required:
219
220	* -Dmain=sqlite3_main
221	* -DSQLITE_OMIT_LOAD_EXTENSION=1
222

	--- www/makefile.wiki
	+++ www/makefile.wiki
	@@ -207,15 +207,18 @@
207
208	* -DSQLITE_OMIT_LOAD_EXTENSION=1
209	* -DSQLITE_ENABLE_LOCKING_STYLE=0
210	* -DSQLITE_THREADSAFE=0
211	* -DSQLITE_DEFAULT_FILE_FORMAT=4
212	* -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
213
214	The first symbol definition above is required; the others
215	are merely recommended. Extension loading is omitted
216	as a security measure. Fossil is single-threaded so mutexing is disabled
217	in SQLite as a performance enhancement. The SQLITE_ENABLE_EXPLAIN_COMMENTS
218	option makes the output of "EXPLAIN" queries in the
219	"[/help?cmd=sqlite3\|fossil sql]" command much more readable.
220
221	When compiling the shell.c source file, these macros are required:
222
223	* -Dmain=sqlite3_main
224	* -DSQLITE_OMIT_LOAD_EXTENSION=1
225

Fossil SCM

Keyboard Shortcuts