7d4f06dec04… — Fossil SCM

M src/info.c

+3 -3

		--- src/info.c
		+++ src/info.c
		@@ -2204,12 +2204,12 @@
2204	2204	** chgcbn/chgbn: Handle change of (checkbox for) branch name in
2205	2205	** remaining of form.
2206	2206	*/
2207	2207	@ <script>
2208	2208	@ function chgcbn(checked, branch){
2209		- @ val = gebi('brname').value;
2210		- @ if( !val \|\| !checked) val = branch;
	2209	+ @ val = gebi('brname').value.trim();
	2210	+ @ if( !val \|\| !checked ) val = branch;
2211	2211	@ cidbrid = document.getElementById('cbranch');
2212	2212	@ if( cidbrid ) cidbrid.textContent = val;
2213	2213	@ }
2214	2214	@ function chgbn(val, branch){
2215	2215	@ if( !val ) val = branch;
		@@ -2348,11 +2348,11 @@
2348	2348	@ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2349	2349	@ onchange="chgcbn(this.checked,'%h(zBranchName)')" />
2350	2350	@ Make this check-in the start of a new branch named:</label>
2351	2351	@ <input id="brname" type="text" style="width:15;" name="brname"
2352	2352	@ value="%h(zNewBranch)"
2353		- @ onkeyup="chgbn(this.value,'%h(zBranchName)')" /></td></tr>
	2353	+ @ onkeyup="chgbn(this.value.trim(),'%h(zBranchName)')" /></td></tr>
2354	2354	if( !fHasClosed ){
2355	2355	if( is_a_leaf(rid) ){
2356	2356	@ <tr><th align="right" valign="top">Leaf Closure:</th>
2357	2357	@ <td valign="top">
2358	2358	@ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2359	2359

	--- src/info.c
	+++ src/info.c
	@@ -2204,12 +2204,12 @@
2204	** chgcbn/chgbn: Handle change of (checkbox for) branch name in
2205	** remaining of form.
2206	*/
2207	@ <script>
2208	@ function chgcbn(checked, branch){
2209	@ val = gebi('brname').value;
2210	@ if( !val \|\| !checked) val = branch;
2211	@ cidbrid = document.getElementById('cbranch');
2212	@ if( cidbrid ) cidbrid.textContent = val;
2213	@ }
2214	@ function chgbn(val, branch){
2215	@ if( !val ) val = branch;
	@@ -2348,11 +2348,11 @@
2348	@ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2349	@ onchange="chgcbn(this.checked,'%h(zBranchName)')" />
2350	@ Make this check-in the start of a new branch named:</label>
2351	@ <input id="brname" type="text" style="width:15;" name="brname"
2352	@ value="%h(zNewBranch)"
2353	@ onkeyup="chgbn(this.value,'%h(zBranchName)')" /></td></tr>
2354	if( !fHasClosed ){
2355	if( is_a_leaf(rid) ){
2356	@ <tr><th align="right" valign="top">Leaf Closure:</th>
2357	@ <td valign="top">
2358	@ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2359

	--- src/info.c
	+++ src/info.c
	@@ -2204,12 +2204,12 @@
2204	** chgcbn/chgbn: Handle change of (checkbox for) branch name in
2205	** remaining of form.
2206	*/
2207	@ <script>
2208	@ function chgcbn(checked, branch){
2209	@ val = gebi('brname').value.trim();
2210	@ if( !val \|\| !checked ) val = branch;
2211	@ cidbrid = document.getElementById('cbranch');
2212	@ if( cidbrid ) cidbrid.textContent = val;
2213	@ }
2214	@ function chgbn(val, branch){
2215	@ if( !val ) val = branch;
	@@ -2348,11 +2348,11 @@
2348	@ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2349	@ onchange="chgcbn(this.checked,'%h(zBranchName)')" />
2350	@ Make this check-in the start of a new branch named:</label>
2351	@ <input id="brname" type="text" style="width:15;" name="brname"
2352	@ value="%h(zNewBranch)"
2353	@ onkeyup="chgbn(this.value.trim(),'%h(zBranchName)')" /></td></tr>
2354	if( !fHasClosed ){
2355	if( is_a_leaf(rid) ){
2356	@ <tr><th align="right" valign="top">Leaf Closure:</th>
2357	@ <td valign="top">
2358	@ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2359

M src/main.mk

+4 -4

		--- src/main.mk
		+++ src/main.mk
		@@ -376,17 +376,17 @@
376	376
377	377	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
378	378	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379	379
380	380	# Setup the options used to compile the included SQLite library.
381		-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
	381	+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
	382	+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
	383	+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
382	384	-DSQLITE_THREADSAFE=0 \
383	385	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
384	386	-DSQLITE_OMIT_DEPRECATED \
385		- -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
386		- -Dlocaltime=fossil_localtime \
387		- -DSQLITE_ENABLE_LOCKING_STYLE=0
	387	+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS
388	388
389	389	# Setup the options used to compile the included SQLite shell.
390	390	SHELL_OPTIONS = -Dmain=sqlite3_shell \
391	391	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
392	392	-Dsqlite3_strglob=strglob
393	393

	--- src/main.mk
	+++ src/main.mk
	@@ -376,17 +376,17 @@
376
377	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
378	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379
380	# Setup the options used to compile the included SQLite library.
381	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \


382	-DSQLITE_THREADSAFE=0 \
383	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
384	-DSQLITE_OMIT_DEPRECATED \
385	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
386	-Dlocaltime=fossil_localtime \
387	-DSQLITE_ENABLE_LOCKING_STYLE=0
388
389	# Setup the options used to compile the included SQLite shell.
390	SHELL_OPTIONS = -Dmain=sqlite3_shell \
391	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
392	-Dsqlite3_strglob=strglob
393

	--- src/main.mk
	+++ src/main.mk
	@@ -376,17 +376,17 @@
376
377	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
378	$(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379
380	# Setup the options used to compile the included SQLite library.
381	SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
382	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
383	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
384	-DSQLITE_THREADSAFE=0 \
385	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
386	-DSQLITE_OMIT_DEPRECATED \
387	-DSQLITE_ENABLE_EXPLAIN_COMMENTS


388
389	# Setup the options used to compile the included SQLite shell.
390	SHELL_OPTIONS = -Dmain=sqlite3_shell \
391	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
392	-Dsqlite3_strglob=strglob
393

M src/makemake.tcl

+8 -4

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -129,17 +129,17 @@
129	129	}
130	130
131	131	# Options used to compile the included SQLite library.
132	132	#
133	133	set SQLITE_OPTIONS {
	134	+ -Dlocaltime=fossil_localtime
134	135	-DSQLITE_OMIT_LOAD_EXTENSION=1
	136	+ -DSQLITE_ENABLE_LOCKING_STYLE=0
135	137	-DSQLITE_THREADSAFE=0
136	138	-DSQLITE_DEFAULT_FILE_FORMAT=4
137	139	-DSQLITE_OMIT_DEPRECATED
138	140	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
139		- -Dlocaltime=fossil_localtime
140		- -DSQLITE_ENABLE_LOCKING_STYLE=0
141	141	}
142	142	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143	143	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144	144	#lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
145	145	#lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
		@@ -1007,10 +1007,11 @@
1007	1007	SRCDIR = $B\src
1008	1008	OBJDIR = .
1009	1009	OX = .
1010	1010	O = .obj
1011	1011	E = .exe
	1012	+P = .pdb
1012	1013
1013	1014	# Uncomment to enable debug symbols
1014	1015	# DEBUG = 1
1015	1016
1016	1017	# Uncomment to enable JSON API
		@@ -1035,11 +1036,11 @@
1035	1036	!ifdef FOSSIL_ENABLE_SSL
1036	1037	INCL = $(INCL) -I$(SSLINCDIR)
1037	1038	!endif
1038	1039
1039	1040	CFLAGS = -nologo -MT -O2
1040		-LDFLAGS = /NODEFAULTLIB:msvcrt
	1041	+LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1041	1042
1042	1043	!ifdef DEBUG
1043	1044	CFLAGS = $(CFLAGS) -Zi
1044	1045	LDFLAGS = $(LDFLAGS) /DEBUG
1045	1046	!endif
		@@ -1092,10 +1093,11 @@
1092	1093	}
1093	1094	writeln " \\"
1094	1095	writeln -nonewline " \$(OX)\\fossil.res\n"
1095	1096	writeln {
1096	1097	APPNAME = $(OX)\fossil$(E)
	1098	+PDBNAME = $(OX)\fossil$(P)
1097	1099
1098	1100	all: $(OX) $(APPNAME)
1099	1101
1100	1102	zlib:
1101	1103	@echo Building zlib from "$(ZLIBDIR)"...
		@@ -1154,16 +1156,18 @@
1154	1156	-del $(OX)\*.obj
1155	1157	-del *.obj
1156	1158	-del *_.c
1157	1159	-del *.h
1158	1160	-del *.map
	1161	+ -del *.res
1159	1162	-del headers
1160	1163	-del linkopts
1161		- -del *.res
	1164	+ -del vc*.pdb
1162	1165
1163	1166	realclean: clean
1164	1167	-del $(APPNAME)
	1168	+ -del $(PDBNAME)
1165	1169	-del translate$E
1166	1170	-del mkindex$E
1167	1171	-del makeheaders$E
1168	1172	-del mkversion$E
1169	1173
1170	1174

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -129,17 +129,17 @@
129	}
130
131	# Options used to compile the included SQLite library.
132	#
133	set SQLITE_OPTIONS {

134	-DSQLITE_OMIT_LOAD_EXTENSION=1

135	-DSQLITE_THREADSAFE=0
136	-DSQLITE_DEFAULT_FILE_FORMAT=4
137	-DSQLITE_OMIT_DEPRECATED
138	-DSQLITE_ENABLE_EXPLAIN_COMMENTS
139	-Dlocaltime=fossil_localtime
140	-DSQLITE_ENABLE_LOCKING_STYLE=0
141	}
142	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144	#lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
145	#lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
	@@ -1007,10 +1007,11 @@
1007	SRCDIR = $B\src
1008	OBJDIR = .
1009	OX = .
1010	O = .obj
1011	E = .exe

1012
1013	# Uncomment to enable debug symbols
1014	# DEBUG = 1
1015
1016	# Uncomment to enable JSON API
	@@ -1035,11 +1036,11 @@
1035	!ifdef FOSSIL_ENABLE_SSL
1036	INCL = $(INCL) -I$(SSLINCDIR)
1037	!endif
1038
1039	CFLAGS = -nologo -MT -O2
1040	LDFLAGS = /NODEFAULTLIB:msvcrt
1041
1042	!ifdef DEBUG
1043	CFLAGS = $(CFLAGS) -Zi
1044	LDFLAGS = $(LDFLAGS) /DEBUG
1045	!endif
	@@ -1092,10 +1093,11 @@
1092	}
1093	writeln " \\"
1094	writeln -nonewline " \$(OX)\\fossil.res\n"
1095	writeln {
1096	APPNAME = $(OX)\fossil$(E)

1097
1098	all: $(OX) $(APPNAME)
1099
1100	zlib:
1101	@echo Building zlib from "$(ZLIBDIR)"...
	@@ -1154,16 +1156,18 @@
1154	-del $(OX)\*.obj
1155	-del *.obj
1156	-del *_.c
1157	-del *.h
1158	-del *.map

1159	-del headers
1160	-del linkopts
1161	-del *.res
1162
1163	realclean: clean
1164	-del $(APPNAME)

1165	-del translate$E
1166	-del mkindex$E
1167	-del makeheaders$E
1168	-del mkversion$E
1169
1170

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -129,17 +129,17 @@
129	}
130
131	# Options used to compile the included SQLite library.
132	#
133	set SQLITE_OPTIONS {
134	-Dlocaltime=fossil_localtime
135	-DSQLITE_OMIT_LOAD_EXTENSION=1
136	-DSQLITE_ENABLE_LOCKING_STYLE=0
137	-DSQLITE_THREADSAFE=0
138	-DSQLITE_DEFAULT_FILE_FORMAT=4
139	-DSQLITE_OMIT_DEPRECATED
140	-DSQLITE_ENABLE_EXPLAIN_COMMENTS


141	}
142	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1
143	#lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4
144	#lappend SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
145	#lappend SQLITE_OPTIONS -DSQLITE_WINNT_MAX_PATH_CHARS=4096
	@@ -1007,10 +1007,11 @@
1007	SRCDIR = $B\src
1008	OBJDIR = .
1009	OX = .
1010	O = .obj
1011	E = .exe
1012	P = .pdb
1013
1014	# Uncomment to enable debug symbols
1015	# DEBUG = 1
1016
1017	# Uncomment to enable JSON API
	@@ -1035,11 +1036,11 @@
1036	!ifdef FOSSIL_ENABLE_SSL
1037	INCL = $(INCL) -I$(SSLINCDIR)
1038	!endif
1039
1040	CFLAGS = -nologo -MT -O2
1041	LDFLAGS = /NODEFAULTLIB:msvcrt /MANIFEST:NO
1042
1043	!ifdef DEBUG
1044	CFLAGS = $(CFLAGS) -Zi
1045	LDFLAGS = $(LDFLAGS) /DEBUG
1046	!endif
	@@ -1092,10 +1093,11 @@
1093	}
1094	writeln " \\"
1095	writeln -nonewline " \$(OX)\\fossil.res\n"
1096	writeln {
1097	APPNAME = $(OX)\fossil$(E)
1098	PDBNAME = $(OX)\fossil$(P)
1099
1100	all: $(OX) $(APPNAME)
1101
1102	zlib:
1103	@echo Building zlib from "$(ZLIBDIR)"...
	@@ -1154,16 +1156,18 @@
1156	-del $(OX)\*.obj
1157	-del *.obj
1158	-del *_.c
1159	-del *.h
1160	-del *.map
1161	-del *.res
1162	-del headers
1163	-del linkopts
1164	-del vc*.pdb
1165
1166	realclean: clean
1167	-del $(APPNAME)
1168	-del $(PDBNAME)
1169	-del translate$E
1170	-del mkindex$E
1171	-del makeheaders$E
1172	-del mkversion$E
1173
1174

M win/Makefile.PellesCGMake

+1 -1

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -83,11 +83,11 @@
83	83
84	84	# define the sqlite files, which need special flags on compile
85	85	SQLITESRC=sqlite3.c
86	86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88		-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
	88	+SQLITEDEFINES=-Dlocaltime=fossil_localtime -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
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	94

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -83,11 +83,11 @@
83
84	# define the sqlite files, which need special flags on compile
85	SQLITESRC=sqlite3.c
86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88	SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
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

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -83,11 +83,11 @@
83
84	# define the sqlite files, which need special flags on compile
85	SQLITESRC=sqlite3.c
86	ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87	SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88	SQLITEDEFINES=-Dlocaltime=fossil_localtime -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
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

M win/Makefile.dmc

+1 -1

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -24,11 +24,11 @@
24	24	CFLAGS = -o
25	25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28	28
29		-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
	29	+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime -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	31	SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -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

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,11 +24,11 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
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_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
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

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,11 +24,11 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	SQLITE_OPTIONS = -Dlocaltime=fossil_localtime -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

M win/Makefile.mingw

+3 -3

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1698,17 +1698,17 @@
1698	1698	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699	1699	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700	1700
1701	1701	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1702	1702
1703		-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
	1703	+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
	1704	+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
	1705	+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1704	1706	-DSQLITE_THREADSAFE=0 \
1705	1707	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1706	1708	-DSQLITE_OMIT_DEPRECATED \
1707	1709	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708		- -Dlocaltime=fossil_localtime \
1709		- -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1710	1710	-D_HAVE_SQLITE_CONFIG_H \
1711	1711	-DSQLITE_USE_MALLOC_H \
1712	1712	-DSQLITE_USE_MSIZE
1713	1713
1714	1714	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715	1715

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1698,17 +1698,17 @@
1698	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700
1701	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1702
1703	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \


1704	-DSQLITE_THREADSAFE=0 \
1705	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1706	-DSQLITE_OMIT_DEPRECATED \
1707	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708	-Dlocaltime=fossil_localtime \
1709	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1710	-D_HAVE_SQLITE_CONFIG_H \
1711	-DSQLITE_USE_MALLOC_H \
1712	-DSQLITE_USE_MSIZE
1713
1714	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1698,17 +1698,17 @@
1698	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700
1701	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1702
1703	SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
1704	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1706	-DSQLITE_THREADSAFE=0 \
1707	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1708	-DSQLITE_OMIT_DEPRECATED \
1709	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \


1710	-D_HAVE_SQLITE_CONFIG_H \
1711	-DSQLITE_USE_MALLOC_H \
1712	-DSQLITE_USE_MSIZE
1713
1714	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715

M win/Makefile.mingw.mistachkin

+3 -3

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1698,17 +1698,17 @@
1698	1698	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699	1699	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700	1700
1701	1701	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1702	1702
1703		-SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
	1703	+SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
	1704	+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
	1705	+ -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1704	1706	-DSQLITE_THREADSAFE=0 \
1705	1707	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1706	1708	-DSQLITE_OMIT_DEPRECATED \
1707	1709	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708		- -Dlocaltime=fossil_localtime \
1709		- -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1710	1710	-D_HAVE_SQLITE_CONFIG_H \
1711	1711	-DSQLITE_USE_MALLOC_H \
1712	1712	-DSQLITE_USE_MSIZE
1713	1713
1714	1714	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715	1715

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1698,17 +1698,17 @@
1698	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700
1701	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1702
1703	SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \


1704	-DSQLITE_THREADSAFE=0 \
1705	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1706	-DSQLITE_OMIT_DEPRECATED \
1707	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1708	-Dlocaltime=fossil_localtime \
1709	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1710	-D_HAVE_SQLITE_CONFIG_H \
1711	-DSQLITE_USE_MALLOC_H \
1712	-DSQLITE_USE_MSIZE
1713
1714	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1698,17 +1698,17 @@
1698	$(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1699	$(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1700
1701	$(OBJDIR)/zip.h: $(OBJDIR)/headers
1702
1703	SQLITE_OPTIONS = -Dlocaltime=fossil_localtime \
1704	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
1705	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
1706	-DSQLITE_THREADSAFE=0 \
1707	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
1708	-DSQLITE_OMIT_DEPRECATED \
1709	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \


1710	-D_HAVE_SQLITE_CONFIG_H \
1711	-DSQLITE_USE_MALLOC_H \
1712	-DSQLITE_USE_MSIZE
1713
1714	SHELL_OPTIONS = -Dmain=sqlite3_shell \
1715

M win/Makefile.msc

+9 -5

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -11,10 +11,11 @@
11	11	SRCDIR = $B\src
12	12	OBJDIR = .
13	13	OX = .
14	14	O = .obj
15	15	E = .exe
	16	+P = .pdb
16	17
17	18	# Uncomment to enable debug symbols
18	19	# DEBUG = 1
19	20
20	21	# Uncomment to enable JSON API
		@@ -64,17 +65,17 @@
64	65	RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
65	66	LIBS = $(LIBS) $(SSLLIB)
66	67	LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
67	68	!endif
68	69
69		-SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
	70	+SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
	71	+ /DSQLITE_OMIT_LOAD_EXTENSION=1 \
	72	+ /DSQLITE_ENABLE_LOCKING_STYLE=0 \
70	73	/DSQLITE_THREADSAFE=0 \
71	74	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
72	75	/DSQLITE_OMIT_DEPRECATED \
73		- /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
74		- /Dlocaltime=fossil_localtime \
75		- /DSQLITE_ENABLE_LOCKING_STYLE=0
	76	+ /DSQLITE_ENABLE_EXPLAIN_COMMENTS
76	77
77	78	SHELL_OPTIONS = /Dmain=sqlite3_shell \
78	79	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
79	80	/Dsqlite3_strglob=strglob \
80	81	/Dgetenv=fossil_getenv \
		@@ -303,10 +304,11 @@
303	304	$(OX)\xfersetup$O \
304	305	$(OX)\zip$O \
305	306	$(OX)\fossil.res
306	307
307	308	APPNAME = $(OX)\fossil$(E)
	309	+PDBNAME = $(OX)\fossil$(P)
308	310
309	311	all: $(OX) $(APPNAME)
310	312
311	313	zlib:
312	314	@echo Building zlib from "$(ZLIBDIR)"...
		@@ -474,16 +476,18 @@
474	476	-del $(OX)\*.obj
475	477	-del *.obj
476	478	-del *_.c
477	479	-del *.h
478	480	-del *.map
	481	+ -del *.res
479	482	-del headers
480	483	-del linkopts
481		- -del *.res
	484	+ -del vc*.pdb
482	485
483	486	realclean: clean
484	487	-del $(APPNAME)
	488	+ -del $(PDBNAME)
485	489	-del translate$E
486	490	-del mkindex$E
487	491	-del makeheaders$E
488	492	-del mkversion$E
489	493
490	494

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -11,10 +11,11 @@
11	SRCDIR = $B\src
12	OBJDIR = .
13	OX = .
14	O = .obj
15	E = .exe

16
17	# Uncomment to enable debug symbols
18	# DEBUG = 1
19
20	# Uncomment to enable JSON API
	@@ -64,17 +65,17 @@
64	RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
65	LIBS = $(LIBS) $(SSLLIB)
66	LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
67	!endif
68
69	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \


70	/DSQLITE_THREADSAFE=0 \
71	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
72	/DSQLITE_OMIT_DEPRECATED \
73	/DSQLITE_ENABLE_EXPLAIN_COMMENTS \
74	/Dlocaltime=fossil_localtime \
75	/DSQLITE_ENABLE_LOCKING_STYLE=0
76
77	SHELL_OPTIONS = /Dmain=sqlite3_shell \
78	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
79	/Dsqlite3_strglob=strglob \
80	/Dgetenv=fossil_getenv \
	@@ -303,10 +304,11 @@
303	$(OX)\xfersetup$O \
304	$(OX)\zip$O \
305	$(OX)\fossil.res
306
307	APPNAME = $(OX)\fossil$(E)

308
309	all: $(OX) $(APPNAME)
310
311	zlib:
312	@echo Building zlib from "$(ZLIBDIR)"...
	@@ -474,16 +476,18 @@
474	-del $(OX)\*.obj
475	-del *.obj
476	-del *_.c
477	-del *.h
478	-del *.map

479	-del headers
480	-del linkopts
481	-del *.res
482
483	realclean: clean
484	-del $(APPNAME)

485	-del translate$E
486	-del mkindex$E
487	-del makeheaders$E
488	-del mkversion$E
489
490

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -11,10 +11,11 @@
11	SRCDIR = $B\src
12	OBJDIR = .
13	OX = .
14	O = .obj
15	E = .exe
16	P = .pdb
17
18	# Uncomment to enable debug symbols
19	# DEBUG = 1
20
21	# Uncomment to enable JSON API
	@@ -64,17 +65,17 @@
65	RCC = $(RCC) -DFOSSIL_ENABLE_SSL=1
66	LIBS = $(LIBS) $(SSLLIB)
67	LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
68	!endif
69
70	SQLITE_OPTIONS = /Dlocaltime=fossil_localtime \
71	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
72	/DSQLITE_ENABLE_LOCKING_STYLE=0 \
73	/DSQLITE_THREADSAFE=0 \
74	/DSQLITE_DEFAULT_FILE_FORMAT=4 \
75	/DSQLITE_OMIT_DEPRECATED \
76	/DSQLITE_ENABLE_EXPLAIN_COMMENTS


77
78	SHELL_OPTIONS = /Dmain=sqlite3_shell \
79	/DSQLITE_OMIT_LOAD_EXTENSION=1 \
80	/Dsqlite3_strglob=strglob \
81	/Dgetenv=fossil_getenv \
	@@ -303,10 +304,11 @@
304	$(OX)\xfersetup$O \
305	$(OX)\zip$O \
306	$(OX)\fossil.res
307
308	APPNAME = $(OX)\fossil$(E)
309	PDBNAME = $(OX)\fossil$(P)
310
311	all: $(OX) $(APPNAME)
312
313	zlib:
314	@echo Building zlib from "$(ZLIBDIR)"...
	@@ -474,16 +476,18 @@
476	-del $(OX)\*.obj
477	-del *.obj
478	-del *_.c
479	-del *.h
480	-del *.map
481	-del *.res
482	-del headers
483	-del linkopts
484	-del vc*.pdb
485
486	realclean: clean
487	-del $(APPNAME)
488	-del $(PDBNAME)
489	-del translate$E
490	-del mkindex$E
491	-del makeheaders$E
492	-del mkversion$E
493
494

M www/makefile.wiki

-1

		--- www/makefile.wiki
		+++ www/makefile.wiki
		@@ -208,11 +208,10 @@
208	208	* -Dlocaltime=fossil_localtime
209	209	* -DSQLITE_OMIT_LOAD_EXTENSION=1
210	210	* -DSQLITE_ENABLE_LOCKING_STYLE=0
211	211	* -DSQLITE_THREADSAFE=0
212	212	* -DSQLITE_DEFAULT_FILE_FORMAT=4
213		- * -DSQLITE_ENABLE_STAT3
214	213
215	214	The first and second symbol definitions above are required; the others
216	215	are merely recommended. The "localtime()" library function in SQLite must
217	216	be redefined to invoke fossil_localtime() instead. The fossil_localtime()
218	217	routine will invoke either gmtime() or localtime() depending on the
219	218

	--- www/makefile.wiki
	+++ www/makefile.wiki
	@@ -208,11 +208,10 @@
208	* -Dlocaltime=fossil_localtime
209	* -DSQLITE_OMIT_LOAD_EXTENSION=1
210	* -DSQLITE_ENABLE_LOCKING_STYLE=0
211	* -DSQLITE_THREADSAFE=0
212	* -DSQLITE_DEFAULT_FILE_FORMAT=4
213	* -DSQLITE_ENABLE_STAT3
214
215	The first and second symbol definitions above are required; the others
216	are merely recommended. The "localtime()" library function in SQLite must
217	be redefined to invoke fossil_localtime() instead. The fossil_localtime()
218	routine will invoke either gmtime() or localtime() depending on the
219

	--- www/makefile.wiki
	+++ www/makefile.wiki
	@@ -208,11 +208,10 @@
208	* -Dlocaltime=fossil_localtime
209	* -DSQLITE_OMIT_LOAD_EXTENSION=1
210	* -DSQLITE_ENABLE_LOCKING_STYLE=0
211	* -DSQLITE_THREADSAFE=0
212	* -DSQLITE_DEFAULT_FILE_FORMAT=4

213
214	The first and second symbol definitions above are required; the others
215	are merely recommended. The "localtime()" library function in SQLite must
216	be redefined to invoke fossil_localtime() instead. The fossil_localtime()
217	routine will invoke either gmtime() or localtime() depending on the
218

Fossil SCM

Keyboard Shortcuts