Fossil SCM

Improve SEE (shell) support in the build process.

mistachkin 2016-05-28 02:37 trunk
Commit cc828822c52a918d8c11e59a75ba219d49f11841
Parent 8f2dd0106ef3b5a…
6 files changed +1 +6 -2 +20 -6 +6 -2 +6 -2 +8 -2
~ .fossil-settings/ignore-glob ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M .fossil-settings/ignore-glob
+1
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,6 +1,7 @@
11
 compat/openssl*
22
 compat/tcl*
33
 fossil
44
 fossil.exe
55
 win/fossil.exe
6
+*shell-see.*
67
 *sqlite3-see.*
78
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,6 +1,7 @@
1 compat/openssl*
2 compat/tcl*
3 fossil
4 fossil.exe
5 win/fossil.exe
 
6 *sqlite3-see.*
7
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,6 +1,7 @@
1 compat/openssl*
2 compat/tcl*
3 fossil
4 fossil.exe
5 win/fossil.exe
6 *shell-see.*
7 *sqlite3-see.*
8
M src/main.mk
+6 -2
--- src/main.mk
+++ src/main.mk
@@ -537,10 +537,14 @@
537537
 # the SQLite Encryption Extension.
538538
 SQLITE3_SRC.0 = sqlite3.c
539539
 SQLITE3_SRC.1 = sqlite3-see.c
540540
 SQLITE3_SRC. = sqlite3.c
541541
 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
542
+SQLITE3_SHELL_SRC.0 = shell.c
543
+SQLITE3_SHELL_SRC.1 = shell-see.c
544
+SQLITE3_SHELL_SRC. = shell.c
545
+SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
542546
 SEE_FLAGS.0 =
543547
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
544548
 SEE_FLAGS. =
545549
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
546550
@@ -1656,12 +1660,12 @@
16561660
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
16571661
16581662
 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC)
16591663
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
16601664
 -c $(SQLITE3_SRC) -o $@
1661
-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1662
- $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SRCDIR)/shell.c -o $@
1665
+$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR)/sqlite3.h
1666
+ $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SQLITE3_SHELL_SRC) -o $@
16631667
16641668
 $(OBJDIR)/linenoise.o: $(SRCDIR)/linenoise.c $(SRCDIR)/linenoise.h
16651669
 $(XTCC) -c $(SRCDIR)/linenoise.c -o $@
16661670
16671671
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
16681672
--- src/main.mk
+++ src/main.mk
@@ -537,10 +537,14 @@
537 # the SQLite Encryption Extension.
538 SQLITE3_SRC.0 = sqlite3.c
539 SQLITE3_SRC.1 = sqlite3-see.c
540 SQLITE3_SRC. = sqlite3.c
541 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
 
 
 
 
542 SEE_FLAGS.0 =
543 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
544 SEE_FLAGS. =
545 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
546
@@ -1656,12 +1660,12 @@
1656 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1657
1658 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC)
1659 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
1660 -c $(SQLITE3_SRC) -o $@
1661 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1662 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SRCDIR)/shell.c -o $@
1663
1664 $(OBJDIR)/linenoise.o: $(SRCDIR)/linenoise.c $(SRCDIR)/linenoise.h
1665 $(XTCC) -c $(SRCDIR)/linenoise.c -o $@
1666
1667 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1668
--- src/main.mk
+++ src/main.mk
@@ -537,10 +537,14 @@
537 # the SQLite Encryption Extension.
538 SQLITE3_SRC.0 = sqlite3.c
539 SQLITE3_SRC.1 = sqlite3-see.c
540 SQLITE3_SRC. = sqlite3.c
541 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
542 SQLITE3_SHELL_SRC.0 = shell.c
543 SQLITE3_SHELL_SRC.1 = shell-see.c
544 SQLITE3_SHELL_SRC. = shell.c
545 SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
546 SEE_FLAGS.0 =
547 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
548 SEE_FLAGS. =
549 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
550
@@ -1656,12 +1660,12 @@
1660 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1661
1662 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC)
1663 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
1664 -c $(SQLITE3_SRC) -o $@
1665 $(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR)/sqlite3.h
1666 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SQLITE3_SHELL_SRC) -o $@
1667
1668 $(OBJDIR)/linenoise.o: $(SRCDIR)/linenoise.c $(SRCDIR)/linenoise.h
1669 $(XTCC) -c $(SRCDIR)/linenoise.c -o $@
1670
1671 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1672
M src/makemake.tcl
+20 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -367,10 +367,14 @@
367367
 # the SQLite Encryption Extension.
368368
 SQLITE3_SRC.0 = sqlite3.c
