Fossil SCM

Fix the build on unix systems.

drh 2013-12-13 00:49 trunk merge
Commit 268d495d917eade577a52adbfd8605fa375e51da
Parent e474f5f817e401a…
10 files changed +2 -1 +16 -2 +16 -2 +25 -20 +25 -20 +1 -1 +1 -1 +1 -1 +1 -1 +1 -3
~ src/file.c ~ src/main.mk ~ src/main.mk ~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/file.c
+2 -1
--- src/file.c
+++ src/file.c
@@ -420,15 +420,16 @@
420420
 /*
421421
 ** Set the mtime for a file.
422422
 */
423423
 void file_set_mtime(const char *zFilename, i64 newMTime){
424424
 #if !defined(_WIN32)
425
+ char *zMbcs;
425426
 struct timeval tv[2];
426427
 memset(tv, 0, sizeof(tv[0])*2);
427428
 tv[0].tv_sec = newMTime;
428429
 tv[1].tv_sec = newMTime;
429
- char *zMbcs = fossil_utf8_to_filename(zFilename);
430
+ zMbcs = fossil_utf8_to_filename(zFilename);
430431
 utimes(zMbcs, tv);
431432
 #else
432433
 struct _utimbuf tb;
433434
 wchar_t *zMbcs = fossil_utf8_to_filename(zFilename);
434435
 tb.actime = newMTime;
435436
--- src/file.c
+++ src/file.c
@@ -420,15 +420,16 @@
420 /*
421 ** Set the mtime for a file.
422 */
423 void file_set_mtime(const char *zFilename, i64 newMTime){
424 #if !defined(_WIN32)
 
425 struct timeval tv[2];
426 memset(tv, 0, sizeof(tv[0])*2);
427 tv[0].tv_sec = newMTime;
428 tv[1].tv_sec = newMTime;
429 char *zMbcs = fossil_utf8_to_filename(zFilename);
430 utimes(zMbcs, tv);
431 #else
432 struct _utimbuf tb;
433 wchar_t *zMbcs = fossil_utf8_to_filename(zFilename);
434 tb.actime = newMTime;
435
--- src/file.c
+++ src/file.c
@@ -420,15 +420,16 @@
420 /*
421 ** Set the mtime for a file.
422 */
423 void file_set_mtime(const char *zFilename, i64 newMTime){
424 #if !defined(_WIN32)
425 char *zMbcs;
426 struct timeval tv[2];
427 memset(tv, 0, sizeof(tv[0])*2);
428 tv[0].tv_sec = newMTime;
429 tv[1].tv_sec = newMTime;
430 zMbcs = fossil_utf8_to_filename(zFilename);
431 utimes(zMbcs, tv);
432 #else
433 struct _utimbuf tb;
434 wchar_t *zMbcs = fossil_utf8_to_filename(zFilename);
435 tb.actime = newMTime;
436
M src/main.mk
+16 -2
--- src/main.mk
+++ src/main.mk
@@ -371,10 +371,24 @@
371371
 test: $(OBJDIR) $(APPNAME)
372372
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
373373
374374
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375375
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
376
+
377
+# Setup the options used to compile the included SQLite library.
378
+SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
379
+ -DSQLITE_THREADSAFE=0 \
380
+ -DSQLITE_DEFAULT_FILE_FORMAT=4 \
381
+ -DSQLITE_OMIT_DEPRECATED \
382
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
383
+ -Dlocaltime=fossil_localtime \
384
+ -DSQLITE_ENABLE_LOCKING_STYLE=0
385
+
386
+# Setup the options used to compile the included SQLite shell.
387
+SHELL_OPTIONS = -Dmain=sqlite3_shell \
388
+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
389
+ -Dsqlite3_strglob=strglob
376390
377391
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
378392
 # to 1. If it is set to 1, then there is no need to build or link
379393
 # the sqlite3.o object. Instead, the system sqlite will be linked
380394
 # using -lsqlite3.
@@ -1160,14 +1174,14 @@
11601174
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
11611175
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
11621176
11631177
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
11641178
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165
- $(XTCC) -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 $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1179
+ $(XTCC) $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
11661180
11671181
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168
- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1182
+ $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
11691183
11701184
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
11711185
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
11721186
11731187
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
11741188
--- src/main.mk
+++ src/main.mk
@@ -371,10 +371,24 @@
371 test: $(OBJDIR) $(APPNAME)
372 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
373
374 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 
 
 
 
 
 
 
 
 
 
 
 
 
376
377 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
378 # to 1. If it is set to 1, then there is no need to build or link
379 # the sqlite3.o object. Instead, the system sqlite will be linked
380 # using -lsqlite3.
@@ -1160,14 +1174,14 @@
1160 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1164 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165 $(XTCC) -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 $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1171 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1172
1173 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1174
--- src/main.mk
+++ src/main.mk
@@ -371,10 +371,24 @@
371 test: $(OBJDIR) $(APPNAME)
372 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
373
374 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
376
377 # Setup the options used to compile the included SQLite library.
378 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
379 -DSQLITE_THREADSAFE=0 \
380 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
381 -DSQLITE_OMIT_DEPRECATED \
382 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
383 -Dlocaltime=fossil_localtime \
384 -DSQLITE_ENABLE_LOCKING_STYLE=0
385
386 # Setup the options used to compile the included SQLite shell.
387 SHELL_OPTIONS = -Dmain=sqlite3_shell \
388 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
389 -Dsqlite3_strglob=strglob
390
391 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
392 # to 1. If it is set to 1, then there is no need to build or link
393 # the sqlite3.o object. Instead, the system sqlite will be linked
394 # using -lsqlite3.
@@ -1160,14 +1174,14 @@
1174 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1175 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1176
1177 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1178 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1179 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1180
1181 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1182 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1183
1184 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1185 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1186
1187 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1188
M src/main.mk
+16 -2
--- src/main.mk
+++ src/main.mk
@@ -371,10 +371,24 @@
371371
 test: $(OBJDIR) $(APPNAME)
372372
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
373373
374374
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375375
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
376
+
377
+# Setup the options used to compile the included SQLite library.
378
+SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
379
+ -DSQLITE_THREADSAFE=0 \
380
+ -DSQLITE_DEFAULT_FILE_FORMAT=4 \
381
+ -DSQLITE_OMIT_DEPRECATED \
382
+ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
383
+ -Dlocaltime=fossil_localtime \
384
+ -DSQLITE_ENABLE_LOCKING_STYLE=0
385
+
386
+# Setup the options used to compile the included SQLite shell.
387
+SHELL_OPTIONS = -Dmain=sqlite3_shell \
388
+ -DSQLITE_OMIT_LOAD_EXTENSION=1 \
389
+ -Dsqlite3_strglob=strglob
376390
377391
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
378392
 # to 1. If it is set to 1, then there is no need to build or link
379393
 # the sqlite3.o object. Instead, the system sqlite will be linked
380394
 # using -lsqlite3.
@@ -1160,14 +1174,14 @@
11601174
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
11611175
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
11621176
11631177
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
11641178
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165
- $(XTCC) -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 $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1179
+ $(XTCC) $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
11661180
11671181
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168
- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1182
+ $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
11691183
11701184
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
11711185
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
11721186
11731187
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
11741188
--- src/main.mk
+++ src/main.mk
@@ -371,10 +371,24 @@
371 test: $(OBJDIR) $(APPNAME)
372 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
373
374 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 
 
 
 
 
 
 
 
 
 
 
 
 
376
377 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
378 # to 1. If it is set to 1, then there is no need to build or link
379 # the sqlite3.o object. Instead, the system sqlite will be linked
380 # using -lsqlite3.
@@ -1160,14 +1174,14 @@
1160 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1164 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165 $(XTCC) -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 $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1171 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1172
1173 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1174
--- src/main.mk
+++ src/main.mk
@@ -371,10 +371,24 @@
371 test: $(OBJDIR) $(APPNAME)
372 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
373
374 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
376
377 # Setup the options used to compile the included SQLite library.
378 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 \
379 -DSQLITE_THREADSAFE=0 \
380 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
381 -DSQLITE_OMIT_DEPRECATED \
382 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
383 -Dlocaltime=fossil_localtime \
384 -DSQLITE_ENABLE_LOCKING_STYLE=0
385
386 # Setup the options used to compile the included SQLite shell.
387 SHELL_OPTIONS = -Dmain=sqlite3_shell \
388 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
389 -Dsqlite3_strglob=strglob
390
391 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
392 # to 1. If it is set to 1, then there is no need to build or link
393 # the sqlite3.o object. Instead, the system sqlite will be linked
394 # using -lsqlite3.
@@ -1160,14 +1174,14 @@
1174 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1175 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1176
1177 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1178 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1179 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1180
1181 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1182 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1183
1184 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1185 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1186
1187 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1188
M src/makemake.tcl
+25 -20
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,16 @@
148148
 set SHELL_OPTIONS {
149149
 -Dmain=sqlite3_shell
150150
 -DSQLITE_OMIT_LOAD_EXTENSION=1
151151
 -Dsqlite3_strglob=strglob
152152
 }
153
-#lappend SHELL_OPTIONS -Dgetenv=fossil_getenv
154
-#lappend SHELL_OPTIONS -Dfopen=fossil_fopen
153
+
154
+# Options used to compile the included SQLite shell on Windows.
155
+#
156
+set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
157
+lappend SHELL_WIN32_OPTIONS -Dgetenv=fossil_getenv
158
+lappend SHELL_WIN32_OPTIONS -Dfopen=fossil_fopen
155159
156160
 # Name of the final application
157161
 #
158162
 set name fossil
159163
@@ -212,11 +216,13 @@
212216
 }
213217
 writeln "\n"
214218
 writeln "APPNAME = $name\$(E)"
215219
 writeln "\n"
216220
217
-writeln {
221
+writeln [string map [list \
222
+ <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
223
+ <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
218224
 all: $(OBJDIR) $(APPNAME)
219225
220226
 install: $(APPNAME)
221227
 mkdir -p $(INSTALLDIR)
222228
 mv $(APPNAME) $(INSTALLDIR)
@@ -244,10 +250,16 @@
244250
245251
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
246252
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
247253
 $(SRCDIR)/../manifest \
248254
 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
255
+
256
+# Setup the options used to compile the included SQLite library.
257
+SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
258
+
259
+# Setup the options used to compile the included SQLite shell.
260
+SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
249261
250262
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
251263
 # to 1. If it is set to 1, then there is no need to build or link
252264
 # the sqlite3.o object. Instead, the system sqlite will be linked
253265
 # using -lsqlite3.
@@ -280,11 +292,11 @@
280292
 # noop
281293
282294
 clean:
283295
 rm -rf $(OBJDIR)/* $(APPNAME)
284296
285
-}
297
+}]
286298
287299
 set mhargs {}
288300
 foreach s [lsort $src] {
289301
 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
290302
 set extra_h($s) {}
@@ -310,14 +322,14 @@
310322
 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
311323
 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
312324
 }
313325
314326
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
315
-writeln "\t\$(XTCC) [join $SQLITE_OPTIONS { }] \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
327
+writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
316328
317329
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
318
-writeln "\t\$(XTCC) [join $SHELL_OPTIONS { }] \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
330
+writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
319331
320332
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
321333
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
322334
323335
 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -787,11 +799,10 @@
787799
 }
788800
789801
790802
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
791803
 set opt [join $SQLITE_OPTIONS { }]
792
-append opt " -DSQLITE_WIN32_NO_ANSI"
793804
 append opt " -D_HAVE_SQLITE_CONFIG_H"
794805
 append opt " -DSQLITE_USE_MALLOC_H"
795806
 append opt " -DSQLITE_USE_MSIZE"
796807
 writeln "\t\$(XTCC) $opt \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
797808
@@ -799,13 +810,11 @@
799810
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
800811
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
801812
 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_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 : \$(SRCDIR)/json_detail.h\n"
802813
803814
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
804
-set opt [join $SHELL_OPTIONS { }]
805
-append opt " -Dgetenv=fossil_getenv"
806
-append opt " -Dfopen=fossil_fopen"
815
+set opt [join $SHELL_WIN32_OPTIONS { }]
807816
 writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
808817
809818
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
810819
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
811820
@@ -855,12 +864,12 @@
855864
 CFLAGS = -o
856865
 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
857866
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
858867
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
859868
 }
860
-writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }] -DSQLITE_WIN32_NO_ANSI\n"
861
-writeln "SHELL_OPTIONS = [join $SHELL_OPTIONS { }] -Dgetenv=fossil_getenv -Dfopen=fossil_fopen\n"
869
+writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }]\n"
870
+writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS { }]\n"
862871
 writeln -nonewline "SRC = "
863872
 foreach s [lsort $src] {
864873
 writeln -nonewline "${s}_.c "
865874
 }
866875
 writeln "\n"
@@ -1049,17 +1058,14 @@
10491058
 LIBS = $(LIBS) $(SSLLIB)
10501059
 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
10511060
 !endif
10521061
 }
10531062
 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1054
-lappend MSC_SQLITE_OPTIONS /DSQLITE_WIN32_NO_ANSI
10551063
 set j " \\\n "
10561064
 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
10571065
1058
-regsub -all {[-]D} [join $SHELL_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1059
-lappend MSC_SHELL_OPTIONS /Dgetenv=fossil_getenv
1060
-lappend MSC_SHELL_OPTIONS /Dfopen=fossil_fopen
1066
+regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
10611067
 set j " \\\n "
10621068
 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
10631069
10641070
 writeln -nonewline "SRC = "
10651071
 set i 0
@@ -1145,11 +1151,10 @@
11451151
 -del $(OX)\*.obj
11461152
 -del *.obj
11471153
 -del *_.c
11481154
 -del *.h
11491155
 -del *.map
1150
- -del *.manifest
11511156
 -del headers
11521157
 -del linkopts
11531158
 -del *.res
11541159
11551160
 realclean: clean
@@ -1215,11 +1220,11 @@
12151220
 set output_file [open ../win/Makefile.PellesCGMake w]
12161221
 fconfigure $output_file -translation binary
12171222
12181223
 writeln [string map [list \
12191224
 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1220
- <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS { }]] {#
1225
+ <<<SHELL_OPTIONS>>> [join $SHELL_WIN32_OPTIONS { }]] {#
12211226
 ##############################################################################
12221227
 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
12231228
 ##############################################################################
12241229
 #
12251230
 # This file is automatically generated. Instead of editing this
@@ -1302,17 +1307,17 @@
13021307
13031308
 # define the sqlite files, which need special flags on compile
13041309
 SQLITESRC=sqlite3.c
13051310
 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
13061311
 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1307
-SQLITEDEFINES=<<<SQLITE_OPTIONS>>> -DSQLITE_WIN32_NO_ANSI
1312
+SQLITEDEFINES=<<<SQLITE_OPTIONS>>>
13081313
13091314
 # define the sqlite shell files, which need special flags on compile
13101315
 SQLITESHELLSRC=shell.c
13111316
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
13121317
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1313
-SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>> -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
1318
+SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>>
13141319
13151320
 # define the th scripting files, which need special flags on compile
13161321
 THSRC=th.c th_lang.c
13171322
 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
13181323
 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
13191324
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,16 @@
148 set SHELL_OPTIONS {
149 -Dmain=sqlite3_shell
150 -DSQLITE_OMIT_LOAD_EXTENSION=1
151 -Dsqlite3_strglob=strglob
152 }
153 #lappend SHELL_OPTIONS -Dgetenv=fossil_getenv
154 #lappend SHELL_OPTIONS -Dfopen=fossil_fopen
 
 
 
 
155
156 # Name of the final application
157 #
158 set name fossil
159
@@ -212,11 +216,13 @@
212 }
213 writeln "\n"
214 writeln "APPNAME = $name\$(E)"
215 writeln "\n"
216
217 writeln {
 
 
218 all: $(OBJDIR) $(APPNAME)
219
220 install: $(APPNAME)
221 mkdir -p $(INSTALLDIR)
222 mv $(APPNAME) $(INSTALLDIR)
@@ -244,10 +250,16 @@
244
245 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
246 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
247 $(SRCDIR)/../manifest \
248 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 
 
 
 
 
249
250 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
251 # to 1. If it is set to 1, then there is no need to build or link
252 # the sqlite3.o object. Instead, the system sqlite will be linked
253 # using -lsqlite3.
@@ -280,11 +292,11 @@
280 # noop
281
282 clean:
283 rm -rf $(OBJDIR)/* $(APPNAME)
284
285 }
286
287 set mhargs {}
288 foreach s [lsort $src] {
289 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
290 set extra_h($s) {}
@@ -310,14 +322,14 @@
310 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
311 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
312 }
313
314 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
315 writeln "\t\$(XTCC) [join $SQLITE_OPTIONS { }] \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
316
317 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
318 writeln "\t\$(XTCC) [join $SHELL_OPTIONS { }] \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
319
320 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
321 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
322
323 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -787,11 +799,10 @@
787 }
788
789
790 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
791 set opt [join $SQLITE_OPTIONS { }]
792 append opt " -DSQLITE_WIN32_NO_ANSI"
793 append opt " -D_HAVE_SQLITE_CONFIG_H"
794 append opt " -DSQLITE_USE_MALLOC_H"
795 append opt " -DSQLITE_USE_MSIZE"
796 writeln "\t\$(XTCC) $opt \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
797
@@ -799,13 +810,11 @@
799 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
800 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
801 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_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 : \$(SRCDIR)/json_detail.h\n"
802
803 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
804 set opt [join $SHELL_OPTIONS { }]
805 append opt " -Dgetenv=fossil_getenv"
806 append opt " -Dfopen=fossil_fopen"
807 writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
808
809 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
810 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
811
@@ -855,12 +864,12 @@
855 CFLAGS = -o
856 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
857 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
858 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
859 }
860 writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }] -DSQLITE_WIN32_NO_ANSI\n"
861 writeln "SHELL_OPTIONS = [join $SHELL_OPTIONS { }] -Dgetenv=fossil_getenv -Dfopen=fossil_fopen\n"
862 writeln -nonewline "SRC = "
863 foreach s [lsort $src] {
864 writeln -nonewline "${s}_.c "
865 }
866 writeln "\n"
@@ -1049,17 +1058,14 @@
1049 LIBS = $(LIBS) $(SSLLIB)
1050 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1051 !endif
1052 }
1053 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1054 lappend MSC_SQLITE_OPTIONS /DSQLITE_WIN32_NO_ANSI
1055 set j " \\\n "
1056 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
1057
1058 regsub -all {[-]D} [join $SHELL_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1059 lappend MSC_SHELL_OPTIONS /Dgetenv=fossil_getenv
1060 lappend MSC_SHELL_OPTIONS /Dfopen=fossil_fopen
1061 set j " \\\n "
1062 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
1063
1064 writeln -nonewline "SRC = "
1065 set i 0
@@ -1145,11 +1151,10 @@
1145 -del $(OX)\*.obj
1146 -del *.obj
1147 -del *_.c
1148 -del *.h
1149 -del *.map
1150 -del *.manifest
1151 -del headers
1152 -del linkopts
1153 -del *.res
1154
1155 realclean: clean
@@ -1215,11 +1220,11 @@
1215 set output_file [open ../win/Makefile.PellesCGMake w]
1216 fconfigure $output_file -translation binary
1217
1218 writeln [string map [list \
1219 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1220 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS { }]] {#
1221 ##############################################################################
1222 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1223 ##############################################################################
1224 #
1225 # This file is automatically generated. Instead of editing this
@@ -1302,17 +1307,17 @@
1302
1303 # define the sqlite files, which need special flags on compile
1304 SQLITESRC=sqlite3.c
1305 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1306 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1307 SQLITEDEFINES=<<<SQLITE_OPTIONS>>> -DSQLITE_WIN32_NO_ANSI
1308
1309 # define the sqlite shell files, which need special flags on compile
1310 SQLITESHELLSRC=shell.c
1311 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1312 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1313 SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>> -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
1314
1315 # define the th scripting files, which need special flags on compile
1316 THSRC=th.c th_lang.c
1317 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1318 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1319
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,16 @@
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 lappend SHELL_WIN32_OPTIONS -Dgetenv=fossil_getenv
158 lappend SHELL_WIN32_OPTIONS -Dfopen=fossil_fopen
159
160 # Name of the final application
161 #
162 set name fossil
163
@@ -212,11 +216,13 @@
216 }
217 writeln "\n"
218 writeln "APPNAME = $name\$(E)"
219 writeln "\n"
220
221 writeln [string map [list \
222 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
223 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
224 all: $(OBJDIR) $(APPNAME)
225
226 install: $(APPNAME)
227 mkdir -p $(INSTALLDIR)
228 mv $(APPNAME) $(INSTALLDIR)
@@ -244,10 +250,16 @@
250
251 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
252 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
253 $(SRCDIR)/../manifest \
254 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
255
256 # Setup the options used to compile the included SQLite library.
257 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
258
259 # Setup the options used to compile the included SQLite shell.
260 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
261
262 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
263 # to 1. If it is set to 1, then there is no need to build or link
264 # the sqlite3.o object. Instead, the system sqlite will be linked
265 # using -lsqlite3.
@@ -280,11 +292,11 @@
292 # noop
293
294 clean:
295 rm -rf $(OBJDIR)/* $(APPNAME)
296
297 }]
298
299 set mhargs {}
300 foreach s [lsort $src] {
301 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
302 set extra_h($s) {}
@@ -310,14 +322,14 @@
322 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
323 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
324 }
325
326 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
327 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
328
329 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
330 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
331
332 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
333 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
334
335 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -787,11 +799,10 @@
799 }
800
801
802 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
803 set opt [join $SQLITE_OPTIONS { }]
 
804 append opt " -D_HAVE_SQLITE_CONFIG_H"
805 append opt " -DSQLITE_USE_MALLOC_H"
806 append opt " -DSQLITE_USE_MSIZE"
807 writeln "\t\$(XTCC) $opt \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
808
@@ -799,13 +810,11 @@
810 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
811 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
812 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_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 : \$(SRCDIR)/json_detail.h\n"
813
814 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
815 set opt [join $SHELL_WIN32_OPTIONS { }]
 
 
816 writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
817
818 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
819 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
820
@@ -855,12 +864,12 @@
864 CFLAGS = -o
865 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
866 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
867 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
868 }
869 writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }]\n"
870 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS { }]\n"
871 writeln -nonewline "SRC = "
872 foreach s [lsort $src] {
873 writeln -nonewline "${s}_.c "
874 }
875 writeln "\n"
@@ -1049,17 +1058,14 @@
1058 LIBS = $(LIBS) $(SSLLIB)
1059 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1060 !endif
1061 }
1062 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
 
1063 set j " \\\n "
1064 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
1065
1066 regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
 
 
1067 set j " \\\n "
1068 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
1069
1070 writeln -nonewline "SRC = "
1071 set i 0
@@ -1145,11 +1151,10 @@
1151 -del $(OX)\*.obj
1152 -del *.obj
1153 -del *_.c
1154 -del *.h
1155 -del *.map
 
1156 -del headers
1157 -del linkopts
1158 -del *.res
1159
1160 realclean: clean
@@ -1215,11 +1220,11 @@
1220 set output_file [open ../win/Makefile.PellesCGMake w]
1221 fconfigure $output_file -translation binary
1222
1223 writeln [string map [list \
1224 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1225 <<<SHELL_OPTIONS>>> [join $SHELL_WIN32_OPTIONS { }]] {#
1226 ##############################################################################
1227 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1228 ##############################################################################
1229 #
1230 # This file is automatically generated. Instead of editing this
@@ -1302,17 +1307,17 @@
1307
1308 # define the sqlite files, which need special flags on compile
1309 SQLITESRC=sqlite3.c
1310 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1311 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1312 SQLITEDEFINES=<<<SQLITE_OPTIONS>>>
1313
1314 # define the sqlite shell files, which need special flags on compile
1315 SQLITESHELLSRC=shell.c
1316 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1317 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1318 SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>>
1319
1320 # define the th scripting files, which need special flags on compile
1321 THSRC=th.c th_lang.c
1322 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1323 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1324
M src/makemake.tcl
+25 -20
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,16 @@
148148
 set SHELL_OPTIONS {
149149
 -Dmain=sqlite3_shell
150150
 -DSQLITE_OMIT_LOAD_EXTENSION=1
151151
 -Dsqlite3_strglob=strglob
152152
 }
153
-#lappend SHELL_OPTIONS -Dgetenv=fossil_getenv
154
-#lappend SHELL_OPTIONS -Dfopen=fossil_fopen
153
+
154
+# Options used to compile the included SQLite shell on Windows.
155
+#
156
+set SHELL_WIN32_OPTIONS $SHELL_OPTIONS
157
+lappend SHELL_WIN32_OPTIONS -Dgetenv=fossil_getenv
158
+lappend SHELL_WIN32_OPTIONS -Dfopen=fossil_fopen
155159
156160
 # Name of the final application
157161
 #
158162
 set name fossil
159163
@@ -212,11 +216,13 @@
212216
 }
213217
 writeln "\n"
214218
 writeln "APPNAME = $name\$(E)"
215219
 writeln "\n"
216220
217
-writeln {
221
+writeln [string map [list \
222
+ <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
223
+ <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
218224
 all: $(OBJDIR) $(APPNAME)
219225
220226
 install: $(APPNAME)
221227
 mkdir -p $(INSTALLDIR)
222228
 mv $(APPNAME) $(INSTALLDIR)
@@ -244,10 +250,16 @@
244250
245251
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
246252
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
247253
 $(SRCDIR)/../manifest \
248254
 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
255
+
256
+# Setup the options used to compile the included SQLite library.
257
+SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
258
+
259
+# Setup the options used to compile the included SQLite shell.
260
+SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
249261
250262
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
251263
 # to 1. If it is set to 1, then there is no need to build or link
252264
 # the sqlite3.o object. Instead, the system sqlite will be linked
253265
 # using -lsqlite3.
@@ -280,11 +292,11 @@
280292
 # noop
281293
282294
 clean:
283295
 rm -rf $(OBJDIR)/* $(APPNAME)
284296
285
-}
297
+}]
286298
287299
 set mhargs {}
288300
 foreach s [lsort $src] {
289301
 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
290302
 set extra_h($s) {}
@@ -310,14 +322,14 @@
310322
 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
311323
 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
312324
 }
313325
314326
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
315
-writeln "\t\$(XTCC) [join $SQLITE_OPTIONS { }] \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
327
+writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
316328
317329
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
318
-writeln "\t\$(XTCC) [join $SHELL_OPTIONS { }] \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
330
+writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
319331
320332
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
321333
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
322334
323335
 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -787,11 +799,10 @@
787799
 }
788800
789801
790802
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
791803
 set opt [join $SQLITE_OPTIONS { }]
792
-append opt " -DSQLITE_WIN32_NO_ANSI"
793804
 append opt " -D_HAVE_SQLITE_CONFIG_H"
794805
 append opt " -DSQLITE_USE_MALLOC_H"
795806
 append opt " -DSQLITE_USE_MSIZE"
796807
 writeln "\t\$(XTCC) $opt \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
797808
@@ -799,13 +810,11 @@
799810
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
800811
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
801812
 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_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 : \$(SRCDIR)/json_detail.h\n"
802813
803814
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
804
-set opt [join $SHELL_OPTIONS { }]
805
-append opt " -Dgetenv=fossil_getenv"
806
-append opt " -Dfopen=fossil_fopen"
815
+set opt [join $SHELL_WIN32_OPTIONS { }]
807816
 writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
808817
809818
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
810819
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
811820
@@ -855,12 +864,12 @@
855864
 CFLAGS = -o
856865
 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
857866
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
858867
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
859868
 }
860
-writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }] -DSQLITE_WIN32_NO_ANSI\n"
861
-writeln "SHELL_OPTIONS = [join $SHELL_OPTIONS { }] -Dgetenv=fossil_getenv -Dfopen=fossil_fopen\n"
869
+writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }]\n"
870
+writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS { }]\n"
862871
 writeln -nonewline "SRC = "
863872
 foreach s [lsort $src] {
864873
 writeln -nonewline "${s}_.c "
865874
 }
866875
 writeln "\n"
@@ -1049,17 +1058,14 @@
10491058
 LIBS = $(LIBS) $(SSLLIB)
10501059
 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
10511060
 !endif
10521061
 }
10531062
 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1054
-lappend MSC_SQLITE_OPTIONS /DSQLITE_WIN32_NO_ANSI
10551063
 set j " \\\n "
10561064
 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
10571065
1058
-regsub -all {[-]D} [join $SHELL_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1059
-lappend MSC_SHELL_OPTIONS /Dgetenv=fossil_getenv
1060
-lappend MSC_SHELL_OPTIONS /Dfopen=fossil_fopen
1066
+regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
10611067
 set j " \\\n "
10621068
 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
10631069
10641070
 writeln -nonewline "SRC = "
10651071
 set i 0
@@ -1145,11 +1151,10 @@
11451151
 -del $(OX)\*.obj
11461152
 -del *.obj
11471153
 -del *_.c
11481154
 -del *.h
11491155
 -del *.map
1150
- -del *.manifest
11511156
 -del headers
11521157
 -del linkopts
11531158
 -del *.res
11541159
11551160
 realclean: clean
@@ -1215,11 +1220,11 @@
12151220
 set output_file [open ../win/Makefile.PellesCGMake w]
12161221
 fconfigure $output_file -translation binary
12171222
12181223
 writeln [string map [list \
12191224
 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1220
- <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS { }]] {#
1225
+ <<<SHELL_OPTIONS>>> [join $SHELL_WIN32_OPTIONS { }]] {#
12211226
 ##############################################################################
12221227
 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
12231228
 ##############################################################################
12241229
 #
12251230
 # This file is automatically generated. Instead of editing this
@@ -1302,17 +1307,17 @@
13021307
13031308
 # define the sqlite files, which need special flags on compile
13041309
 SQLITESRC=sqlite3.c
13051310
 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
13061311
 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1307
-SQLITEDEFINES=<<<SQLITE_OPTIONS>>> -DSQLITE_WIN32_NO_ANSI
1312
+SQLITEDEFINES=<<<SQLITE_OPTIONS>>>
13081313
13091314
 # define the sqlite shell files, which need special flags on compile
13101315
 SQLITESHELLSRC=shell.c
13111316
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
13121317
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1313
-SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>> -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
1318
+SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>>
13141319
13151320
 # define the th scripting files, which need special flags on compile
13161321
 THSRC=th.c th_lang.c
13171322
 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
13181323
 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
13191324
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,16 @@
148 set SHELL_OPTIONS {
149 -Dmain=sqlite3_shell
150 -DSQLITE_OMIT_LOAD_EXTENSION=1
151 -Dsqlite3_strglob=strglob
152 }
153 #lappend SHELL_OPTIONS -Dgetenv=fossil_getenv
154 #lappend SHELL_OPTIONS -Dfopen=fossil_fopen
 
 
 
 
155
156 # Name of the final application
157 #
158 set name fossil
159
@@ -212,11 +216,13 @@
212 }
213 writeln "\n"
214 writeln "APPNAME = $name\$(E)"
215 writeln "\n"
216
217 writeln {
 
 
218 all: $(OBJDIR) $(APPNAME)
219
220 install: $(APPNAME)
221 mkdir -p $(INSTALLDIR)
222 mv $(APPNAME) $(INSTALLDIR)
@@ -244,10 +250,16 @@
244
245 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
246 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
247 $(SRCDIR)/../manifest \
248 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
 
 
 
 
 
 
249
250 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
251 # to 1. If it is set to 1, then there is no need to build or link
252 # the sqlite3.o object. Instead, the system sqlite will be linked
253 # using -lsqlite3.
@@ -280,11 +292,11 @@
280 # noop
281
282 clean:
283 rm -rf $(OBJDIR)/* $(APPNAME)
284
285 }
286
287 set mhargs {}
288 foreach s [lsort $src] {
289 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
290 set extra_h($s) {}
@@ -310,14 +322,14 @@
310 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
311 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
312 }
313
314 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
315 writeln "\t\$(XTCC) [join $SQLITE_OPTIONS { }] \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
316
317 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
318 writeln "\t\$(XTCC) [join $SHELL_OPTIONS { }] \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
319
320 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
321 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
322
323 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -787,11 +799,10 @@
787 }
788
789
790 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
791 set opt [join $SQLITE_OPTIONS { }]
792 append opt " -DSQLITE_WIN32_NO_ANSI"
793 append opt " -D_HAVE_SQLITE_CONFIG_H"
794 append opt " -DSQLITE_USE_MALLOC_H"
795 append opt " -DSQLITE_USE_MSIZE"
796 writeln "\t\$(XTCC) $opt \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
797
@@ -799,13 +810,11 @@
799 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
800 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
801 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_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 : \$(SRCDIR)/json_detail.h\n"
802
803 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
804 set opt [join $SHELL_OPTIONS { }]
805 append opt " -Dgetenv=fossil_getenv"
806 append opt " -Dfopen=fossil_fopen"
807 writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
808
809 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
810 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
811
@@ -855,12 +864,12 @@
855 CFLAGS = -o
856 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
857 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
858 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
859 }
860 writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }] -DSQLITE_WIN32_NO_ANSI\n"
861 writeln "SHELL_OPTIONS = [join $SHELL_OPTIONS { }] -Dgetenv=fossil_getenv -Dfopen=fossil_fopen\n"
862 writeln -nonewline "SRC = "
863 foreach s [lsort $src] {
864 writeln -nonewline "${s}_.c "
865 }
866 writeln "\n"
@@ -1049,17 +1058,14 @@
1049 LIBS = $(LIBS) $(SSLLIB)
1050 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1051 !endif
1052 }
1053 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1054 lappend MSC_SQLITE_OPTIONS /DSQLITE_WIN32_NO_ANSI
1055 set j " \\\n "
1056 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
1057
1058 regsub -all {[-]D} [join $SHELL_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1059 lappend MSC_SHELL_OPTIONS /Dgetenv=fossil_getenv
1060 lappend MSC_SHELL_OPTIONS /Dfopen=fossil_fopen
1061 set j " \\\n "
1062 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
1063
1064 writeln -nonewline "SRC = "
1065 set i 0
@@ -1145,11 +1151,10 @@
1145 -del $(OX)\*.obj
1146 -del *.obj
1147 -del *_.c
1148 -del *.h
1149 -del *.map
1150 -del *.manifest
1151 -del headers
1152 -del linkopts
1153 -del *.res
1154
1155 realclean: clean
@@ -1215,11 +1220,11 @@
1215 set output_file [open ../win/Makefile.PellesCGMake w]
1216 fconfigure $output_file -translation binary
1217
1218 writeln [string map [list \
1219 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1220 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS { }]] {#
1221 ##############################################################################
1222 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1223 ##############################################################################
1224 #
1225 # This file is automatically generated. Instead of editing this
@@ -1302,17 +1307,17 @@
1302
1303 # define the sqlite files, which need special flags on compile
1304 SQLITESRC=sqlite3.c
1305 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1306 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1307 SQLITEDEFINES=<<<SQLITE_OPTIONS>>> -DSQLITE_WIN32_NO_ANSI
1308
1309 # define the sqlite shell files, which need special flags on compile
1310 SQLITESHELLSRC=shell.c
1311 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1312 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1313 SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>> -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
1314
1315 # define the th scripting files, which need special flags on compile
1316 THSRC=th.c th_lang.c
1317 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1318 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1319
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,16 @@
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 lappend SHELL_WIN32_OPTIONS -Dgetenv=fossil_getenv
158 lappend SHELL_WIN32_OPTIONS -Dfopen=fossil_fopen
159
160 # Name of the final application
161 #
162 set name fossil
163
@@ -212,11 +216,13 @@
216 }
217 writeln "\n"
218 writeln "APPNAME = $name\$(E)"
219 writeln "\n"
220
221 writeln [string map [list \
222 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
223 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
224 all: $(OBJDIR) $(APPNAME)
225
226 install: $(APPNAME)
227 mkdir -p $(INSTALLDIR)
228 mv $(APPNAME) $(INSTALLDIR)
@@ -244,10 +250,16 @@
250
251 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
252 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
253 $(SRCDIR)/../manifest \
254 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
255
256 # Setup the options used to compile the included SQLite library.
257 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
258
259 # Setup the options used to compile the included SQLite shell.
260 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
261
262 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
263 # to 1. If it is set to 1, then there is no need to build or link
264 # the sqlite3.o object. Instead, the system sqlite will be linked
265 # using -lsqlite3.
@@ -280,11 +292,11 @@
292 # noop
293
294 clean:
295 rm -rf $(OBJDIR)/* $(APPNAME)
296
297 }]
298
299 set mhargs {}
300 foreach s [lsort $src] {
301 append mhargs " \$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
302 set extra_h($s) {}
@@ -310,14 +322,14 @@
322 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
323 writeln "\$(OBJDIR)/$s.h:\t\$(OBJDIR)/headers"
324 }
325
326 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
327 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
328
329 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
330 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
331
332 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
333 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
334
335 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -787,11 +799,10 @@
799 }
800
801
802 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
803 set opt [join $SQLITE_OPTIONS { }]
 
804 append opt " -D_HAVE_SQLITE_CONFIG_H"
805 append opt " -DSQLITE_USE_MALLOC_H"
806 append opt " -DSQLITE_USE_MSIZE"
807 writeln "\t\$(XTCC) $opt \$(SQLITE3_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
808
@@ -799,13 +810,11 @@
810 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
811 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
812 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_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 : \$(SRCDIR)/json_detail.h\n"
813
814 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
815 set opt [join $SHELL_WIN32_OPTIONS { }]
 
 
816 writeln "\t\$(XTCC) $opt \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
817
818 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
819 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
820
@@ -855,12 +864,12 @@
864 CFLAGS = -o
865 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
866 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
867 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
868 }
869 writeln "SQLITE_OPTIONS = [join $SQLITE_OPTIONS { }]\n"
870 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS { }]\n"
871 writeln -nonewline "SRC = "
872 foreach s [lsort $src] {
873 writeln -nonewline "${s}_.c "
874 }
875 writeln "\n"
@@ -1049,17 +1058,14 @@
1058 LIBS = $(LIBS) $(SSLLIB)
1059 LIBDIR = $(LIBDIR) -LIBPATH:$(SSLLIBDIR)
1060 !endif
1061 }
1062 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
 
1063 set j " \\\n "
1064 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
1065
1066 regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
 
 
1067 set j " \\\n "
1068 writeln "SHELL_OPTIONS = [join $MSC_SHELL_OPTIONS $j]\n"
1069
1070 writeln -nonewline "SRC = "
1071 set i 0
@@ -1145,11 +1151,10 @@
1151 -del $(OX)\*.obj
1152 -del *.obj
1153 -del *_.c
1154 -del *.h
1155 -del *.map
 
1156 -del headers
1157 -del linkopts
1158 -del *.res
1159
1160 realclean: clean
@@ -1215,11 +1220,11 @@
1220 set output_file [open ../win/Makefile.PellesCGMake w]
1221 fconfigure $output_file -translation binary
1222
1223 writeln [string map [list \
1224 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1225 <<<SHELL_OPTIONS>>> [join $SHELL_WIN32_OPTIONS { }]] {#
1226 ##############################################################################
1227 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1228 ##############################################################################
1229 #
1230 # This file is automatically generated. Instead of editing this
@@ -1302,17 +1307,17 @@
1307
1308 # define the sqlite files, which need special flags on compile
1309 SQLITESRC=sqlite3.c
1310 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1311 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1312 SQLITEDEFINES=<<<SQLITE_OPTIONS>>>
1313
1314 # define the sqlite shell files, which need special flags on compile
1315 SQLITESHELLSRC=shell.c
1316 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1317 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1318 SQLITESHELLDEFINES=<<<SHELL_OPTIONS>>>
1319
1320 # define the th scripting files, which need special flags on compile
1321 THSRC=th.c th_lang.c
1322 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1323 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1324
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
8383
8484
 # define the sqlite files, which need special flags on compile
8585
 SQLITESRC=sqlite3.c
8686
 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
8787
 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 -DSQLITE_WIN32_NO_ANSI
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
8989
9090
 # define the sqlite shell files, which need special flags on compile
9191
 SQLITESHELLSRC=shell.c
9292
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
9393
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
9494
--- 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 -DSQLITE_WIN32_NO_ANSI
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=-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
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -24,11 +24,11 @@
2424
 CFLAGS = -o
2525
 BCC = $(DMDIR)\bin\dmc $(CFLAGS)
2626
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
2727
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
2828
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 -DSQLITE_WIN32_NO_ANSI
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
3030
3131
 SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen
3232
3333
 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 winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
3434
3535
--- 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 -DSQLITE_WIN32_NO_ANSI
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 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 = -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 winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
34
35
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1687,11 +1687,11 @@
16871687
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
16881688
16891689
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
16901690
16911691
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692
- $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1692
+ $(XTCC) -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 -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
16931693
16941694
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
16951695
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16961696
16971697
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_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 : $(SRCDIR)/json_detail.h
16981698
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1687,11 +1687,11 @@
1687 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692 $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_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 : $(SRCDIR)/json_detail.h
1698
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1687,11 +1687,11 @@
1687 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692 $(XTCC) -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 -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_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 : $(SRCDIR)/json_detail.h
1698
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1687,11 +1687,11 @@
16871687
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
16881688
16891689
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
16901690
16911691
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692
- $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1692
+ $(XTCC) -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 -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
16931693
16941694
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
16951695
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16961696
16971697
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_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 : $(SRCDIR)/json_detail.h
16981698
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1687,11 +1687,11 @@
1687 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692 $(XTCC) -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 -DSQLITE_WIN32_NO_ANSI -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_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 : $(SRCDIR)/json_detail.h
1698
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1687,11 +1687,11 @@
1687 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1688
1689 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1690
1691 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1692 $(XTCC) -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 -D_HAVE_SQLITE_CONFIG_H -DSQLITE_USE_MALLOC_H -DSQLITE_USE_MSIZE $(SQLITE3_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1693
1694 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1695 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1696
1697 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_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 : $(SRCDIR)/json_detail.h
1698
M win/Makefile.msc
+1 -3
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -70,12 +70,11 @@
7070
 /DSQLITE_THREADSAFE=0 \
7171
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
7272
 /DSQLITE_OMIT_DEPRECATED \
7373
 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
7474
 /Dlocaltime=fossil_localtime \
75
- /DSQLITE_ENABLE_LOCKING_STYLE=0 \
76
- /DSQLITE_WIN32_NO_ANSI
75
+ /DSQLITE_ENABLE_LOCKING_STYLE=0
7776
7877
 SHELL_OPTIONS = /Dmain=sqlite3_shell \
7978
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
8079
 /Dsqlite3_strglob=strglob \
8180
 /Dgetenv=fossil_getenv \
@@ -472,11 +471,10 @@
472471
 -del $(OX)\*.obj
473472
 -del *.obj
474473
 -del *_.c
475474
 -del *.h
476475
 -del *.map
477
- -del *.manifest
478476
 -del headers
479477
 -del linkopts
480478
 -del *.res
481479
482480
 realclean: clean
483481
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -70,12 +70,11 @@
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 /DSQLITE_WIN32_NO_ANSI
77
78 SHELL_OPTIONS = /Dmain=sqlite3_shell \
79 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
80 /Dsqlite3_strglob=strglob \
81 /Dgetenv=fossil_getenv \
@@ -472,11 +471,10 @@
472 -del $(OX)\*.obj
473 -del *.obj
474 -del *_.c
475 -del *.h
476 -del *.map
477 -del *.manifest
478 -del headers
479 -del linkopts
480 -del *.res
481
482 realclean: clean
483
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -70,12 +70,11 @@
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 \
@@ -472,11 +471,10 @@
471 -del $(OX)\*.obj
472 -del *.obj
473 -del *_.c
474 -del *.h
475 -del *.map
 
476 -del headers
477 -del linkopts
478 -del *.res
479
480 realclean: clean
481

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button