Fossil SCM
Document Tcl integration setting, build fixes.
Commit
326688e58b23999a03ac417ac332ff3fb7487e8c
Parent
9613828c7e36590…
2 files changed
+7
-1
+7
-1
M
src/db.c
+7
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1777,11 +1777,11 @@ | ||
| 1777 | 1777 | { "repo-cksum", 0, 0, 0, "on" }, |
| 1778 | 1778 | { "self-register", 0, 0, 0, "off" }, |
| 1779 | 1779 | { "ssl-ca-location",0, 40, 0, "" }, |
| 1780 | 1780 | { "ssl-identity", 0, 40, 0, "" }, |
| 1781 | 1781 | { "ssh-command", 0, 32, 0, "" }, |
| 1782 | - { "tcl", 0, 0, 1, "off" }, | |
| 1782 | + { "tcl", 0, 0, 0, "off" }, | |
| 1783 | 1783 | { "web-browser", 0, 32, 0, "" }, |
| 1784 | 1784 | { "white-foreground", 0, 0, 0, "off" }, |
| 1785 | 1785 | { 0,0,0,0,0 } |
| 1786 | 1786 | }; |
| 1787 | 1787 | |
| @@ -1925,10 +1925,16 @@ | ||
| 1925 | 1925 | ** authenticate this client, in addition to the normal |
| 1926 | 1926 | ** password authentication. |
| 1927 | 1927 | ** |
| 1928 | 1928 | ** ssh-command Command used to talk to a remote machine with |
| 1929 | 1929 | ** the "ssh://" protocol. |
| 1930 | +** | |
| 1931 | +** tcl If enabled, Tcl integration commands will be added to | |
| 1932 | +** the TH1 interpreter, allowing Tcl expressions and | |
| 1933 | +** scripts to be evaluated from TH1. Additionally, the | |
| 1934 | +** Tcl interpreter will be able to evaluate TH1 expressions | |
| 1935 | +** and scripts. Default: off. | |
| 1930 | 1936 | ** |
| 1931 | 1937 | ** web-browser A shell command used to launch your preferred |
| 1932 | 1938 | ** web browser when given a URL as an argument. |
| 1933 | 1939 | ** Defaults to "start" on windows, "open" on Mac, |
| 1934 | 1940 | ** and "firefox" on Unix. |
| 1935 | 1941 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1777,11 +1777,11 @@ | |
| 1777 | { "repo-cksum", 0, 0, 0, "on" }, |
| 1778 | { "self-register", 0, 0, 0, "off" }, |
| 1779 | { "ssl-ca-location",0, 40, 0, "" }, |
| 1780 | { "ssl-identity", 0, 40, 0, "" }, |
| 1781 | { "ssh-command", 0, 32, 0, "" }, |
| 1782 | { "tcl", 0, 0, 1, "off" }, |
| 1783 | { "web-browser", 0, 32, 0, "" }, |
| 1784 | { "white-foreground", 0, 0, 0, "off" }, |
| 1785 | { 0,0,0,0,0 } |
| 1786 | }; |
| 1787 | |
| @@ -1925,10 +1925,16 @@ | |
| 1925 | ** authenticate this client, in addition to the normal |
| 1926 | ** password authentication. |
| 1927 | ** |
| 1928 | ** ssh-command Command used to talk to a remote machine with |
| 1929 | ** the "ssh://" protocol. |
| 1930 | ** |
| 1931 | ** web-browser A shell command used to launch your preferred |
| 1932 | ** web browser when given a URL as an argument. |
| 1933 | ** Defaults to "start" on windows, "open" on Mac, |
| 1934 | ** and "firefox" on Unix. |
| 1935 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1777,11 +1777,11 @@ | |
| 1777 | { "repo-cksum", 0, 0, 0, "on" }, |
| 1778 | { "self-register", 0, 0, 0, "off" }, |
| 1779 | { "ssl-ca-location",0, 40, 0, "" }, |
| 1780 | { "ssl-identity", 0, 40, 0, "" }, |
| 1781 | { "ssh-command", 0, 32, 0, "" }, |
| 1782 | { "tcl", 0, 0, 0, "off" }, |
| 1783 | { "web-browser", 0, 32, 0, "" }, |
| 1784 | { "white-foreground", 0, 0, 0, "off" }, |
| 1785 | { 0,0,0,0,0 } |
| 1786 | }; |
| 1787 | |
| @@ -1925,10 +1925,16 @@ | |
| 1925 | ** authenticate this client, in addition to the normal |
| 1926 | ** password authentication. |
| 1927 | ** |
| 1928 | ** ssh-command Command used to talk to a remote machine with |
| 1929 | ** the "ssh://" protocol. |
| 1930 | ** |
| 1931 | ** tcl If enabled, Tcl integration commands will be added to |
| 1932 | ** the TH1 interpreter, allowing Tcl expressions and |
| 1933 | ** scripts to be evaluated from TH1. Additionally, the |
| 1934 | ** Tcl interpreter will be able to evaluate TH1 expressions |
| 1935 | ** and scripts. Default: off. |
| 1936 | ** |
| 1937 | ** web-browser A shell command used to launch your preferred |
| 1938 | ** web browser when given a URL as an argument. |
| 1939 | ** Defaults to "start" on windows, "open" on Mac, |
| 1940 | ** and "firefox" on Unix. |
| 1941 |
+7
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -396,11 +396,15 @@ | ||
| 396 | 396 | $(TCLSH) test/tester.tcl $(APPNAME) |
| 397 | 397 | |
| 398 | 398 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 399 | 399 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 400 | 400 | |
| 401 | -EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o | |
| 401 | +EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o | |
| 402 | + | |
| 403 | +ifdef FOSSIL_ENABLE_TCL | |
| 404 | +EXTRAOBJ += $(OBJDIR)/th_tcl.o | |
| 405 | +endif | |
| 402 | 406 | |
| 403 | 407 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o |
| 404 | 408 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o |
| 405 | 409 | |
| 406 | 410 | # This rule prevents make from using its default rules to try build |
| @@ -1012,8 +1016,10 @@ | ||
| 1012 | 1016 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1013 | 1017 | |
| 1014 | 1018 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1015 | 1019 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1016 | 1020 | |
| 1021 | +ifdef FOSSIL_ENABLE_TCL | |
| 1017 | 1022 | $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c |
| 1018 | 1023 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o |
| 1024 | +endif | |
| 1019 | 1025 | |
| 1020 | 1026 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -396,11 +396,15 @@ | |
| 396 | $(TCLSH) test/tester.tcl $(APPNAME) |
| 397 | |
| 398 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 399 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 400 | |
| 401 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o |
| 402 | |
| 403 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o |
| 404 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o |
| 405 | |
| 406 | # This rule prevents make from using its default rules to try build |
| @@ -1012,8 +1016,10 @@ | |
| 1012 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1013 | |
| 1014 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1015 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1016 | |
| 1017 | $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c |
| 1018 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o |
| 1019 | |
| 1020 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -396,11 +396,15 @@ | |
| 396 | $(TCLSH) test/tester.tcl $(APPNAME) |
| 397 | |
| 398 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 399 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 400 | |
| 401 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o |
| 402 | |
| 403 | ifdef FOSSIL_ENABLE_TCL |
| 404 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 405 | endif |
| 406 | |
| 407 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o |
| 408 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o |
| 409 | |
| 410 | # This rule prevents make from using its default rules to try build |
| @@ -1012,8 +1016,10 @@ | |
| 1016 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1017 | |
| 1018 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1019 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1020 | |
| 1021 | ifdef FOSSIL_ENABLE_TCL |
| 1022 | $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c |
| 1023 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o |
| 1024 | endif |
| 1025 | |
| 1026 |