369369
 SQLITE3_SRC.1 = sqlite3-see.c
370370
 SQLITE3_SRC. = sqlite3.c
371371
 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
372
+SQLITE3_SHELL_SRC.0 = shell.c
373
+SQLITE3_SHELL_SRC.1 = shell-see.c
374
+SQLITE3_SHELL_SRC. = shell.c
375
+SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
372376
 SEE_FLAGS.0 =
373377
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
374378
 SEE_FLAGS. =
375379
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
376380
 }]
@@ -438,12 +442,12 @@
438442
439443
 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC)"
440444
 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
441445
 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
442446
443
-writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
444
-writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SRCDIR)/shell.c -o \$@\n"
447
+writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR)/sqlite3.h"
448
+writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
445449
446450
 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
447451
 writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
448452
449453
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
@@ -1047,10 +1051,14 @@
10471051
 # the SQLite Encryption Extension.
10481052
 SQLITE3_SRC.0 = sqlite3.c
10491053
 SQLITE3_SRC.1 = sqlite3-see.c
10501054
 SQLITE3_SRC. = sqlite3.c
10511055
 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
1056
+SQLITE3_SHELL_SRC.0 = shell.c
1057
+SQLITE3_SHELL_SRC.1 = shell-see.c
1058
+SQLITE3_SHELL_SRC. = shell.c
1059
+SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
10521060
 SEE_FLAGS.0 =
10531061
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
10541062
 SEE_FLAGS. =
10551063
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
10561064
 }
@@ -1188,12 +1196,12 @@
11881196
11891197
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
11901198
 writeln "\t\$(XTCC) -c \$(SRCDIR)/cson_amalgamation.c -o \$@\n"
11911199
 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"
11921200
1193
-writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h \$(SRCDIR)/../win/Makefile.mingw"
1194
-writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$@\n"
1201
+writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR)/sqlite3.h \$(SRCDIR)/../win/Makefile.mingw"
1202
+writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
11951203
11961204
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
11971205
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
11981206
11991207
 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -1825,12 +1833,18 @@
18251833
 $(BCC) $**
18261834
18271835
 codecheck1$E: $(SRCDIR)\codecheck1.c
18281836
 $(BCC) $**
18291837
1830
-$(OX)\shell$O : $(SRCDIR)\shell.c $B\win\Makefile.msc
1831
- $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
1838
+!if $(USE_SEE)!=0
1839
+SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1840
+!else
1841
+SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
1842
+!endif
1843
+
1844
+$(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
1845
+ $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SQLITE3_SHELL_SRC)
18321846
18331847
 !if $(USE_SEE)!=0
18341848
 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
18351849
 !else
18361850
 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
18371851
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -367,10 +367,14 @@
367 # the SQLite Encryption Extension.
368 SQLITE3_SRC.0 = sqlite3.c
369 SQLITE3_SRC.1 = sqlite3-see.c
370 SQLITE3_SRC. = sqlite3.c
371 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
 
 
 
 
372 SEE_FLAGS.0 =
373 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
374 SEE_FLAGS. =
375 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
376 }]
@@ -438,12 +442,12 @@
438
439 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC)"
440 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
441 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
442
443 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
444 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SRCDIR)/shell.c -o \$@\n"
445
446 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
447 writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
448
449 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
@@ -1047,10 +1051,14 @@
1047 # the SQLite Encryption Extension.
1048 SQLITE3_SRC.0 = sqlite3.c
1049 SQLITE3_SRC.1 = sqlite3-see.c
1050 SQLITE3_SRC. = sqlite3.c
1051 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
 
 
 
 
1052 SEE_FLAGS.0 =
1053 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
1054 SEE_FLAGS. =
1055 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
1056 }
@@ -1188,12 +1196,12 @@
1188
1189 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
1190 writeln "\t\$(XTCC) -c \$(SRCDIR)/cson_amalgamation.c -o \$@\n"
1191 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"
1192
1193 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h \$(SRCDIR)/../win/Makefile.mingw"
1194 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SRCDIR)/shell.c -o \$@\n"
1195
1196 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
1197 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
1198
1199 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -1825,12 +1833,18 @@
1825 $(BCC) $**
1826
1827 codecheck1$E: $(SRCDIR)\codecheck1.c
1828 $(BCC) $**
1829
1830 $(OX)\shell$O : $(SRCDIR)\shell.c $B\win\Makefile.msc
1831 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
 
 
 
 
 
 
1832
1833 !if $(USE_SEE)!=0
1834 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1835 !else
1836 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
1837
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -367,10 +367,14 @@
367 # the SQLite Encryption Extension.
368 SQLITE3_SRC.0 = sqlite3.c
369 SQLITE3_SRC.1 = sqlite3-see.c
370 SQLITE3_SRC. = sqlite3.c
371 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
372 SQLITE3_SHELL_SRC.0 = shell.c
373 SQLITE3_SHELL_SRC.1 = shell-see.c
374 SQLITE3_SHELL_SRC. = shell.c
375 SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
376 SEE_FLAGS.0 =
377 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
378 SEE_FLAGS. =
379 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
380 }]
@@ -438,12 +442,12 @@
442
443 writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC)"
444 writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
445 writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
446
447 writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR)/sqlite3.h"
448 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
449
450 writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
451 writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
452
453 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
@@ -1047,10 +1051,14 @@
1051 # the SQLite Encryption Extension.
1052 SQLITE3_SRC.0 = sqlite3.c
1053 SQLITE3_SRC.1 = sqlite3-see.c
1054 SQLITE3_SRC. = sqlite3.c
1055 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
1056 SQLITE3_SHELL_SRC.0 = shell.c
1057 SQLITE3_SHELL_SRC.1 = shell-see.c
1058 SQLITE3_SHELL_SRC. = shell.c
1059 SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
1060 SEE_FLAGS.0 =
1061 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
1062 SEE_FLAGS. =
1063 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
1064 }
@@ -1188,12 +1196,12 @@
1196
1197 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
1198 writeln "\t\$(XTCC) -c \$(SRCDIR)/cson_amalgamation.c -o \$@\n"
1199 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"
1200
1201 writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR)/sqlite3.h \$(SRCDIR)/../win/Makefile.mingw"
1202 writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
1203
1204 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
1205 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
1206
1207 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
@@ -1825,12 +1833,18 @@
1833 $(BCC) $**
1834
1835 codecheck1$E: $(SRCDIR)\codecheck1.c
1836 $(BCC) $**
1837
1838 !if $(USE_SEE)!=0
1839 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1840 !else
1841 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
1842 !endif
1843
1844 $(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
1845 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SQLITE3_SHELL_SRC)
1846
1847 !if $(USE_SEE)!=0
1848 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1849 !else
1850 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
1851
M win/Makefile.mingw
+6 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -956,10 +956,14 @@
956956
 # the SQLite Encryption Extension.
957957
 SQLITE3_SRC.0 = sqlite3.c
958958
 SQLITE3_SRC.1 = sqlite3-see.c
959959
 SQLITE3_SRC. = sqlite3.c
960960
 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
961
+SQLITE3_SHELL_SRC.0 = shell.c
962
+SQLITE3_SHELL_SRC.1 = shell-see.c
963
+SQLITE3_SHELL_SRC. = shell.c
964
+SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
961965
 SEE_FLAGS.0 =
962966
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
963967
 SEE_FLAGS. =
964968
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
965969
@@ -2164,12 +2168,12 @@
21642168
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
21652169
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@
21662170
21672171
 $(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
21682172
2169
-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw
2170
- $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $@
2173
+$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw
2174
+ $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
21712175
21722176
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
21732177
 $(XTCC) -c $(SRCDIR)/th.c -o $@
21742178
21752179
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
21762180
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -956,10 +956,14 @@
956 # the SQLite Encryption Extension.
957 SQLITE3_SRC.0 = sqlite3.c
958 SQLITE3_SRC.1 = sqlite3-see.c
959 SQLITE3_SRC. = sqlite3.c
960 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
 
 
 
 
961 SEE_FLAGS.0 =
962 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
963 SEE_FLAGS. =
964 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
965
@@ -2164,12 +2168,12 @@
2164 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
2165 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@
2166
2167 $(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
2168
2169 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw
2170 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $@
2171
2172 $(OBJDIR)/th.o: $(SRCDIR)/th.c
2173 $(XTCC) -c $(SRCDIR)/th.c -o $@
2174
2175 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
2176
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -956,10 +956,14 @@
956 # the SQLite Encryption Extension.
957 SQLITE3_SRC.0 = sqlite3.c
958 SQLITE3_SRC.1 = sqlite3-see.c
959 SQLITE3_SRC. = sqlite3.c
960 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
961 SQLITE3_SHELL_SRC.0 = shell.c
962 SQLITE3_SHELL_SRC.1 = shell-see.c
963 SQLITE3_SHELL_SRC. = shell.c
964 SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
965 SEE_FLAGS.0 =
966 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
967 SEE_FLAGS. =
968 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
969
@@ -2164,12 +2168,12 @@
2168 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
2169 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@
2170
2171 $(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
2172
2173 $(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw
2174 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
2175
2176 $(OBJDIR)/th.o: $(SRCDIR)/th.c
2177 $(XTCC) -c $(SRCDIR)/th.c -o $@
2178
2179 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
2180
M win/Makefile.mingw.mistachkin
+6 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -956,10 +956,14 @@
956956
 # the SQLite Encryption Extension.
957957
 SQLITE3_SRC.0 = sqlite3.c
958958
 SQLITE3_SRC.1 = sqlite3-see.c
959959
 SQLITE3_SRC. = sqlite3.c
960960
 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
961
+SQLITE3_SHELL_SRC.0 = shell.c
962
+SQLITE3_SHELL_SRC.1 = shell-see.c
963
+SQLITE3_SHELL_SRC. = shell.c
964
+SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
961965
 SEE_FLAGS.0 =
962966
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
963967
 SEE_FLAGS. =
964968
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
965969
@@ -2164,12 +2168,12 @@
21642168
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
21652169
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@
21662170
21672171
 $(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
21682172
2169
-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw.mistachkin
2170
- $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $@
2173
+$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw.mistachkin
2174
+ $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
21712175
21722176
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
21732177
 $(XTCC) -c $(SRCDIR)/th.c -o $@
21742178
21752179
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
21762180
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -956,10 +956,14 @@
956 # the SQLite Encryption Extension.
957 SQLITE3_SRC.0 = sqlite3.c
958 SQLITE3_SRC.1 = sqlite3-see.c
959 SQLITE3_SRC. = sqlite3.c
960 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
 
 
 
 
961 SEE_FLAGS.0 =
962 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
963 SEE_FLAGS. =
964 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
965
@@ -2164,12 +2168,12 @@
2164 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
2165 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@
2166
2167 $(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
2168
2169 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw.mistachkin
2170 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)/shell.c -o $@
2171
2172 $(OBJDIR)/th.o: $(SRCDIR)/th.c
2173 $(XTCC) -c $(SRCDIR)/th.c -o $@
2174
2175 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
2176
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -956,10 +956,14 @@
956 # the SQLite Encryption Extension.
957 SQLITE3_SRC.0 = sqlite3.c
958 SQLITE3_SRC.1 = sqlite3-see.c
959 SQLITE3_SRC. = sqlite3.c
960 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
961 SQLITE3_SHELL_SRC.0 = shell.c
962 SQLITE3_SHELL_SRC.1 = shell-see.c
963 SQLITE3_SHELL_SRC. = shell.c
964 SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
965 SEE_FLAGS.0 =
966 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC
967 SEE_FLAGS. =
968 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
969
@@ -2164,12 +2168,12 @@
2168 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
2169 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@
2170
2171 $(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
2172
2173 $(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw.mistachkin
2174 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
2175
2176 $(OBJDIR)/th.o: $(SRCDIR)/th.c
2177 $(XTCC) -c $(SRCDIR)/th.c -o $@
2178
2179 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
2180
M win/Makefile.msc
+8 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -840,12 +840,18 @@
840840
 $(BCC) $**
841841
842842
 codecheck1$E: $(SRCDIR)\codecheck1.c
843843
 $(BCC) $**
844844
845
-$(OX)\shell$O : $(SRCDIR)\shell.c $B\win\Makefile.msc
846
- $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
845
+!if $(USE_SEE)!=0
846
+SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
847
+!else
848
+SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
849
+!endif
850
+
851
+$(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
852
+ $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SQLITE3_SHELL_SRC)
847853
848854
 !if $(USE_SEE)!=0
849855
 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
850856
 !else
851857
 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
852858
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -840,12 +840,18 @@
840 $(BCC) $**
841
842 codecheck1$E: $(SRCDIR)\codecheck1.c
843 $(BCC) $**
844
845 $(OX)\shell$O : $(SRCDIR)\shell.c $B\win\Makefile.msc
846 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SRCDIR)\shell.c
 
 
 
 
 
 
847
848 !if $(USE_SEE)!=0
849 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
850 !else
851 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
852
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -840,12 +840,18 @@
840 $(BCC) $**
841
842 codecheck1$E: $(SRCDIR)\codecheck1.c
843 $(BCC) $**
844
845 !if $(USE_SEE)!=0
846 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
847 !else
848 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
849 !endif
850
851 $(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
852 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) -c $(SQLITE3_SHELL_SRC)
853
854 !if $(USE_SEE)!=0
855 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
856 !else
857 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
858

Keyboard Shortcuts

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