Fossil SCM

merge trunk, combine with "allow-backslash-on-unix" branch

jan.nijtmans 2013-01-27 20:29 UTC ticket-d17d6e5b17 merge
Commit 38159dae326625d09ecf1648bdb114c9a5533aed
Parent ba87fb1fecfa54a…
26 files changed +1 -1 +1 -1 +3 +3 +1 -1 +1 -1 +1 -1 +1 -1 +34 -15 +34 -15 +1 -1 +1 -1 +8 -1 +8 -1 +25 -6 +25 -6 +26 +26 +5 -5 +5 -5 +5 -5 +5 -5 +30 -7 +30 -7 +3 -3 +3 -3
~ auto.def ~ auto.def ~ src/cson_amalgamation.h ~ src/cson_amalgamation.h ~ src/main.c ~ src/main.c ~ src/main.mk ~ src/main.mk ~ src/makemake.tcl ~ src/makemake.tcl ~ src/printf.c ~ src/printf.c ~ src/stat.c ~ src/stat.c ~ src/update.c ~ src/update.c ~ test/revert.test ~ test/revert.test ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/Makefile.msc ~ win/include/dirent.h ~ win/include/dirent.h
M auto.def
+1 -1
--- auto.def
+++ auto.def
@@ -193,11 +193,11 @@
193193
 if {$found} {
194194
 define FOSSIL_ENABLE_SSL
195195
 define-append EXTRA_CFLAGS $cflags
196196
 define-append EXTRA_LDFLAGS $ldflags
197197
 define-append LIBS -lssl -lcrypto
198
- msg-result "HTTP support enabled"
198
+ msg-result "HTTPS support enabled"
199199
200200
 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
201201
 if {[string match *-darwin* [get-define host]]} {
202202
 if {[cctest -cflags {-Wdeprecated-declarations}]} {
203203
 define-append EXTRA_CFLAGS -Wdeprecated-declarations
204204
--- auto.def
+++ auto.def
@@ -193,11 +193,11 @@
193 if {$found} {
194 define FOSSIL_ENABLE_SSL
195 define-append EXTRA_CFLAGS $cflags
196 define-append EXTRA_LDFLAGS $ldflags
197 define-append LIBS -lssl -lcrypto
198 msg-result "HTTP support enabled"
199
200 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
201 if {[string match *-darwin* [get-define host]]} {
202 if {[cctest -cflags {-Wdeprecated-declarations}]} {
203 define-append EXTRA_CFLAGS -Wdeprecated-declarations
204
--- auto.def
+++ auto.def
@@ -193,11 +193,11 @@
193 if {$found} {
194 define FOSSIL_ENABLE_SSL
195 define-append EXTRA_CFLAGS $cflags
196 define-append EXTRA_LDFLAGS $ldflags
197 define-append LIBS -lssl -lcrypto
198 msg-result "HTTPS support enabled"
199
200 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
201 if {[string match *-darwin* [get-define host]]} {
202 if {[cctest -cflags {-Wdeprecated-declarations}]} {
203 define-append EXTRA_CFLAGS -Wdeprecated-declarations
204
M auto.def
+1 -1
--- auto.def
+++ auto.def
@@ -193,11 +193,11 @@
193193
 if {$found} {
194194
 define FOSSIL_ENABLE_SSL
195195
 define-append EXTRA_CFLAGS $cflags
196196
 define-append EXTRA_LDFLAGS $ldflags
197197
 define-append LIBS -lssl -lcrypto
198
- msg-result "HTTP support enabled"
198
+ msg-result "HTTPS support enabled"
199199
200200
 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
201201
 if {[string match *-darwin* [get-define host]]} {
202202
 if {[cctest -cflags {-Wdeprecated-declarations}]} {
203203
 define-append EXTRA_CFLAGS -Wdeprecated-declarations
204204
--- auto.def
+++ auto.def
@@ -193,11 +193,11 @@
193 if {$found} {
194 define FOSSIL_ENABLE_SSL
195 define-append EXTRA_CFLAGS $cflags
196 define-append EXTRA_LDFLAGS $ldflags
197 define-append LIBS -lssl -lcrypto
198 msg-result "HTTP support enabled"
199
200 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
201 if {[string match *-darwin* [get-define host]]} {
202 if {[cctest -cflags {-Wdeprecated-declarations}]} {
203 define-append EXTRA_CFLAGS -Wdeprecated-declarations
204
--- auto.def
+++ auto.def
@@ -193,11 +193,11 @@
193 if {$found} {
194 define FOSSIL_ENABLE_SSL
195 define-append EXTRA_CFLAGS $cflags
196 define-append EXTRA_LDFLAGS $ldflags
197 define-append LIBS -lssl -lcrypto
198 msg-result "HTTPS support enabled"
199
200 # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
201 if {[string match *-darwin* [get-define host]]} {
202 if {[cctest -cflags {-Wdeprecated-declarations}]} {
203 define-append EXTRA_CFLAGS -Wdeprecated-declarations
204
M src/cson_amalgamation.h
+3
--- src/cson_amalgamation.h
+++ src/cson_amalgamation.h
@@ -1,6 +1,9 @@
11
 #ifdef FOSSIL_ENABLE_JSON
2
+#ifndef CSON_FOSSIL_MODE
3
+#define CSON_FOSSIL_MODE
4
+#endif
25
 /* auto-generated! Do not edit! */
36
 /* begin file include/wh/cson/cson.h */
47
 #if !defined(WANDERINGHORSE_NET_CSON_H_INCLUDED)
58
 #define WANDERINGHORSE_NET_CSON_H_INCLUDED 1
69
710
--- src/cson_amalgamation.h
+++ src/cson_amalgamation.h
@@ -1,6 +1,9 @@
1 #ifdef FOSSIL_ENABLE_JSON
 
 
 
2 /* auto-generated! Do not edit! */
3 /* begin file include/wh/cson/cson.h */
4 #if !defined(WANDERINGHORSE_NET_CSON_H_INCLUDED)
5 #define WANDERINGHORSE_NET_CSON_H_INCLUDED 1
6
7
--- src/cson_amalgamation.h
+++ src/cson_amalgamation.h
@@ -1,6 +1,9 @@
1 #ifdef FOSSIL_ENABLE_JSON
2 #ifndef CSON_FOSSIL_MODE
3 #define CSON_FOSSIL_MODE
4 #endif
5 /* auto-generated! Do not edit! */
6 /* begin file include/wh/cson/cson.h */
7 #if !defined(WANDERINGHORSE_NET_CSON_H_INCLUDED)
8 #define WANDERINGHORSE_NET_CSON_H_INCLUDED 1
9
10
M src/cson_amalgamation.h
+3
--- src/cson_amalgamation.h
+++ src/cson_amalgamation.h
@@ -1,6 +1,9 @@
11
 #ifdef FOSSIL_ENABLE_JSON
2
+#ifndef CSON_FOSSIL_MODE
3
+#define CSON_FOSSIL_MODE
4
+#endif
25
 /* auto-generated! Do not edit! */
36
 /* begin file include/wh/cson/cson.h */
47
 #if !defined(WANDERINGHORSE_NET_CSON_H_INCLUDED)
58
 #define WANDERINGHORSE_NET_CSON_H_INCLUDED 1
69
710
--- src/cson_amalgamation.h
+++ src/cson_amalgamation.h
@@ -1,6 +1,9 @@
1 #ifdef FOSSIL_ENABLE_JSON
 
 
 
2 /* auto-generated! Do not edit! */
3 /* begin file include/wh/cson/cson.h */
4 #if !defined(WANDERINGHORSE_NET_CSON_H_INCLUDED)
5 #define WANDERINGHORSE_NET_CSON_H_INCLUDED 1
6
7
--- src/cson_amalgamation.h
+++ src/cson_amalgamation.h
@@ -1,6 +1,9 @@
1 #ifdef FOSSIL_ENABLE_JSON
2 #ifndef CSON_FOSSIL_MODE
3 #define CSON_FOSSIL_MODE
4 #endif
5 /* auto-generated! Do not edit! */
6 /* begin file include/wh/cson/cson.h */
7 #if !defined(WANDERINGHORSE_NET_CSON_H_INCLUDED)
8 #define WANDERINGHORSE_NET_CSON_H_INCLUDED 1
9
10
M src/main.c
+1 -1
--- src/main.c
+++ src/main.c
@@ -963,11 +963,11 @@
963963
 **
964964
 ** Display information on how to use COMMAND. To display a list of
965965
 ** available commands one of:
966966
 **
967967
 ** %fossil help Show common commands
968
-** %fossil help --all Show both command and auxiliary commands
968
+** %fossil help --all Show both common and auxiliary commands
969969
 ** %fossil help --test Show test commands only
970970
 ** %fossil help --aux Show auxiliary commands only
971971
 */
972972
 void help_cmd(void){
973973
 int rc, idx;
974974
--- src/main.c
+++ src/main.c
@@ -963,11 +963,11 @@
963 **
964 ** Display information on how to use COMMAND. To display a list of
965 ** available commands one of:
966 **
967 ** %fossil help Show common commands
968 ** %fossil help --all Show both command and auxiliary commands
969 ** %fossil help --test Show test commands only
970 ** %fossil help --aux Show auxiliary commands only
971 */
972 void help_cmd(void){
973 int rc, idx;
974
--- src/main.c
+++ src/main.c
@@ -963,11 +963,11 @@
963 **
964 ** Display information on how to use COMMAND. To display a list of
965 ** available commands one of:
966 **
967 ** %fossil help Show common commands
968 ** %fossil help --all Show both common and auxiliary commands
969 ** %fossil help --test Show test commands only
970 ** %fossil help --aux Show auxiliary commands only
971 */
972 void help_cmd(void){
973 int rc, idx;
974
M src/main.c
+1 -1
--- src/main.c
+++ src/main.c
@@ -963,11 +963,11 @@
963963
 **
964964
 ** Display information on how to use COMMAND. To display a list of
965965
 ** available commands one of:
966966
 **
967967
 ** %fossil help Show common commands
968
-** %fossil help --all Show both command and auxiliary commands
968
+** %fossil help --all Show both common and auxiliary commands
969969
 ** %fossil help --test Show test commands only
970970
 ** %fossil help --aux Show auxiliary commands only
971971
 */
972972
 void help_cmd(void){
973973
 int rc, idx;
974974
--- src/main.c
+++ src/main.c
@@ -963,11 +963,11 @@
963 **
964 ** Display information on how to use COMMAND. To display a list of
965 ** available commands one of:
966 **
967 ** %fossil help Show common commands
968 ** %fossil help --all Show both command and auxiliary commands
969 ** %fossil help --test Show test commands only
970 ** %fossil help --aux Show auxiliary commands only
971 */
972 void help_cmd(void){
973 int rc, idx;
974
--- src/main.c
+++ src/main.c
@@ -963,11 +963,11 @@
963 **
964 ** Display information on how to use COMMAND. To display a list of
965 ** available commands one of:
966 **
967 ** %fossil help Show common commands
968 ** %fossil help --all Show both common and auxiliary commands
969 ** %fossil help --test Show test commands only
970 ** %fossil help --aux Show auxiliary commands only
971 */
972 void help_cmd(void){
973 int rc, idx;
974
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -1146,11 +1146,11 @@
11461146
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
11471147
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
11481148
11491149
11501150
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1151
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
11521152
11531153
 #
11541154
 # The list of all the targets that do not correspond to real files. This stops
11551155
 # 'make' from getting confused when someone makes an error in a rule.
11561156
 #
11571157
--- src/main.mk
+++ src/main.mk
@@ -1146,11 +1146,11 @@
1146 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1147 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1148
1149
1150 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1152
1153 #
1154 # The list of all the targets that do not correspond to real files. This stops
1155 # 'make' from getting confused when someone makes an error in a rule.
1156 #
1157
--- src/main.mk
+++ src/main.mk
@@ -1146,11 +1146,11 @@
1146 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1147 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1148
1149
1150 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1152
1153 #
1154 # The list of all the targets that do not correspond to real files. This stops
1155 # 'make' from getting confused when someone makes an error in a rule.
1156 #
1157
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -1146,11 +1146,11 @@
11461146
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
11471147
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
11481148
11491149
11501150
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1151
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
11521152
11531153
 #
11541154
 # The list of all the targets that do not correspond to real files. This stops
11551155
 # 'make' from getting confused when someone makes an error in a rule.
11561156
 #
11571157
--- src/main.mk
+++ src/main.mk
@@ -1146,11 +1146,11 @@
1146 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1147 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1148
1149
1150 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1152
1153 #
1154 # The list of all the targets that do not correspond to real files. This stops
1155 # 'make' from getting confused when someone makes an error in a rule.
1156 #
1157
--- src/main.mk
+++ src/main.mk
@@ -1146,11 +1146,11 @@
1146 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1147 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1148
1149
1150 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1151 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1152
1153 #
1154 # The list of all the targets that do not correspond to real files. This stops
1155 # 'make' from getting confused when someone makes an error in a rule.
1156 #
1157
M src/makemake.tcl
+34 -15
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -308,11 +308,11 @@
308308
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309309
310310
 set opt {}
311311
 writeln {
312312
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
313
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
314314
315315
 #
316316
 # The list of all the targets that do not correspond to real files. This stops
317317
 # 'make' from getting confused when someone makes an error in a rule.
318318
 #
@@ -340,15 +340,15 @@
340340
 #
341341
 # This file is automatically generated. Instead of editing this
342342
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
343343
 # to regenerate this file.
344344
 #
345
-# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
346
-# MinGW-w64.
345
+# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
346
+# MinGW or MinGW-w64.
347347
 #
348348
349
-#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
349
+#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
350350
 # By default, this is an empty string (i.e. use the native compiler).
351351
 #
352352
 PREFIX =
353353
 # PREFIX = mingw32-
354354
 # PREFIX = i686-pc-mingw32-
@@ -694,11 +694,11 @@
694694
 ifdef FOSSIL_ENABLE_TCL
695695
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
696696
 endif
697697
698698
 zlib:
699
- make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
699
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
700700
701701
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
702702
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
703703
704704
 # This rule prevents make from using its default rules to try build
@@ -751,11 +751,11 @@
751751
 set opt $SQLITE_OPTIONS
752752
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753753
754754
 set opt {}
755755
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756
-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
756
+writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
757757
 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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758758
759759
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760760
 set opt {-Dmain=sqlite3_shell}
761761
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
@@ -959,18 +959,35 @@
959959
960960
 # zlib options
961961
 ZINCDIR = $(B)\compat\zlib
962962
 ZLIBDIR = $(B)\compat\zlib
963963
 ZLIB = zlib.lib
964
+
965
+# Uncomment to enable JSON API
966
+# FOSSIL_ENABLE_JSON = 1
967
+
968
+# Uncomment to enable markdown support
969
+# FOSSIL_ENABLE_MARKDOWN = 1
964970
965971
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
966972
967973
 CFLAGS = -nologo -MT -O2
968974
 BCC = $(CC) $(CFLAGS)
969975
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
976
+RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
970977
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
971978
 LIBDIR = -LIBPATH:$(ZLIBDIR)
979
+
980
+!ifdef FOSSIL_ENABLE_JSON
981
+TCC = $(TCC) -DFOSSIL_ENABLE_JSON
982
+RCC = $(RCC) -DFOSSIL_ENABLE_JSON
983
+!endif
984
+
985
+!ifdef FOSSIL_ENABLE_MARKDOWN
986
+TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
987
+RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
988
+!endif
972989
 }
973990
 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
974991
 set j " \\\n "
975992
 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
976993
 writeln -nonewline "SRC = "
@@ -981,24 +998,22 @@
981998
 writeln -nonewline " "
982999
 }
9831000
 writeln -nonewline "${s}_.c"; incr i
9841001
 }
9851002
 writeln "\n"
1003
+set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation]
9861004
 writeln -nonewline "OBJ = "
9871005
 set i 0
988
-foreach s [lsort $src] {
1006
+foreach s [lsort [concat $src $AdditionalObj]] {
9891007
 if {$i > 0} {
9901008
 writeln " \\"
9911009
 writeln -nonewline " "
9921010
 }
9931011
 writeln -nonewline "\$(OX)\\$s\$O"; incr i
9941012
 }
9951013
 writeln " \\"
996
-writeln " \$(OX)\\shell\$O \\"
997
-writeln " \$(OX)\\sqlite3\$O \\"
998
-writeln " \$(OX)\\th\$O \\"
999
-writeln " \$(OX)\\th_lang\$O"
1014
+writeln -nonewline " \$(OX)\\fossil.res\n"
10001015
 writeln {
10011016
 APPNAME = $(OX)\fossil$(E)
10021017
10031018
 all: $(OX) $(APPNAME)
10041019
@@ -1006,15 +1021,15 @@
10061021
 @echo Building zlib from "$(ZLIBDIR)"...
10071022
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
10081023
10091024
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
10101025
 cd $(OX)
1011
- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
1026
+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
10121027
10131028
 $(OX)\linkopts: $B\win\Makefile.msc}
10141029
 set redir {>}
1015
-foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] {
1030
+foreach s [lsort [concat $src $AdditionalObj]] {
10161031
 writeln "\techo \$(OX)\\$s.obj $redir \$@"
10171032
 set redir {>>}
10181033
 }
10191034
 writeln "\techo \$(LIBS) >> \$@\n\n"
10201035
@@ -1047,12 +1062,12 @@
10471062
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
10481063
 $(TCC) /Fo$@ -c $**
10491064
10501065
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
10511066
 $** > $@
1052
-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1053
- cp $(SRCDIR)\cson_amalgamation.h $@
1067
+$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1068
+ $(TCC) /Fo$@ -c $**
10541069
10551070
 page_index.h: mkindex$E $(SRC)
10561071
 $** > $@
10571072
10581073
 clean:
@@ -1062,10 +1077,11 @@
10621077
 -del *.h
10631078
 -del *.map
10641079
 -del *.manifest
10651080
 -del headers
10661081
 -del linkopts
1082
+ -del *.res
10671083
10681084
 realclean: clean
10691085
 -del $(APPNAME)
10701086
 -del translate$E
10711087
 -del mkindex$E
@@ -1092,10 +1108,13 @@
10921108
 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
10931109
 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
10941110
 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
10951111
 writeln "\ttranslate\$E \$** > \$@\n"
10961112
 }
1113
+
1114
+writeln "fossil.res : \$B\\win\\fossil.rc"
1115
+writeln "\t\$(RCC) -fo \$@ \$**"
10971116
10981117
 writeln "headers: makeheaders\$E page_index.h VERSION.h"
10991118
 writeln -nonewline "\tmakeheaders\$E "
11001119
 set i 0
11011120
 foreach s [lsort $src] {
11021121
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -308,11 +308,11 @@
308 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309
310 set opt {}
311 writeln {
312 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
314
315 #
316 # The list of all the targets that do not correspond to real files. This stops
317 # 'make' from getting confused when someone makes an error in a rule.
318 #
@@ -340,15 +340,15 @@
340 #
341 # This file is automatically generated. Instead of editing this
342 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
343 # to regenerate this file.
344 #
345 # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
346 # MinGW-w64.
347 #
348
349 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
350 # By default, this is an empty string (i.e. use the native compiler).
351 #
352 PREFIX =
353 # PREFIX = mingw32-
354 # PREFIX = i686-pc-mingw32-
@@ -694,11 +694,11 @@
694 ifdef FOSSIL_ENABLE_TCL
695 EXTRAOBJ += $(OBJDIR)/th_tcl.o
696 endif
697
698 zlib:
699 make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
700
701 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
702 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
703
704 # This rule prevents make from using its default rules to try build
@@ -751,11 +751,11 @@
751 set opt $SQLITE_OPTIONS
752 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753
754 set opt {}
755 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
757 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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758
759 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760 set opt {-Dmain=sqlite3_shell}
761 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
@@ -959,18 +959,35 @@
959
960 # zlib options
961 ZINCDIR = $(B)\compat\zlib
962 ZLIBDIR = $(B)\compat\zlib
963 ZLIB = zlib.lib
 
 
 
 
 
 
964
965 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
966
967 CFLAGS = -nologo -MT -O2
968 BCC = $(CC) $(CFLAGS)
969 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
 
970 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
971 LIBDIR = -LIBPATH:$(ZLIBDIR)
 
 
 
 
 
 
 
 
 
 
972 }
973 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
974 set j " \\\n "
975 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
976 writeln -nonewline "SRC = "
@@ -981,24 +998,22 @@
981 writeln -nonewline " "
982 }
983 writeln -nonewline "${s}_.c"; incr i
984 }
985 writeln "\n"
 
986 writeln -nonewline "OBJ = "
987 set i 0
988 foreach s [lsort $src] {
989 if {$i > 0} {
990 writeln " \\"
991 writeln -nonewline " "
992 }
993 writeln -nonewline "\$(OX)\\$s\$O"; incr i
994 }
995 writeln " \\"
996 writeln " \$(OX)\\shell\$O \\"
997 writeln " \$(OX)\\sqlite3\$O \\"
998 writeln " \$(OX)\\th\$O \\"
999 writeln " \$(OX)\\th_lang\$O"
1000 writeln {
1001 APPNAME = $(OX)\fossil$(E)
1002
1003 all: $(OX) $(APPNAME)
1004
@@ -1006,15 +1021,15 @@
1006 @echo Building zlib from "$(ZLIBDIR)"...
1007 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1008
1009 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1010 cd $(OX)
1011 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
1012
1013 $(OX)\linkopts: $B\win\Makefile.msc}
1014 set redir {>}
1015 foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] {
1016 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1017 set redir {>>}
1018 }
1019 writeln "\techo \$(LIBS) >> \$@\n\n"
1020
@@ -1047,12 +1062,12 @@
1047 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1048 $(TCC) /Fo$@ -c $**
1049
1050 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1051 $** > $@
1052 $(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1053 cp $(SRCDIR)\cson_amalgamation.h $@
1054
1055 page_index.h: mkindex$E $(SRC)
1056 $** > $@
1057
1058 clean:
@@ -1062,10 +1077,11 @@
1062 -del *.h
1063 -del *.map
1064 -del *.manifest
1065 -del headers
1066 -del linkopts
 
1067
1068 realclean: clean
1069 -del $(APPNAME)
1070 -del translate$E
1071 -del mkindex$E
@@ -1092,10 +1108,13 @@
1092 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1093 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1094 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1095 writeln "\ttranslate\$E \$** > \$@\n"
1096 }
 
 
 
1097
1098 writeln "headers: makeheaders\$E page_index.h VERSION.h"
1099 writeln -nonewline "\tmakeheaders\$E "
1100 set i 0
1101 foreach s [lsort $src] {
1102
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -308,11 +308,11 @@
308 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309
310 set opt {}
311 writeln {
312 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
314
315 #
316 # The list of all the targets that do not correspond to real files. This stops
317 # 'make' from getting confused when someone makes an error in a rule.
318 #
@@ -340,15 +340,15 @@
340 #
341 # This file is automatically generated. Instead of editing this
342 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
343 # to regenerate this file.
344 #
345 # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
346 # MinGW or MinGW-w64.
347 #
348
349 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
350 # By default, this is an empty string (i.e. use the native compiler).
351 #
352 PREFIX =
353 # PREFIX = mingw32-
354 # PREFIX = i686-pc-mingw32-
@@ -694,11 +694,11 @@
694 ifdef FOSSIL_ENABLE_TCL
695 EXTRAOBJ += $(OBJDIR)/th_tcl.o
696 endif
697
698 zlib:
699 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
700
701 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
702 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
703
704 # This rule prevents make from using its default rules to try build
@@ -751,11 +751,11 @@
751 set opt $SQLITE_OPTIONS
752 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753
754 set opt {}
755 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
757 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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758
759 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760 set opt {-Dmain=sqlite3_shell}
761 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
@@ -959,18 +959,35 @@
959
960 # zlib options
961 ZINCDIR = $(B)\compat\zlib
962 ZLIBDIR = $(B)\compat\zlib
963 ZLIB = zlib.lib
964
965 # Uncomment to enable JSON API
966 # FOSSIL_ENABLE_JSON = 1
967
968 # Uncomment to enable markdown support
969 # FOSSIL_ENABLE_MARKDOWN = 1
970
971 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
972
973 CFLAGS = -nologo -MT -O2
974 BCC = $(CC) $(CFLAGS)
975 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
976 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
977 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
978 LIBDIR = -LIBPATH:$(ZLIBDIR)
979
980 !ifdef FOSSIL_ENABLE_JSON
981 TCC = $(TCC) -DFOSSIL_ENABLE_JSON
982 RCC = $(RCC) -DFOSSIL_ENABLE_JSON
983 !endif
984
985 !ifdef FOSSIL_ENABLE_MARKDOWN
986 TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
987 RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
988 !endif
989 }
990 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
991 set j " \\\n "
992 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
993 writeln -nonewline "SRC = "
@@ -981,24 +998,22 @@
998 writeln -nonewline " "
999 }
1000 writeln -nonewline "${s}_.c"; incr i
1001 }
1002 writeln "\n"
1003 set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation]
1004 writeln -nonewline "OBJ = "
1005 set i 0
1006 foreach s [lsort [concat $src $AdditionalObj]] {
1007 if {$i > 0} {
1008 writeln " \\"
1009 writeln -nonewline " "
1010 }
1011 writeln -nonewline "\$(OX)\\$s\$O"; incr i
1012 }
1013 writeln " \\"
1014 writeln -nonewline " \$(OX)\\fossil.res\n"
 
 
 
1015 writeln {
1016 APPNAME = $(OX)\fossil$(E)
1017
1018 all: $(OX) $(APPNAME)
1019
@@ -1006,15 +1021,15 @@
1021 @echo Building zlib from "$(ZLIBDIR)"...
1022 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1023
1024 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1025 cd $(OX)
1026 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1027
1028 $(OX)\linkopts: $B\win\Makefile.msc}
1029 set redir {>}
1030 foreach s [lsort [concat $src $AdditionalObj]] {
1031 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1032 set redir {>>}
1033 }
1034 writeln "\techo \$(LIBS) >> \$@\n\n"
1035
@@ -1047,12 +1062,12 @@
1062 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1063 $(TCC) /Fo$@ -c $**
1064
1065 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1066 $** > $@
1067 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1068 $(TCC) /Fo$@ -c $**
1069
1070 page_index.h: mkindex$E $(SRC)
1071 $** > $@
1072
1073 clean:
@@ -1062,10 +1077,11 @@
1077 -del *.h
1078 -del *.map
1079 -del *.manifest
1080 -del headers
1081 -del linkopts
1082 -del *.res
1083
1084 realclean: clean
1085 -del $(APPNAME)
1086 -del translate$E
1087 -del mkindex$E
@@ -1092,10 +1108,13 @@
1108 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1109 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1110 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1111 writeln "\ttranslate\$E \$** > \$@\n"
1112 }
1113
1114 writeln "fossil.res : \$B\\win\\fossil.rc"
1115 writeln "\t\$(RCC) -fo \$@ \$**"
1116
1117 writeln "headers: makeheaders\$E page_index.h VERSION.h"
1118 writeln -nonewline "\tmakeheaders\$E "
1119 set i 0
1120 foreach s [lsort $src] {
1121
M src/makemake.tcl
+34 -15
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -308,11 +308,11 @@
308308
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309309
310310
 set opt {}
311311
 writeln {
312312
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
313
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
314314
315315
 #
316316
 # The list of all the targets that do not correspond to real files. This stops
317317
 # 'make' from getting confused when someone makes an error in a rule.
318318
 #
@@ -340,15 +340,15 @@
340340
 #
341341
 # This file is automatically generated. Instead of editing this
342342
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
343343
 # to regenerate this file.
344344
 #
345
-# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
346
-# MinGW-w64.
345
+# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
346
+# MinGW or MinGW-w64.
347347
 #
348348
349
-#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
349
+#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
350350
 # By default, this is an empty string (i.e. use the native compiler).
351351
 #
352352
 PREFIX =
353353
 # PREFIX = mingw32-
354354
 # PREFIX = i686-pc-mingw32-
@@ -694,11 +694,11 @@
694694
 ifdef FOSSIL_ENABLE_TCL
695695
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
696696
 endif
697697
698698
 zlib:
699
- make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
699
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
700700
701701
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
702702
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
703703
704704
 # This rule prevents make from using its default rules to try build
@@ -751,11 +751,11 @@
751751
 set opt $SQLITE_OPTIONS
752752
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753753
754754
 set opt {}
755755
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756
-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
756
+writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
757757
 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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758758
759759
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760760
 set opt {-Dmain=sqlite3_shell}
761761
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
@@ -959,18 +959,35 @@
959959
960960
 # zlib options
961961
 ZINCDIR = $(B)\compat\zlib
962962
 ZLIBDIR = $(B)\compat\zlib
963963
 ZLIB = zlib.lib
964
+
965
+# Uncomment to enable JSON API
966
+# FOSSIL_ENABLE_JSON = 1
967
+
968
+# Uncomment to enable markdown support
969
+# FOSSIL_ENABLE_MARKDOWN = 1
964970
965971
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
966972
967973
 CFLAGS = -nologo -MT -O2
968974
 BCC = $(CC) $(CFLAGS)
969975
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
976
+RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
970977
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
971978
 LIBDIR = -LIBPATH:$(ZLIBDIR)
979
+
980
+!ifdef FOSSIL_ENABLE_JSON
981
+TCC = $(TCC) -DFOSSIL_ENABLE_JSON
982
+RCC = $(RCC) -DFOSSIL_ENABLE_JSON
983
+!endif
984
+
985
+!ifdef FOSSIL_ENABLE_MARKDOWN
986
+TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
987
+RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
988
+!endif
972989
 }
973990
 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
974991
 set j " \\\n "
975992
 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
976993
 writeln -nonewline "SRC = "
@@ -981,24 +998,22 @@
981998
 writeln -nonewline " "
982999
 }
9831000
 writeln -nonewline "${s}_.c"; incr i
9841001
 }
9851002
 writeln "\n"
1003
+set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation]
9861004
 writeln -nonewline "OBJ = "
9871005
 set i 0
988
-foreach s [lsort $src] {
1006
+foreach s [lsort [concat $src $AdditionalObj]] {
9891007
 if {$i > 0} {
9901008
 writeln " \\"
9911009
 writeln -nonewline " "
9921010
 }
9931011
 writeln -nonewline "\$(OX)\\$s\$O"; incr i
9941012
 }
9951013
 writeln " \\"
996
-writeln " \$(OX)\\shell\$O \\"
997
-writeln " \$(OX)\\sqlite3\$O \\"
998
-writeln " \$(OX)\\th\$O \\"
999
-writeln " \$(OX)\\th_lang\$O"
1014
+writeln -nonewline " \$(OX)\\fossil.res\n"
10001015
 writeln {
10011016
 APPNAME = $(OX)\fossil$(E)
10021017
10031018
 all: $(OX) $(APPNAME)
10041019
@@ -1006,15 +1021,15 @@
10061021
 @echo Building zlib from "$(ZLIBDIR)"...
10071022
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
10081023
10091024
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
10101025
 cd $(OX)
1011
- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
1026
+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
10121027
10131028
 $(OX)\linkopts: $B\win\Makefile.msc}
10141029
 set redir {>}
1015
-foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] {
1030
+foreach s [lsort [concat $src $AdditionalObj]] {
10161031
 writeln "\techo \$(OX)\\$s.obj $redir \$@"
10171032
 set redir {>>}
10181033
 }
10191034
 writeln "\techo \$(LIBS) >> \$@\n\n"
10201035
@@ -1047,12 +1062,12 @@
10471062
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
10481063
 $(TCC) /Fo$@ -c $**
10491064
10501065
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
10511066
 $** > $@
1052
-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1053
- cp $(SRCDIR)\cson_amalgamation.h $@
1067
+$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1068
+ $(TCC) /Fo$@ -c $**
10541069
10551070
 page_index.h: mkindex$E $(SRC)
10561071
 $** > $@
10571072
10581073
 clean:
@@ -1062,10 +1077,11 @@
10621077
 -del *.h
10631078
 -del *.map
10641079
 -del *.manifest
10651080
 -del headers
10661081
 -del linkopts
1082
+ -del *.res
10671083
10681084
 realclean: clean
10691085
 -del $(APPNAME)
10701086
 -del translate$E
10711087
 -del mkindex$E
@@ -1092,10 +1108,13 @@
10921108
 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
10931109
 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
10941110
 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
10951111
 writeln "\ttranslate\$E \$** > \$@\n"
10961112
 }
1113
+
1114
+writeln "fossil.res : \$B\\win\\fossil.rc"
1115
+writeln "\t\$(RCC) -fo \$@ \$**"
10971116
10981117
 writeln "headers: makeheaders\$E page_index.h VERSION.h"
10991118
 writeln -nonewline "\tmakeheaders\$E "
11001119
 set i 0
11011120
 foreach s [lsort $src] {
11021121
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -308,11 +308,11 @@
308 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309
310 set opt {}
311 writeln {
312 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
314
315 #
316 # The list of all the targets that do not correspond to real files. This stops
317 # 'make' from getting confused when someone makes an error in a rule.
318 #
@@ -340,15 +340,15 @@
340 #
341 # This file is automatically generated. Instead of editing this
342 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
343 # to regenerate this file.
344 #
345 # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
346 # MinGW-w64.
347 #
348
349 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
350 # By default, this is an empty string (i.e. use the native compiler).
351 #
352 PREFIX =
353 # PREFIX = mingw32-
354 # PREFIX = i686-pc-mingw32-
@@ -694,11 +694,11 @@
694 ifdef FOSSIL_ENABLE_TCL
695 EXTRAOBJ += $(OBJDIR)/th_tcl.o
696 endif
697
698 zlib:
699 make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
700
701 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
702 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
703
704 # This rule prevents make from using its default rules to try build
@@ -751,11 +751,11 @@
751 set opt $SQLITE_OPTIONS
752 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753
754 set opt {}
755 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
757 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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758
759 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760 set opt {-Dmain=sqlite3_shell}
761 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
@@ -959,18 +959,35 @@
959
960 # zlib options
961 ZINCDIR = $(B)\compat\zlib
962 ZLIBDIR = $(B)\compat\zlib
963 ZLIB = zlib.lib
 
 
 
 
 
 
964
965 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
966
967 CFLAGS = -nologo -MT -O2
968 BCC = $(CC) $(CFLAGS)
969 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
 
970 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
971 LIBDIR = -LIBPATH:$(ZLIBDIR)
 
 
 
 
 
 
 
 
 
 
972 }
973 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
974 set j " \\\n "
975 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
976 writeln -nonewline "SRC = "
@@ -981,24 +998,22 @@
981 writeln -nonewline " "
982 }
983 writeln -nonewline "${s}_.c"; incr i
984 }
985 writeln "\n"
 
986 writeln -nonewline "OBJ = "
987 set i 0
988 foreach s [lsort $src] {
989 if {$i > 0} {
990 writeln " \\"
991 writeln -nonewline " "
992 }
993 writeln -nonewline "\$(OX)\\$s\$O"; incr i
994 }
995 writeln " \\"
996 writeln " \$(OX)\\shell\$O \\"
997 writeln " \$(OX)\\sqlite3\$O \\"
998 writeln " \$(OX)\\th\$O \\"
999 writeln " \$(OX)\\th_lang\$O"
1000 writeln {
1001 APPNAME = $(OX)\fossil$(E)
1002
1003 all: $(OX) $(APPNAME)
1004
@@ -1006,15 +1021,15 @@
1006 @echo Building zlib from "$(ZLIBDIR)"...
1007 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1008
1009 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1010 cd $(OX)
1011 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
1012
1013 $(OX)\linkopts: $B\win\Makefile.msc}
1014 set redir {>}
1015 foreach s [lsort [concat $src {shell sqlite3 th th_lang}]] {
1016 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1017 set redir {>>}
1018 }
1019 writeln "\techo \$(LIBS) >> \$@\n\n"
1020
@@ -1047,12 +1062,12 @@
1047 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1048 $(TCC) /Fo$@ -c $**
1049
1050 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1051 $** > $@
1052 $(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1053 cp $(SRCDIR)\cson_amalgamation.h $@
1054
1055 page_index.h: mkindex$E $(SRC)
1056 $** > $@
1057
1058 clean:
@@ -1062,10 +1077,11 @@
1062 -del *.h
1063 -del *.map
1064 -del *.manifest
1065 -del headers
1066 -del linkopts
 
1067
1068 realclean: clean
1069 -del $(APPNAME)
1070 -del translate$E
1071 -del mkindex$E
@@ -1092,10 +1108,13 @@
1092 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1093 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1094 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1095 writeln "\ttranslate\$E \$** > \$@\n"
1096 }
 
 
 
1097
1098 writeln "headers: makeheaders\$E page_index.h VERSION.h"
1099 writeln -nonewline "\tmakeheaders\$E "
1100 set i 0
1101 foreach s [lsort $src] {
1102
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -308,11 +308,11 @@
308 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n"
309
310 set opt {}
311 writeln {
312 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
313 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
314
315 #
316 # The list of all the targets that do not correspond to real files. This stops
317 # 'make' from getting confused when someone makes an error in a rule.
318 #
@@ -340,15 +340,15 @@
340 #
341 # This file is automatically generated. Instead of editing this
342 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
343 # to regenerate this file.
344 #
345 # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
346 # MinGW or MinGW-w64.
347 #
348
349 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
350 # By default, this is an empty string (i.e. use the native compiler).
351 #
352 PREFIX =
353 # PREFIX = mingw32-
354 # PREFIX = i686-pc-mingw32-
@@ -694,11 +694,11 @@
694 ifdef FOSSIL_ENABLE_TCL
695 EXTRAOBJ += $(OBJDIR)/th_tcl.o
696 endif
697
698 zlib:
699 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
700
701 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
702 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
703
704 # This rule prevents make from using its default rules to try build
@@ -751,11 +751,11 @@
751 set opt $SQLITE_OPTIONS
752 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
753
754 set opt {}
755 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
756 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
757 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_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
758
759 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
760 set opt {-Dmain=sqlite3_shell}
761 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
@@ -959,18 +959,35 @@
959
960 # zlib options
961 ZINCDIR = $(B)\compat\zlib
962 ZLIBDIR = $(B)\compat\zlib
963 ZLIB = zlib.lib
964
965 # Uncomment to enable JSON API
966 # FOSSIL_ENABLE_JSON = 1
967
968 # Uncomment to enable markdown support
969 # FOSSIL_ENABLE_MARKDOWN = 1
970
971 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
972
973 CFLAGS = -nologo -MT -O2
974 BCC = $(CC) $(CFLAGS)
975 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
976 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
977 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
978 LIBDIR = -LIBPATH:$(ZLIBDIR)
979
980 !ifdef FOSSIL_ENABLE_JSON
981 TCC = $(TCC) -DFOSSIL_ENABLE_JSON
982 RCC = $(RCC) -DFOSSIL_ENABLE_JSON
983 !endif
984
985 !ifdef FOSSIL_ENABLE_MARKDOWN
986 TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
987 RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
988 !endif
989 }
990 regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
991 set j " \\\n "
992 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
993 writeln -nonewline "SRC = "
@@ -981,24 +998,22 @@
998 writeln -nonewline " "
999 }
1000 writeln -nonewline "${s}_.c"; incr i
1001 }
1002 writeln "\n"
1003 set AdditionalObj [list shell sqlite3 th th_lang cson_amalgamation]
1004 writeln -nonewline "OBJ = "
1005 set i 0
1006 foreach s [lsort [concat $src $AdditionalObj]] {
1007 if {$i > 0} {
1008 writeln " \\"
1009 writeln -nonewline " "
1010 }
1011 writeln -nonewline "\$(OX)\\$s\$O"; incr i
1012 }
1013 writeln " \\"
1014 writeln -nonewline " \$(OX)\\fossil.res\n"
 
 
 
1015 writeln {
1016 APPNAME = $(OX)\fossil$(E)
1017
1018 all: $(OX) $(APPNAME)
1019
@@ -1006,15 +1021,15 @@
1021 @echo Building zlib from "$(ZLIBDIR)"...
1022 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1023
1024 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1025 cd $(OX)
1026 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1027
1028 $(OX)\linkopts: $B\win\Makefile.msc}
1029 set redir {>}
1030 foreach s [lsort [concat $src $AdditionalObj]] {
1031 writeln "\techo \$(OX)\\$s.obj $redir \$@"
1032 set redir {>>}
1033 }
1034 writeln "\techo \$(LIBS) >> \$@\n\n"
1035
@@ -1047,12 +1062,12 @@
1062 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
1063 $(TCC) /Fo$@ -c $**
1064
1065 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1066 $** > $@
1067 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
1068 $(TCC) /Fo$@ -c $**
1069
1070 page_index.h: mkindex$E $(SRC)
1071 $** > $@
1072
1073 clean:
@@ -1062,10 +1077,11 @@
1077 -del *.h
1078 -del *.map
1079 -del *.manifest
1080 -del headers
1081 -del linkopts
1082 -del *.res
1083
1084 realclean: clean
1085 -del $(APPNAME)
1086 -del translate$E
1087 -del mkindex$E
@@ -1092,10 +1108,13 @@
1108 writeln "\$(OX)\\$s\$O : ${s}_.c ${s}.h"
1109 writeln "\t\$(TCC) /Fo\$@ -c ${s}_.c\n"
1110 writeln "${s}_.c : \$(SRCDIR)\\$s.c"
1111 writeln "\ttranslate\$E \$** > \$@\n"
1112 }
1113
1114 writeln "fossil.res : \$B\\win\\fossil.rc"
1115 writeln "\t\$(RCC) -fo \$@ \$**"
1116
1117 writeln "headers: makeheaders\$E page_index.h VERSION.h"
1118 writeln -nonewline "\tmakeheaders\$E "
1119 set i 0
1120 foreach s [lsort $src] {
1121
M src/printf.c
+1 -1
--- src/printf.c
+++ src/printf.c
@@ -848,11 +848,11 @@
848848
 fwrite(z, 1, n, toStdErr ? stderr : stdout);
849849
 fflush(toStdErr ? stderr : stdout);
850850
 }
851851
852852
 /*
853
-** Force the the standard output cursor to move to the beginning
853
+** Force the standard output cursor to move to the beginning
854854
 ** of a line, if it is not there already.
855855
 */
856856
 void fossil_force_newline(void){
857857
 if( g.cgiOutput==0 && stdoutAtBOL==0 ) fossil_puts("\n", 0);
858858
 }
859859
--- src/printf.c
+++ src/printf.c
@@ -848,11 +848,11 @@
848 fwrite(z, 1, n, toStdErr ? stderr : stdout);
849 fflush(toStdErr ? stderr : stdout);
850 }
851
852 /*
853 ** Force the the standard output cursor to move to the beginning
854 ** of a line, if it is not there already.
855 */
856 void fossil_force_newline(void){
857 if( g.cgiOutput==0 && stdoutAtBOL==0 ) fossil_puts("\n", 0);
858 }
859
--- src/printf.c
+++ src/printf.c
@@ -848,11 +848,11 @@
848 fwrite(z, 1, n, toStdErr ? stderr : stdout);
849 fflush(toStdErr ? stderr : stdout);
850 }
851
852 /*
853 ** Force the standard output cursor to move to the beginning
854 ** of a line, if it is not there already.
855 */
856 void fossil_force_newline(void){
857 if( g.cgiOutput==0 && stdoutAtBOL==0 ) fossil_puts("\n", 0);
858 }
859
M src/printf.c
+1 -1
--- src/printf.c
+++ src/printf.c
@@ -848,11 +848,11 @@
848848
 fwrite(z, 1, n, toStdErr ? stderr : stdout);
849849
 fflush(toStdErr ? stderr : stdout);
850850
 }
851851
852852
 /*
853
-** Force the the standard output cursor to move to the beginning
853
+** Force the standard output cursor to move to the beginning
854854
 ** of a line, if it is not there already.
855855
 */
856856
 void fossil_force_newline(void){
857857
 if( g.cgiOutput==0 && stdoutAtBOL==0 ) fossil_puts("\n", 0);
858858
 }
859859
--- src/printf.c
+++ src/printf.c
@@ -848,11 +848,11 @@
848 fwrite(z, 1, n, toStdErr ? stderr : stdout);
849 fflush(toStdErr ? stderr : stdout);
850 }
851
852 /*
853 ** Force the the standard output cursor to move to the beginning
854 ** of a line, if it is not there already.
855 */
856 void fossil_force_newline(void){
857 if( g.cgiOutput==0 && stdoutAtBOL==0 ) fossil_puts("\n", 0);
858 }
859
--- src/printf.c
+++ src/printf.c
@@ -848,11 +848,11 @@
848 fwrite(z, 1, n, toStdErr ? stderr : stdout);
849 fflush(toStdErr ? stderr : stdout);
850 }
851
852 /*
853 ** Force the standard output cursor to move to the beginning
854 ** of a line, if it is not there already.
855 */
856 void fossil_force_newline(void){
857 if( g.cgiOutput==0 && stdoutAtBOL==0 ) fossil_puts("\n", 0);
858 }
859
M src/stat.c
+8 -1
--- src/stat.c
+++ src/stat.c
@@ -140,11 +140,18 @@
140140
 }
141141
142142
 /*
143143
 ** COMMAND: dbstat*
144144
 **
145
-** Show statistics and global information about the repository.
145
+** Usage: %fossil dbstat ?-brief | -b?
146
+**
147
+** Shows statistics and global information about the repository.
148
+**
149
+** The (-brief|-b) option removes any "long-running" statistics, namely
150
+** those whose calculations are known to slow down as the repository
151
+** grows.
152
+**
146153
 */
147154
 void dbstat_cmd(void){
148155
 i64 t, fsize;
149156
 int n, m;
150157
 int szMax, szAvg;
151158
--- src/stat.c
+++ src/stat.c
@@ -140,11 +140,18 @@
140 }
141
142 /*
143 ** COMMAND: dbstat*
144 **
145 ** Show statistics and global information about the repository.
 
 
 
 
 
 
 
146 */
147 void dbstat_cmd(void){
148 i64 t, fsize;
149 int n, m;
150 int szMax, szAvg;
151
--- src/stat.c
+++ src/stat.c
@@ -140,11 +140,18 @@
140 }
141
142 /*
143 ** COMMAND: dbstat*
144 **
145 ** Usage: %fossil dbstat ?-brief | -b?
146 **
147 ** Shows statistics and global information about the repository.
148 **
149 ** The (-brief|-b) option removes any "long-running" statistics, namely
150 ** those whose calculations are known to slow down as the repository
151 ** grows.
152 **
153 */
154 void dbstat_cmd(void){
155 i64 t, fsize;
156 int n, m;
157 int szMax, szAvg;
158
M src/stat.c
+8 -1
--- src/stat.c
+++ src/stat.c
@@ -140,11 +140,18 @@
140140
 }
141141
142142
 /*
143143
 ** COMMAND: dbstat*
144144
 **
145
-** Show statistics and global information about the repository.
145
+** Usage: %fossil dbstat ?-brief | -b?
146
+**
147
+** Shows statistics and global information about the repository.
148
+**
149
+** The (-brief|-b) option removes any "long-running" statistics, namely
150
+** those whose calculations are known to slow down as the repository
151
+** grows.
152
+**
146153
 */
147154
 void dbstat_cmd(void){
148155
 i64 t, fsize;
149156
 int n, m;
150157
 int szMax, szAvg;
151158
--- src/stat.c
+++ src/stat.c
@@ -140,11 +140,18 @@
140 }
141
142 /*
143 ** COMMAND: dbstat*
144 **
145 ** Show statistics and global information about the repository.
 
 
 
 
 
 
 
146 */
147 void dbstat_cmd(void){
148 i64 t, fsize;
149 int n, m;
150 int szMax, szAvg;
151
--- src/stat.c
+++ src/stat.c
@@ -140,11 +140,18 @@
140 }
141
142 /*
143 ** COMMAND: dbstat*
144 **
145 ** Usage: %fossil dbstat ?-brief | -b?
146 **
147 ** Shows statistics and global information about the repository.
148 **
149 ** The (-brief|-b) option removes any "long-running" statistics, namely
150 ** those whose calculations are known to slow down as the repository
151 ** grows.
152 **
153 */
154 void dbstat_cmd(void){
155 i64 t, fsize;
156 int n, m;
157 int szMax, szAvg;
158
M src/update.c
+25 -6
--- src/update.c
+++ src/update.c
@@ -667,10 +667,13 @@
667667
 ** Usage: %fossil revert ?-r REVISION? ?FILE ...?
668668
 **
669669
 ** Revert to the current repository version of FILE, or to
670670
 ** the version associated with baseline REVISION if the -r flag
671671
 ** appears.
672
+**
673
+** If FILE was part of a rename operation, both the original file
674
+** and the renamed file are reverted.
672675
 **
673676
 ** Revert all files if no file name is provided.
674677
 **
675678
 ** If a file is reverted accidently, it can be restored using
676679
 ** the "fossil undo" command.
@@ -706,11 +709,22 @@
706709
 if( g.argc>2 ){
707710
 for(i=2; i<g.argc; i++){
708711
 Blob fname;
709712
 zFile = mprintf("%/", g.argv[i]);
710713
 file_tree_name(zFile, &fname, 1);
711
- db_multi_exec("REPLACE INTO torevert VALUES(%B)", &fname);
714
+ db_multi_exec(
715
+ "REPLACE INTO torevert VALUES(%B);"
716
+ "INSERT OR IGNORE INTO torevert"
717
+ " SELECT pathname"
718
+ " FROM vfile"
719
+ " WHERE origname IN(%B)"
720
+ " UNION ALL"
721
+ " SELECT origname"
722
+ " FROM vfile"
723
+ " WHERE pathname IN(%B) AND origname IS NOT NULL;",
724
+ &fname, &fname, &fname
725
+ );
712726
 blob_reset(&fname);
713727
 }
714728
 }else{
715729
 int vid;
716730
 vid = db_lget_int("checkout", 0);
@@ -748,11 +762,17 @@
748762
 }else{
749763
 undo_save(zFile);
750764
 file_delete(zFull);
751765
 fossil_print("DELETE: %s\n", zFile);
752766
 }
753
- db_multi_exec("DELETE FROM vfile WHERE pathname=%Q", zFile);
767
+ db_multi_exec(
768
+ "UPDATE vfile"
769
+ " SET pathname=origname, origname=NULL"
770
+ " WHERE pathname=%Q AND origname!=pathname AND origname IS NOT NULL;"
771
+ "DELETE FROM vfile WHERE pathname=%Q",
772
+ zFile, zFile
773
+ );
754774
 }else{
755775
 sqlite3_int64 mtime;
756776
 undo_save(zFile);
757777
 if( file_wd_size(zFull)>=0 && (isLink || file_wd_islink(zFull)) ){
758778
 file_delete(zFull);
@@ -765,18 +785,17 @@
765785
 file_wd_setexe(zFull, isExe);
766786
 fossil_print("REVERTED: %s\n", zFile);
767787
 mtime = file_wd_mtime(zFull);
768788
 db_multi_exec(
769789
 "UPDATE vfile"
770
- " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid,"
771
- " pathname=coalesce(origname,pathname), origname=NULL"
772
- " WHERE pathname=%Q",
773
- mtime, isExe, isLink, zFile
790
+ " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
791
+ " WHERE pathname=%Q OR origname=%Q",
792
+ mtime, isExe, isLink, zFile, zFile
774793
 );
775794
 }
776795
 blob_reset(&record);
777796
 free(zFull);
778797
 }
779798
 db_finalize(&q);
780799
 undo_finish();
781800
 db_end_transaction(0);
782801
 }
783802
784803
ADDED test/revert.test
--- src/update.c
+++ src/update.c
@@ -667,10 +667,13 @@
667 ** Usage: %fossil revert ?-r REVISION? ?FILE ...?
668 **
669 ** Revert to the current repository version of FILE, or to
670 ** the version associated with baseline REVISION if the -r flag
671 ** appears.
 
 
 
672 **
673 ** Revert all files if no file name is provided.
674 **
675 ** If a file is reverted accidently, it can be restored using
676 ** the "fossil undo" command.
@@ -706,11 +709,22 @@
706 if( g.argc>2 ){
707 for(i=2; i<g.argc; i++){
708 Blob fname;
709 zFile = mprintf("%/", g.argv[i]);
710 file_tree_name(zFile, &fname, 1);
711 db_multi_exec("REPLACE INTO torevert VALUES(%B)", &fname);
 
 
 
 
 
 
 
 
 
 
 
712 blob_reset(&fname);
713 }
714 }else{
715 int vid;
716 vid = db_lget_int("checkout", 0);
@@ -748,11 +762,17 @@
748 }else{
749 undo_save(zFile);
750 file_delete(zFull);
751 fossil_print("DELETE: %s\n", zFile);
752 }
753 db_multi_exec("DELETE FROM vfile WHERE pathname=%Q", zFile);
 
 
 
 
 
 
754 }else{
755 sqlite3_int64 mtime;
756 undo_save(zFile);
757 if( file_wd_size(zFull)>=0 && (isLink || file_wd_islink(zFull)) ){
758 file_delete(zFull);
@@ -765,18 +785,17 @@
765 file_wd_setexe(zFull, isExe);
766 fossil_print("REVERTED: %s\n", zFile);
767 mtime = file_wd_mtime(zFull);
768 db_multi_exec(
769 "UPDATE vfile"
770 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid,"
771 " pathname=coalesce(origname,pathname), origname=NULL"
772 " WHERE pathname=%Q",
773 mtime, isExe, isLink, zFile
774 );
775 }
776 blob_reset(&record);
777 free(zFull);
778 }
779 db_finalize(&q);
780 undo_finish();
781 db_end_transaction(0);
782 }
783
784 DDED test/revert.test
--- src/update.c
+++ src/update.c
@@ -667,10 +667,13 @@
667 ** Usage: %fossil revert ?-r REVISION? ?FILE ...?
668 **
669 ** Revert to the current repository version of FILE, or to
670 ** the version associated with baseline REVISION if the -r flag
671 ** appears.
672 **
673 ** If FILE was part of a rename operation, both the original file
674 ** and the renamed file are reverted.
675 **
676 ** Revert all files if no file name is provided.
677 **
678 ** If a file is reverted accidently, it can be restored using
679 ** the "fossil undo" command.
@@ -706,11 +709,22 @@
709 if( g.argc>2 ){
710 for(i=2; i<g.argc; i++){
711 Blob fname;
712 zFile = mprintf("%/", g.argv[i]);
713 file_tree_name(zFile, &fname, 1);
714 db_multi_exec(
715 "REPLACE INTO torevert VALUES(%B);"
716 "INSERT OR IGNORE INTO torevert"
717 " SELECT pathname"
718 " FROM vfile"
719 " WHERE origname IN(%B)"
720 " UNION ALL"
721 " SELECT origname"
722 " FROM vfile"
723 " WHERE pathname IN(%B) AND origname IS NOT NULL;",
724 &fname, &fname, &fname
725 );
726 blob_reset(&fname);
727 }
728 }else{
729 int vid;
730 vid = db_lget_int("checkout", 0);
@@ -748,11 +762,17 @@
762 }else{
763 undo_save(zFile);
764 file_delete(zFull);
765 fossil_print("DELETE: %s\n", zFile);
766 }
767 db_multi_exec(
768 "UPDATE vfile"
769 " SET pathname=origname, origname=NULL"
770 " WHERE pathname=%Q AND origname!=pathname AND origname IS NOT NULL;"
771 "DELETE FROM vfile WHERE pathname=%Q",
772 zFile, zFile
773 );
774 }else{
775 sqlite3_int64 mtime;
776 undo_save(zFile);
777 if( file_wd_size(zFull)>=0 && (isLink || file_wd_islink(zFull)) ){
778 file_delete(zFull);
@@ -765,18 +785,17 @@
785 file_wd_setexe(zFull, isExe);
786 fossil_print("REVERTED: %s\n", zFile);
787 mtime = file_wd_mtime(zFull);
788 db_multi_exec(
789 "UPDATE vfile"
790 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
791 " WHERE pathname=%Q OR origname=%Q",
792 mtime, isExe, isLink, zFile, zFile
 
793 );
794 }
795 blob_reset(&record);
796 free(zFull);
797 }
798 db_finalize(&q);
799 undo_finish();
800 db_end_transaction(0);
801 }
802
803 DDED test/revert.test
M src/update.c
+25 -6
--- src/update.c
+++ src/update.c
@@ -667,10 +667,13 @@
667667
 ** Usage: %fossil revert ?-r REVISION? ?FILE ...?
668668
 **
669669
 ** Revert to the current repository version of FILE, or to
670670
 ** the version associated with baseline REVISION if the -r flag
671671
 ** appears.
672
+**
673
+** If FILE was part of a rename operation, both the original file
674
+** and the renamed file are reverted.
672675
 **
673676
 ** Revert all files if no file name is provided.
674677
 **
675678
 ** If a file is reverted accidently, it can be restored using
676679
 ** the "fossil undo" command.
@@ -706,11 +709,22 @@
706709
 if( g.argc>2 ){
707710
 for(i=2; i<g.argc; i++){
708711
 Blob fname;
709712
 zFile = mprintf("%/", g.argv[i]);
710713
 file_tree_name(zFile, &fname, 1);
711
- db_multi_exec("REPLACE INTO torevert VALUES(%B)", &fname);
714
+ db_multi_exec(
715
+ "REPLACE INTO torevert VALUES(%B);"
716
+ "INSERT OR IGNORE INTO torevert"
717
+ " SELECT pathname"
718
+ " FROM vfile"
719
+ " WHERE origname IN(%B)"
720
+ " UNION ALL"
721
+ " SELECT origname"
722
+ " FROM vfile"
723
+ " WHERE pathname IN(%B) AND origname IS NOT NULL;",
724
+ &fname, &fname, &fname
725
+ );
712726
 blob_reset(&fname);
713727
 }
714728
 }else{
715729
 int vid;
716730
 vid = db_lget_int("checkout", 0);
@@ -748,11 +762,17 @@
748762
 }else{
749763
 undo_save(zFile);
750764
 file_delete(zFull);
751765
 fossil_print("DELETE: %s\n", zFile);
752766
 }
753
- db_multi_exec("DELETE FROM vfile WHERE pathname=%Q", zFile);
767
+ db_multi_exec(
768
+ "UPDATE vfile"
769
+ " SET pathname=origname, origname=NULL"
770
+ " WHERE pathname=%Q AND origname!=pathname AND origname IS NOT NULL;"
771
+ "DELETE FROM vfile WHERE pathname=%Q",
772
+ zFile, zFile
773
+ );
754774
 }else{
755775
 sqlite3_int64 mtime;
756776
 undo_save(zFile);
757777
 if( file_wd_size(zFull)>=0 && (isLink || file_wd_islink(zFull)) ){
758778
 file_delete(zFull);
@@ -765,18 +785,17 @@
765785
 file_wd_setexe(zFull, isExe);
766786
 fossil_print("REVERTED: %s\n", zFile);
767787
 mtime = file_wd_mtime(zFull);
768788
 db_multi_exec(
769789
 "UPDATE vfile"
770
- " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid,"
771
- " pathname=coalesce(origname,pathname), origname=NULL"
772
- " WHERE pathname=%Q",
773
- mtime, isExe, isLink, zFile
790
+ " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
791
+ " WHERE pathname=%Q OR origname=%Q",
792
+ mtime, isExe, isLink, zFile, zFile
774793
 );
775794
 }
776795
 blob_reset(&record);
777796
 free(zFull);
778797
 }
779798
 db_finalize(&q);
780799
 undo_finish();
781800
 db_end_transaction(0);
782801
 }
783802
784803
ADDED test/revert.test
--- src/update.c
+++ src/update.c
@@ -667,10 +667,13 @@
667 ** Usage: %fossil revert ?-r REVISION? ?FILE ...?
668 **
669 ** Revert to the current repository version of FILE, or to
670 ** the version associated with baseline REVISION if the -r flag
671 ** appears.
 
 
 
672 **
673 ** Revert all files if no file name is provided.
674 **
675 ** If a file is reverted accidently, it can be restored using
676 ** the "fossil undo" command.
@@ -706,11 +709,22 @@
706 if( g.argc>2 ){
707 for(i=2; i<g.argc; i++){
708 Blob fname;
709 zFile = mprintf("%/", g.argv[i]);
710 file_tree_name(zFile, &fname, 1);
711 db_multi_exec("REPLACE INTO torevert VALUES(%B)", &fname);
 
 
 
 
 
 
 
 
 
 
 
712 blob_reset(&fname);
713 }
714 }else{
715 int vid;
716 vid = db_lget_int("checkout", 0);
@@ -748,11 +762,17 @@
748 }else{
749 undo_save(zFile);
750 file_delete(zFull);
751 fossil_print("DELETE: %s\n", zFile);
752 }
753 db_multi_exec("DELETE FROM vfile WHERE pathname=%Q", zFile);
 
 
 
 
 
 
754 }else{
755 sqlite3_int64 mtime;
756 undo_save(zFile);
757 if( file_wd_size(zFull)>=0 && (isLink || file_wd_islink(zFull)) ){
758 file_delete(zFull);
@@ -765,18 +785,17 @@
765 file_wd_setexe(zFull, isExe);
766 fossil_print("REVERTED: %s\n", zFile);
767 mtime = file_wd_mtime(zFull);
768 db_multi_exec(
769 "UPDATE vfile"
770 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid,"
771 " pathname=coalesce(origname,pathname), origname=NULL"
772 " WHERE pathname=%Q",
773 mtime, isExe, isLink, zFile
774 );
775 }
776 blob_reset(&record);
777 free(zFull);
778 }
779 db_finalize(&q);
780 undo_finish();
781 db_end_transaction(0);
782 }
783
784 DDED test/revert.test
--- src/update.c
+++ src/update.c
@@ -667,10 +667,13 @@
667 ** Usage: %fossil revert ?-r REVISION? ?FILE ...?
668 **
669 ** Revert to the current repository version of FILE, or to
670 ** the version associated with baseline REVISION if the -r flag
671 ** appears.
672 **
673 ** If FILE was part of a rename operation, both the original file
674 ** and the renamed file are reverted.
675 **
676 ** Revert all files if no file name is provided.
677 **
678 ** If a file is reverted accidently, it can be restored using
679 ** the "fossil undo" command.
@@ -706,11 +709,22 @@
709 if( g.argc>2 ){
710 for(i=2; i<g.argc; i++){
711 Blob fname;
712 zFile = mprintf("%/", g.argv[i]);
713 file_tree_name(zFile, &fname, 1);
714 db_multi_exec(
715 "REPLACE INTO torevert VALUES(%B);"
716 "INSERT OR IGNORE INTO torevert"
717 " SELECT pathname"
718 " FROM vfile"
719 " WHERE origname IN(%B)"
720 " UNION ALL"
721 " SELECT origname"
722 " FROM vfile"
723 " WHERE pathname IN(%B) AND origname IS NOT NULL;",
724 &fname, &fname, &fname
725 );
726 blob_reset(&fname);
727 }
728 }else{
729 int vid;
730 vid = db_lget_int("checkout", 0);
@@ -748,11 +762,17 @@
762 }else{
763 undo_save(zFile);
764 file_delete(zFull);
765 fossil_print("DELETE: %s\n", zFile);
766 }
767 db_multi_exec(
768 "UPDATE vfile"
769 " SET pathname=origname, origname=NULL"
770 " WHERE pathname=%Q AND origname!=pathname AND origname IS NOT NULL;"
771 "DELETE FROM vfile WHERE pathname=%Q",
772 zFile, zFile
773 );
774 }else{
775 sqlite3_int64 mtime;
776 undo_save(zFile);
777 if( file_wd_size(zFull)>=0 && (isLink || file_wd_islink(zFull)) ){
778 file_delete(zFull);
@@ -765,18 +785,17 @@
785 file_wd_setexe(zFull, isExe);
786 fossil_print("REVERTED: %s\n", zFile);
787 mtime = file_wd_mtime(zFull);
788 db_multi_exec(
789 "UPDATE vfile"
790 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
791 " WHERE pathname=%Q OR origname=%Q",
792 mtime, isExe, isLink, zFile, zFile
 
793 );
794 }
795 blob_reset(&record);
796 free(zFull);
797 }
798 db_finalize(&q);
799 undo_finish();
800 db_end_transaction(0);
801 }
802
803 DDED test/revert.test
M test/revert.test
+26
--- a/test/revert.test
+++ b/test/revert.test
@@ -0,0 +1,26 @@
1
+puts res=$# Fossil will write dexec rm f1po_init# Copytcatch {exec $::exec mvitory} $res]} {
2
+ puts stderr "Cannot ris test within anif {[llength $args] % 2} {
3
+ set revertArgs [lindex $args 0]
4
+ set args [lrange $args 1 end]
5
+ } else {
6
+ set revertArgs {}
7
+ }VERTED: f3
8
+ DELETE:j@Uy,1X@Se,4:: f0G@YW,21@UT,3:ED:1w@WW,3:ED:3t@YT,G:ED: f3
9
+ DELETE:K@hF,O@YG:ED: f3
10
+ DELETE:K@hF,O@Yl,1
11
+ DELETE:a@nd,1WvoIq;-testnormalize-status-list]
12
+ set r]
13
+ if {$result ne $expected} {
14
+ set passed 0
15
+ protOut " Expected:\n [join $expected "\n "]"
16
+ protOut " Got:\n [joh {exec $::fossilexe info} res
17
+if {![regexp {use --repository} $res]} {
18
+ puts stderr "Cannot run this test within an open checkout"
19
+ return
20
+}
21
+repo_init# Copytcatch {exec $::fossilexe info} res
22
+if {![regexp {use --repository} $res]} {
23
+ puts stderr "Cannot run this test witt# Copytcatch {exec $::fossilexe info} res
24
+if {![regexp {use --repository} $res]} {
25
+ put12 f03 f1 {exec $::fossilexe info}t# Copytcatch {exec $::foss4 f2 {exec $::ft# Copytcatch {exec $::foss5 f3 {exec $::fossilexe info} res
26
+if {![re
--- a/test/revert.test
+++ b/test/revert.test
@@ -0,0 +1,26 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/test/revert.test
+++ b/test/revert.test
@@ -0,0 +1,26 @@
1 puts res=$# Fossil will write dexec rm f1po_init# Copytcatch {exec $::exec mvitory} $res]} {
2 puts stderr "Cannot ris test within anif {[llength $args] % 2} {
3 set revertArgs [lindex $args 0]
4 set args [lrange $args 1 end]
5 } else {
6 set revertArgs {}
7 }VERTED: f3
8 DELETE:j@Uy,1X@Se,4:: f0G@YW,21@UT,3:ED:1w@WW,3:ED:3t@YT,G:ED: f3
9 DELETE:K@hF,O@YG:ED: f3
10 DELETE:K@hF,O@Yl,1
11 DELETE:a@nd,1WvoIq;-testnormalize-status-list]
12 set r]
13 if {$result ne $expected} {
14 set passed 0
15 protOut " Expected:\n [join $expected "\n "]"
16 protOut " Got:\n [joh {exec $::fossilexe info} res
17 if {![regexp {use --repository} $res]} {
18 puts stderr "Cannot run this test within an open checkout"
19 return
20 }
21 repo_init# Copytcatch {exec $::fossilexe info} res
22 if {![regexp {use --repository} $res]} {
23 puts stderr "Cannot run this test witt# Copytcatch {exec $::fossilexe info} res
24 if {![regexp {use --repository} $res]} {
25 put12 f03 f1 {exec $::fossilexe info}t# Copytcatch {exec $::foss4 f2 {exec $::ft# Copytcatch {exec $::foss5 f3 {exec $::fossilexe info} res
26 if {![re
M test/revert.test
+26
--- a/test/revert.test
+++ b/test/revert.test
@@ -0,0 +1,26 @@
1
+puts res=$# Fossil will write dexec rm f1po_init# Copytcatch {exec $::exec mvitory} $res]} {
2
+ puts stderr "Cannot ris test within anif {[llength $args] % 2} {
3
+ set revertArgs [lindex $args 0]
4
+ set args [lrange $args 1 end]
5
+ } else {
6
+ set revertArgs {}
7
+ }VERTED: f3
8
+ DELETE:j@Uy,1X@Se,4:: f0G@YW,21@UT,3:ED:1w@WW,3:ED:3t@YT,G:ED: f3
9
+ DELETE:K@hF,O@YG:ED: f3
10
+ DELETE:K@hF,O@Yl,1
11
+ DELETE:a@nd,1WvoIq;-testnormalize-status-list]
12
+ set r]
13
+ if {$result ne $expected} {
14
+ set passed 0
15
+ protOut " Expected:\n [join $expected "\n "]"
16
+ protOut " Got:\n [joh {exec $::fossilexe info} res
17
+if {![regexp {use --repository} $res]} {
18
+ puts stderr "Cannot run this test within an open checkout"
19
+ return
20
+}
21
+repo_init# Copytcatch {exec $::fossilexe info} res
22
+if {![regexp {use --repository} $res]} {
23
+ puts stderr "Cannot run this test witt# Copytcatch {exec $::fossilexe info} res
24
+if {![regexp {use --repository} $res]} {
25
+ put12 f03 f1 {exec $::fossilexe info}t# Copytcatch {exec $::foss4 f2 {exec $::ft# Copytcatch {exec $::foss5 f3 {exec $::fossilexe info} res
26
+if {![re
--- a/test/revert.test
+++ b/test/revert.test
@@ -0,0 +1,26 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/test/revert.test
+++ b/test/revert.test
@@ -0,0 +1,26 @@
1 puts res=$# Fossil will write dexec rm f1po_init# Copytcatch {exec $::exec mvitory} $res]} {
2 puts stderr "Cannot ris test within anif {[llength $args] % 2} {
3 set revertArgs [lindex $args 0]
4 set args [lrange $args 1 end]
5 } else {
6 set revertArgs {}
7 }VERTED: f3
8 DELETE:j@Uy,1X@Se,4:: f0G@YW,21@UT,3:ED:1w@WW,3:ED:3t@YT,G:ED: f3
9 DELETE:K@hF,O@YG:ED: f3
10 DELETE:K@hF,O@Yl,1
11 DELETE:a@nd,1WvoIq;-testnormalize-status-list]
12 set r]
13 if {$result ne $expected} {
14 set passed 0
15 protOut " Expected:\n [join $expected "\n "]"
16 protOut " Got:\n [joh {exec $::fossilexe info} res
17 if {![regexp {use --repository} $res]} {
18 puts stderr "Cannot run this test within an open checkout"
19 return
20 }
21 repo_init# Copytcatch {exec $::fossilexe info} res
22 if {![regexp {use --repository} $res]} {
23 puts stderr "Cannot run this test witt# Copytcatch {exec $::fossilexe info} res
24 if {![regexp {use --repository} $res]} {
25 put12 f03 f1 {exec $::fossilexe info}t# Copytcatch {exec $::foss4 f2 {exec $::ft# Copytcatch {exec $::foss5 f3 {exec $::fossilexe info} res
26 if {![re
M win/Makefile.mingw
+5 -5
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -6,15 +6,15 @@
66
 #
77
 # This file is automatically generated. Instead of editing this
88
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
99
 # to regenerate this file.
1010
 #
11
-# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
12
-# MinGW-w64.
11
+# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
12
+# MinGW or MinGW-w64.
1313
 #
1414
15
-#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
15
+#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
1818
 PREFIX =
1919
 # PREFIX = mingw32-
2020
 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657657
 ifdef FOSSIL_ENABLE_TCL
658658
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659659
 endif
660660
661661
 zlib:
662
- make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663663
664664
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665665
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666666
667667
 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
16331633
16341634
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
16351635
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
16361636
16371637
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1638
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16391639
16401640
 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
16411641
16421642
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
16431643
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
16441644
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -6,15 +6,15 @@
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
10 #
11 # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
12 # MinGW-w64.
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657 ifdef FOSSIL_ENABLE_TCL
658 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659 endif
660
661 zlib:
662 make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663
664 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666
667 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
1633
1634 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1639
1640 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -6,15 +6,15 @@
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
10 #
11 # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
12 # MinGW or MinGW-w64.
13 #
14
15 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657 ifdef FOSSIL_ENABLE_TCL
658 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659 endif
660
661 zlib:
662 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663
664 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666
667 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
1633
1634 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1639
1640 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644
M win/Makefile.mingw
+5 -5
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -6,15 +6,15 @@
66
 #
77
 # This file is automatically generated. Instead of editing this
88
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
99
 # to regenerate this file.
1010
 #
11
-# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
12
-# MinGW-w64.
11
+# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
12
+# MinGW or MinGW-w64.
1313
 #
1414
15
-#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
15
+#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
1818
 PREFIX =
1919
 # PREFIX = mingw32-
2020
 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657657
 ifdef FOSSIL_ENABLE_TCL
658658
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659659
 endif
660660
661661
 zlib:
662
- make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663663
664664
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665665
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666666
667667
 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
16331633
16341634
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
16351635
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
16361636
16371637
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1638
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16391639
16401640
 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
16411641
16421642
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
16431643
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
16441644
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -6,15 +6,15 @@
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
10 #
11 # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
12 # MinGW-w64.
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657 ifdef FOSSIL_ENABLE_TCL
658 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659 endif
660
661 zlib:
662 make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663
664 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666
667 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
1633
1634 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1639
1640 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -6,15 +6,15 @@
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
10 #
11 # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
12 # MinGW or MinGW-w64.
13 #
14
15 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657 ifdef FOSSIL_ENABLE_TCL
658 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659 endif
660
661 zlib:
662 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663
664 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666
667 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
1633
1634 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1639
1640 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644
M win/Makefile.mingw.mistachkin
+5 -5
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -6,15 +6,15 @@
66
 #
77
 # This file is automatically generated. Instead of editing this
88
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
99
 # to regenerate this file.
1010
 #
11
-# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
12
-# MinGW-w64.
11
+# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
12
+# MinGW or MinGW-w64.
1313
 #
1414
15
-#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
15
+#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
1818
 PREFIX =
1919
 # PREFIX = mingw32-
2020
 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657657
 ifdef FOSSIL_ENABLE_TCL
658658
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659659
 endif
660660
661661
 zlib:
662
- make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663663
664664
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665665
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666666
667667
 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
16331633
16341634
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
16351635
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
16361636
16371637
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1638
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16391639
16401640
 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
16411641
16421642
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
16431643
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
16441644
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -6,15 +6,15 @@
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
10 #
11 # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
12 # MinGW-w64.
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657 ifdef FOSSIL_ENABLE_TCL
658 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659 endif
660
661 zlib:
662 make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663
664 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666
667 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
1633
1634 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1639
1640 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -6,15 +6,15 @@
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
10 #
11 # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
12 # MinGW or MinGW-w64.
13 #
14
15 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657 ifdef FOSSIL_ENABLE_TCL
658 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659 endif
660
661 zlib:
662 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663
664 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666
667 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
1633
1634 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1639
1640 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644
M win/Makefile.mingw.mistachkin
+5 -5
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -6,15 +6,15 @@
66
 #
77
 # This file is automatically generated. Instead of editing this
88
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
99
 # to regenerate this file.
1010
 #
11
-# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
12
-# MinGW-w64.
11
+# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
12
+# MinGW or MinGW-w64.
1313
 #
1414
15
-#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
15
+#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
1818
 PREFIX =
1919
 # PREFIX = mingw32-
2020
 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657657
 ifdef FOSSIL_ENABLE_TCL
658658
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659659
 endif
660660
661661
 zlib:
662
- make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663663
664664
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665665
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666666
667667
 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
16331633
16341634
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
16351635
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
16361636
16371637
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1638
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16391639
16401640
 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
16411641
16421642
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
16431643
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
16441644
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -6,15 +6,15 @@
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
10 #
11 # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
12 # MinGW-w64.
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657 ifdef FOSSIL_ENABLE_TCL
658 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659 endif
660
661 zlib:
662 make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663
664 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666
667 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
1633
1634 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1639
1640 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -6,15 +6,15 @@
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
10 #
11 # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using
12 # MinGW or MinGW-w64.
13 #
14
15 #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
@@ -657,11 +657,11 @@
657 ifdef FOSSIL_ENABLE_TCL
658 EXTRAOBJ += $(OBJDIR)/th_tcl.o
659 endif
660
661 zlib:
662 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
663
664 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
665 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
666
667 # This rule prevents make from using its default rules to try build
@@ -1633,11 +1633,11 @@
1633
1634 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1636
1637 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1638 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1639
1640 $(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_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1641
1642 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1643 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1644
M win/Makefile.msc
+30 -7
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -22,18 +22,35 @@
2222
2323
 # zlib options
2424
 ZINCDIR = $(B)\compat\zlib
2525
 ZLIBDIR = $(B)\compat\zlib
2626
 ZLIB = zlib.lib
27
+
28
+# Uncomment to enable JSON API
29
+# FOSSIL_ENABLE_JSON = 1
30
+
31
+# Uncomment to enable markdown support
32
+# FOSSIL_ENABLE_MARKDOWN = 1
2733
2834
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
2935
3036
 CFLAGS = -nologo -MT -O2
3137
 BCC = $(CC) $(CFLAGS)
3238
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
39
+RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
3340
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
3441
 LIBDIR = -LIBPATH:$(ZLIBDIR)
42
+
43
+!ifdef FOSSIL_ENABLE_JSON
44
+TCC = $(TCC) -DFOSSIL_ENABLE_JSON
45
+RCC = $(RCC) -DFOSSIL_ENABLE_JSON
46
+!endif
47
+
48
+!ifdef FOSSIL_ENABLE_MARKDOWN
49
+TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
50
+RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
51
+!endif
3552
3653
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
3754
 /DSQLITE_THREADSAFE=0 \
3855
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
3956
 /DSQLITE_ENABLE_STAT3 \
@@ -160,10 +177,11 @@
160177
 $(OX)\clearsign$O \
161178
 $(OX)\clone$O \
162179
 $(OX)\comformat$O \
163180
 $(OX)\configure$O \
164181
 $(OX)\content$O \
182
+ $(OX)\cson_amalgamation$O \
165183
 $(OX)\db$O \
166184
 $(OX)\delta$O \
167185
 $(OX)\deltacmd$O \
168186
 $(OX)\descendants$O \
169187
 $(OX)\diff$O \
@@ -219,19 +237,23 @@
219237
 $(OX)\rss$O \
220238
 $(OX)\schema$O \
221239
 $(OX)\search$O \
222240
 $(OX)\setup$O \
223241
 $(OX)\sha1$O \
242
+ $(OX)\shell$O \
224243
 $(OX)\shun$O \
225244
 $(OX)\skins$O \
226245
 $(OX)\sqlcmd$O \
246
+ $(OX)\sqlite3$O \
227247
 $(OX)\stash$O \
228248
 $(OX)\stat$O \
229249
 $(OX)\style$O \
230250
 $(OX)\sync$O \
231251
 $(OX)\tag$O \
232252
 $(OX)\tar$O \
253
+ $(OX)\th$O \
254
+ $(OX)\th_lang$O \
233255
 $(OX)\th_main$O \
234256
 $(OX)\timeline$O \
235257
 $(OX)\tkt$O \
236258
 $(OX)\tktsetup$O \
237259
 $(OX)\undo$O \
@@ -247,14 +269,11 @@
247269
 $(OX)\winhttp$O \
248270
 $(OX)\wysiwyg$O \
249271
 $(OX)\xfer$O \
250272
 $(OX)\xfersetup$O \
251273
 $(OX)\zip$O \
252
- $(OX)\shell$O \
253
- $(OX)\sqlite3$O \
254
- $(OX)\th$O \
255
- $(OX)\th_lang$O
274
+ $(OX)\fossil.res
256275
257276
 APPNAME = $(OX)\fossil$(E)
258277
259278
 all: $(OX) $(APPNAME)
260279
@@ -262,11 +281,11 @@
262281
 @echo Building zlib from "$(ZLIBDIR)"...
263282
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
264283
265284
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
266285
 cd $(OX)
267
- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
286
+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
268287
269288
 $(OX)\linkopts: $B\win\Makefile.msc
270289
 echo $(OX)\add.obj > $@
271290
 echo $(OX)\allrepo.obj >> $@
272291
 echo $(OX)\attach.obj >> $@
@@ -282,10 +301,11 @@
282301
 echo $(OX)\clearsign.obj >> $@
283302
 echo $(OX)\clone.obj >> $@
284303
 echo $(OX)\comformat.obj >> $@
285304
 echo $(OX)\configure.obj >> $@
286305
 echo $(OX)\content.obj >> $@
306
+ echo $(OX)\cson_amalgamation.obj >> $@
287307
 echo $(OX)\db.obj >> $@
288308
 echo $(OX)\delta.obj >> $@
289309
 echo $(OX)\deltacmd.obj >> $@
290310
 echo $(OX)\descendants.obj >> $@
291311
 echo $(OX)\diff.obj >> $@
@@ -407,12 +427,12 @@
407427
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
408428
 $(TCC) /Fo$@ -c $**
409429
410430
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
411431
 $** > $@
412
-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
413
- cp $(SRCDIR)\cson_amalgamation.h $@
432
+$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
433
+ $(TCC) /Fo$@ -c $**
414434
415435
 page_index.h: mkindex$E $(SRC)
416436
 $** > $@
417437
418438
 clean:
@@ -422,10 +442,11 @@
422442
 -del *.h
423443
 -del *.map
424444
 -del *.manifest
425445
 -del headers
426446
 -del linkopts
447
+ -del *.res
427448
428449
 realclean: clean
429450
 -del $(APPNAME)
430451
 -del translate$E
431452
 -del mkindex$E
@@ -1070,10 +1091,12 @@
10701091
 $(TCC) /Fo$@ -c zip_.c
10711092
10721093
 zip_.c : $(SRCDIR)\zip.c
10731094
 translate$E $** > $@
10741095
1096
+fossil.res : $B\win\fossil.rc
1097
+ $(RCC) -fo $@ $**
10751098
 headers: makeheaders$E page_index.h VERSION.h
10761099
 makeheaders$E add_.c:add.h \
10771100
 allrepo_.c:allrepo.h \
10781101
 attach_.c:attach.h \
10791102
 bag_.c:bag.h \
10801103
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -22,18 +22,35 @@
22
23 # zlib options
24 ZINCDIR = $(B)\compat\zlib
25 ZLIBDIR = $(B)\compat\zlib
26 ZLIB = zlib.lib
 
 
 
 
 
 
27
28 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
29
30 CFLAGS = -nologo -MT -O2
31 BCC = $(CC) $(CFLAGS)
32 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
 
33 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
34 LIBDIR = -LIBPATH:$(ZLIBDIR)
 
 
 
 
 
 
 
 
 
 
35
36 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
37 /DSQLITE_THREADSAFE=0 \
38 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
39 /DSQLITE_ENABLE_STAT3 \
@@ -160,10 +177,11 @@
160 $(OX)\clearsign$O \
161 $(OX)\clone$O \
162 $(OX)\comformat$O \
163 $(OX)\configure$O \
164 $(OX)\content$O \
 
165 $(OX)\db$O \
166 $(OX)\delta$O \
167 $(OX)\deltacmd$O \
168 $(OX)\descendants$O \
169 $(OX)\diff$O \
@@ -219,19 +237,23 @@
219 $(OX)\rss$O \
220 $(OX)\schema$O \
221 $(OX)\search$O \
222 $(OX)\setup$O \
223 $(OX)\sha1$O \
 
224 $(OX)\shun$O \
225 $(OX)\skins$O \
226 $(OX)\sqlcmd$O \
 
227 $(OX)\stash$O \
228 $(OX)\stat$O \
229 $(OX)\style$O \
230 $(OX)\sync$O \
231 $(OX)\tag$O \
232 $(OX)\tar$O \
 
 
233 $(OX)\th_main$O \
234 $(OX)\timeline$O \
235 $(OX)\tkt$O \
236 $(OX)\tktsetup$O \
237 $(OX)\undo$O \
@@ -247,14 +269,11 @@
247 $(OX)\winhttp$O \
248 $(OX)\wysiwyg$O \
249 $(OX)\xfer$O \
250 $(OX)\xfersetup$O \
251 $(OX)\zip$O \
252 $(OX)\shell$O \
253 $(OX)\sqlite3$O \
254 $(OX)\th$O \
255 $(OX)\th_lang$O
256
257 APPNAME = $(OX)\fossil$(E)
258
259 all: $(OX) $(APPNAME)
260
@@ -262,11 +281,11 @@
262 @echo Building zlib from "$(ZLIBDIR)"...
263 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
264
265 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
266 cd $(OX)
267 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
268
269 $(OX)\linkopts: $B\win\Makefile.msc
270 echo $(OX)\add.obj > $@
271 echo $(OX)\allrepo.obj >> $@
272 echo $(OX)\attach.obj >> $@
@@ -282,10 +301,11 @@
282 echo $(OX)\clearsign.obj >> $@
283 echo $(OX)\clone.obj >> $@
284 echo $(OX)\comformat.obj >> $@
285 echo $(OX)\configure.obj >> $@
286 echo $(OX)\content.obj >> $@
 
287 echo $(OX)\db.obj >> $@
288 echo $(OX)\delta.obj >> $@
289 echo $(OX)\deltacmd.obj >> $@
290 echo $(OX)\descendants.obj >> $@
291 echo $(OX)\diff.obj >> $@
@@ -407,12 +427,12 @@
407 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
408 $(TCC) /Fo$@ -c $**
409
410 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
411 $** > $@
412 $(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
413 cp $(SRCDIR)\cson_amalgamation.h $@
414
415 page_index.h: mkindex$E $(SRC)
416 $** > $@
417
418 clean:
@@ -422,10 +442,11 @@
422 -del *.h
423 -del *.map
424 -del *.manifest
425 -del headers
426 -del linkopts
 
427
428 realclean: clean
429 -del $(APPNAME)
430 -del translate$E
431 -del mkindex$E
@@ -1070,10 +1091,12 @@
1070 $(TCC) /Fo$@ -c zip_.c
1071
1072 zip_.c : $(SRCDIR)\zip.c
1073 translate$E $** > $@
1074
 
 
1075 headers: makeheaders$E page_index.h VERSION.h
1076 makeheaders$E add_.c:add.h \
1077 allrepo_.c:allrepo.h \
1078 attach_.c:attach.h \
1079 bag_.c:bag.h \
1080
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -22,18 +22,35 @@
22
23 # zlib options
24 ZINCDIR = $(B)\compat\zlib
25 ZLIBDIR = $(B)\compat\zlib
26 ZLIB = zlib.lib
27
28 # Uncomment to enable JSON API
29 # FOSSIL_ENABLE_JSON = 1
30
31 # Uncomment to enable markdown support
32 # FOSSIL_ENABLE_MARKDOWN = 1
33
34 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
35
36 CFLAGS = -nologo -MT -O2
37 BCC = $(CC) $(CFLAGS)
38 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
39 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
40 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41 LIBDIR = -LIBPATH:$(ZLIBDIR)
42
43 !ifdef FOSSIL_ENABLE_JSON
44 TCC = $(TCC) -DFOSSIL_ENABLE_JSON
45 RCC = $(RCC) -DFOSSIL_ENABLE_JSON
46 !endif
47
48 !ifdef FOSSIL_ENABLE_MARKDOWN
49 TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
50 RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
51 !endif
52
53 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
54 /DSQLITE_THREADSAFE=0 \
55 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
56 /DSQLITE_ENABLE_STAT3 \
@@ -160,10 +177,11 @@
177 $(OX)\clearsign$O \
178 $(OX)\clone$O \
179 $(OX)\comformat$O \
180 $(OX)\configure$O \
181 $(OX)\content$O \
182 $(OX)\cson_amalgamation$O \
183 $(OX)\db$O \
184 $(OX)\delta$O \
185 $(OX)\deltacmd$O \
186 $(OX)\descendants$O \
187 $(OX)\diff$O \
@@ -219,19 +237,23 @@
237 $(OX)\rss$O \
238 $(OX)\schema$O \
239 $(OX)\search$O \
240 $(OX)\setup$O \
241 $(OX)\sha1$O \
242 $(OX)\shell$O \
243 $(OX)\shun$O \
244 $(OX)\skins$O \
245 $(OX)\sqlcmd$O \
246 $(OX)\sqlite3$O \
247 $(OX)\stash$O \
248 $(OX)\stat$O \
249 $(OX)\style$O \
250 $(OX)\sync$O \
251 $(OX)\tag$O \
252 $(OX)\tar$O \
253 $(OX)\th$O \
254 $(OX)\th_lang$O \
255 $(OX)\th_main$O \
256 $(OX)\timeline$O \
257 $(OX)\tkt$O \
258 $(OX)\tktsetup$O \
259 $(OX)\undo$O \
@@ -247,14 +269,11 @@
269 $(OX)\winhttp$O \
270 $(OX)\wysiwyg$O \
271 $(OX)\xfer$O \
272 $(OX)\xfersetup$O \
273 $(OX)\zip$O \
274 $(OX)\fossil.res
 
 
 
275
276 APPNAME = $(OX)\fossil$(E)
277
278 all: $(OX) $(APPNAME)
279
@@ -262,11 +281,11 @@
281 @echo Building zlib from "$(ZLIBDIR)"...
282 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
283
284 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
285 cd $(OX)
286 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
287
288 $(OX)\linkopts: $B\win\Makefile.msc
289 echo $(OX)\add.obj > $@
290 echo $(OX)\allrepo.obj >> $@
291 echo $(OX)\attach.obj >> $@
@@ -282,10 +301,11 @@
301 echo $(OX)\clearsign.obj >> $@
302 echo $(OX)\clone.obj >> $@
303 echo $(OX)\comformat.obj >> $@
304 echo $(OX)\configure.obj >> $@
305 echo $(OX)\content.obj >> $@
306 echo $(OX)\cson_amalgamation.obj >> $@
307 echo $(OX)\db.obj >> $@
308 echo $(OX)\delta.obj >> $@
309 echo $(OX)\deltacmd.obj >> $@
310 echo $(OX)\descendants.obj >> $@
311 echo $(OX)\diff.obj >> $@
@@ -407,12 +427,12 @@
427 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
428 $(TCC) /Fo$@ -c $**
429
430 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
431 $** > $@
432 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
433 $(TCC) /Fo$@ -c $**
434
435 page_index.h: mkindex$E $(SRC)
436 $** > $@
437
438 clean:
@@ -422,10 +442,11 @@
442 -del *.h
443 -del *.map
444 -del *.manifest
445 -del headers
446 -del linkopts
447 -del *.res
448
449 realclean: clean
450 -del $(APPNAME)
451 -del translate$E
452 -del mkindex$E
@@ -1070,10 +1091,12 @@
1091 $(TCC) /Fo$@ -c zip_.c
1092
1093 zip_.c : $(SRCDIR)\zip.c
1094 translate$E $** > $@
1095
1096 fossil.res : $B\win\fossil.rc
1097 $(RCC) -fo $@ $**
1098 headers: makeheaders$E page_index.h VERSION.h
1099 makeheaders$E add_.c:add.h \
1100 allrepo_.c:allrepo.h \
1101 attach_.c:attach.h \
1102 bag_.c:bag.h \
1103
M win/Makefile.msc
+30 -7
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -22,18 +22,35 @@
2222
2323
 # zlib options
2424
 ZINCDIR = $(B)\compat\zlib
2525
 ZLIBDIR = $(B)\compat\zlib
2626
 ZLIB = zlib.lib
27
+
28
+# Uncomment to enable JSON API
29
+# FOSSIL_ENABLE_JSON = 1
30
+
31
+# Uncomment to enable markdown support
32
+# FOSSIL_ENABLE_MARKDOWN = 1
2733
2834
 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
2935
3036
 CFLAGS = -nologo -MT -O2
3137
 BCC = $(CC) $(CFLAGS)
3238
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
39
+RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
3340
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
3441
 LIBDIR = -LIBPATH:$(ZLIBDIR)
42
+
43
+!ifdef FOSSIL_ENABLE_JSON
44
+TCC = $(TCC) -DFOSSIL_ENABLE_JSON
45
+RCC = $(RCC) -DFOSSIL_ENABLE_JSON
46
+!endif
47
+
48
+!ifdef FOSSIL_ENABLE_MARKDOWN
49
+TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
50
+RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
51
+!endif
3552
3653
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
3754
 /DSQLITE_THREADSAFE=0 \
3855
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
3956
 /DSQLITE_ENABLE_STAT3 \
@@ -160,10 +177,11 @@
160177
 $(OX)\clearsign$O \
161178
 $(OX)\clone$O \
162179
 $(OX)\comformat$O \
163180
 $(OX)\configure$O \
164181
 $(OX)\content$O \
182
+ $(OX)\cson_amalgamation$O \
165183
 $(OX)\db$O \
166184
 $(OX)\delta$O \
167185
 $(OX)\deltacmd$O \
168186
 $(OX)\descendants$O \
169187
 $(OX)\diff$O \
@@ -219,19 +237,23 @@
219237
 $(OX)\rss$O \
220238
 $(OX)\schema$O \
221239
 $(OX)\search$O \
222240
 $(OX)\setup$O \
223241
 $(OX)\sha1$O \
242
+ $(OX)\shell$O \
224243
 $(OX)\shun$O \
225244
 $(OX)\skins$O \
226245
 $(OX)\sqlcmd$O \
246
+ $(OX)\sqlite3$O \
227247
 $(OX)\stash$O \
228248
 $(OX)\stat$O \
229249
 $(OX)\style$O \
230250
 $(OX)\sync$O \
231251
 $(OX)\tag$O \
232252
 $(OX)\tar$O \
253
+ $(OX)\th$O \
254
+ $(OX)\th_lang$O \
233255
 $(OX)\th_main$O \
234256
 $(OX)\timeline$O \
235257
 $(OX)\tkt$O \
236258
 $(OX)\tktsetup$O \
237259
 $(OX)\undo$O \
@@ -247,14 +269,11 @@
247269
 $(OX)\winhttp$O \
248270
 $(OX)\wysiwyg$O \
249271
 $(OX)\xfer$O \
250272
 $(OX)\xfersetup$O \
251273
 $(OX)\zip$O \
252
- $(OX)\shell$O \
253
- $(OX)\sqlite3$O \
254
- $(OX)\th$O \
255
- $(OX)\th_lang$O
274
+ $(OX)\fossil.res
256275
257276
 APPNAME = $(OX)\fossil$(E)
258277
259278
 all: $(OX) $(APPNAME)
260279
@@ -262,11 +281,11 @@
262281
 @echo Building zlib from "$(ZLIBDIR)"...
263282
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
264283
265284
 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
266285
 cd $(OX)
267
- link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
286
+ link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
268287
269288
 $(OX)\linkopts: $B\win\Makefile.msc
270289
 echo $(OX)\add.obj > $@
271290
 echo $(OX)\allrepo.obj >> $@
272291
 echo $(OX)\attach.obj >> $@
@@ -282,10 +301,11 @@
282301
 echo $(OX)\clearsign.obj >> $@
283302
 echo $(OX)\clone.obj >> $@
284303
 echo $(OX)\comformat.obj >> $@
285304
 echo $(OX)\configure.obj >> $@
286305
 echo $(OX)\content.obj >> $@
306
+ echo $(OX)\cson_amalgamation.obj >> $@
287307
 echo $(OX)\db.obj >> $@
288308
 echo $(OX)\delta.obj >> $@
289309
 echo $(OX)\deltacmd.obj >> $@
290310
 echo $(OX)\descendants.obj >> $@
291311
 echo $(OX)\diff.obj >> $@
@@ -407,12 +427,12 @@
407427
 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
408428
 $(TCC) /Fo$@ -c $**
409429
410430
 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
411431
 $** > $@
412
-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
413
- cp $(SRCDIR)\cson_amalgamation.h $@
432
+$(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
433
+ $(TCC) /Fo$@ -c $**
414434
415435
 page_index.h: mkindex$E $(SRC)
416436
 $** > $@
417437
418438
 clean:
@@ -422,10 +442,11 @@
422442
 -del *.h
423443
 -del *.map
424444
 -del *.manifest
425445
 -del headers
426446
 -del linkopts
447
+ -del *.res
427448
428449
 realclean: clean
429450
 -del $(APPNAME)
430451
 -del translate$E
431452
 -del mkindex$E
@@ -1070,10 +1091,12 @@
10701091
 $(TCC) /Fo$@ -c zip_.c
10711092
10721093
 zip_.c : $(SRCDIR)\zip.c
10731094
 translate$E $** > $@
10741095
1096
+fossil.res : $B\win\fossil.rc
1097
+ $(RCC) -fo $@ $**
10751098
 headers: makeheaders$E page_index.h VERSION.h
10761099
 makeheaders$E add_.c:add.h \
10771100
 allrepo_.c:allrepo.h \
10781101
 attach_.c:attach.h \
10791102
 bag_.c:bag.h \
10801103
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -22,18 +22,35 @@
22
23 # zlib options
24 ZINCDIR = $(B)\compat\zlib
25 ZLIBDIR = $(B)\compat\zlib
26 ZLIB = zlib.lib
 
 
 
 
 
 
27
28 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
29
30 CFLAGS = -nologo -MT -O2
31 BCC = $(CC) $(CFLAGS)
32 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
 
33 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
34 LIBDIR = -LIBPATH:$(ZLIBDIR)
 
 
 
 
 
 
 
 
 
 
35
36 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
37 /DSQLITE_THREADSAFE=0 \
38 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
39 /DSQLITE_ENABLE_STAT3 \
@@ -160,10 +177,11 @@
160 $(OX)\clearsign$O \
161 $(OX)\clone$O \
162 $(OX)\comformat$O \
163 $(OX)\configure$O \
164 $(OX)\content$O \
 
165 $(OX)\db$O \
166 $(OX)\delta$O \
167 $(OX)\deltacmd$O \
168 $(OX)\descendants$O \
169 $(OX)\diff$O \
@@ -219,19 +237,23 @@
219 $(OX)\rss$O \
220 $(OX)\schema$O \
221 $(OX)\search$O \
222 $(OX)\setup$O \
223 $(OX)\sha1$O \
 
224 $(OX)\shun$O \
225 $(OX)\skins$O \
226 $(OX)\sqlcmd$O \
 
227 $(OX)\stash$O \
228 $(OX)\stat$O \
229 $(OX)\style$O \
230 $(OX)\sync$O \
231 $(OX)\tag$O \
232 $(OX)\tar$O \
 
 
233 $(OX)\th_main$O \
234 $(OX)\timeline$O \
235 $(OX)\tkt$O \
236 $(OX)\tktsetup$O \
237 $(OX)\undo$O \
@@ -247,14 +269,11 @@
247 $(OX)\winhttp$O \
248 $(OX)\wysiwyg$O \
249 $(OX)\xfer$O \
250 $(OX)\xfersetup$O \
251 $(OX)\zip$O \
252 $(OX)\shell$O \
253 $(OX)\sqlite3$O \
254 $(OX)\th$O \
255 $(OX)\th_lang$O
256
257 APPNAME = $(OX)\fossil$(E)
258
259 all: $(OX) $(APPNAME)
260
@@ -262,11 +281,11 @@
262 @echo Building zlib from "$(ZLIBDIR)"...
263 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
264
265 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
266 cd $(OX)
267 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj @linkopts
268
269 $(OX)\linkopts: $B\win\Makefile.msc
270 echo $(OX)\add.obj > $@
271 echo $(OX)\allrepo.obj >> $@
272 echo $(OX)\attach.obj >> $@
@@ -282,10 +301,11 @@
282 echo $(OX)\clearsign.obj >> $@
283 echo $(OX)\clone.obj >> $@
284 echo $(OX)\comformat.obj >> $@
285 echo $(OX)\configure.obj >> $@
286 echo $(OX)\content.obj >> $@
 
287 echo $(OX)\db.obj >> $@
288 echo $(OX)\delta.obj >> $@
289 echo $(OX)\deltacmd.obj >> $@
290 echo $(OX)\descendants.obj >> $@
291 echo $(OX)\diff.obj >> $@
@@ -407,12 +427,12 @@
407 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
408 $(TCC) /Fo$@ -c $**
409
410 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
411 $** > $@
412 $(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
413 cp $(SRCDIR)\cson_amalgamation.h $@
414
415 page_index.h: mkindex$E $(SRC)
416 $** > $@
417
418 clean:
@@ -422,10 +442,11 @@
422 -del *.h
423 -del *.map
424 -del *.manifest
425 -del headers
426 -del linkopts
 
427
428 realclean: clean
429 -del $(APPNAME)
430 -del translate$E
431 -del mkindex$E
@@ -1070,10 +1091,12 @@
1070 $(TCC) /Fo$@ -c zip_.c
1071
1072 zip_.c : $(SRCDIR)\zip.c
1073 translate$E $** > $@
1074
 
 
1075 headers: makeheaders$E page_index.h VERSION.h
1076 makeheaders$E add_.c:add.h \
1077 allrepo_.c:allrepo.h \
1078 attach_.c:attach.h \
1079 bag_.c:bag.h \
1080
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -22,18 +22,35 @@
22
23 # zlib options
24 ZINCDIR = $(B)\compat\zlib
25 ZLIBDIR = $(B)\compat\zlib
26 ZLIB = zlib.lib
27
28 # Uncomment to enable JSON API
29 # FOSSIL_ENABLE_JSON = 1
30
31 # Uncomment to enable markdown support
32 # FOSSIL_ENABLE_MARKDOWN = 1
33
34 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR)
35
36 CFLAGS = -nologo -MT -O2
37 BCC = $(CC) $(CFLAGS)
38 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
39 RCC = rc -D_WIN32 -D_MSC_VER $(INCL)
40 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41 LIBDIR = -LIBPATH:$(ZLIBDIR)
42
43 !ifdef FOSSIL_ENABLE_JSON
44 TCC = $(TCC) -DFOSSIL_ENABLE_JSON
45 RCC = $(RCC) -DFOSSIL_ENABLE_JSON
46 !endif
47
48 !ifdef FOSSIL_ENABLE_MARKDOWN
49 TCC = $(TCC) -DFOSSIL_ENABLE_MARKDOWN
50 RCC = $(RCC) -DFOSSIL_ENABLE_MARKDOWN
51 !endif
52
53 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 \
54 /DSQLITE_THREADSAFE=0 \
55 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
56 /DSQLITE_ENABLE_STAT3 \
@@ -160,10 +177,11 @@
177 $(OX)\clearsign$O \
178 $(OX)\clone$O \
179 $(OX)\comformat$O \
180 $(OX)\configure$O \
181 $(OX)\content$O \
182 $(OX)\cson_amalgamation$O \
183 $(OX)\db$O \
184 $(OX)\delta$O \
185 $(OX)\deltacmd$O \
186 $(OX)\descendants$O \
187 $(OX)\diff$O \
@@ -219,19 +237,23 @@
237 $(OX)\rss$O \
238 $(OX)\schema$O \
239 $(OX)\search$O \
240 $(OX)\setup$O \
241 $(OX)\sha1$O \
242 $(OX)\shell$O \
243 $(OX)\shun$O \
244 $(OX)\skins$O \
245 $(OX)\sqlcmd$O \
246 $(OX)\sqlite3$O \
247 $(OX)\stash$O \
248 $(OX)\stat$O \
249 $(OX)\style$O \
250 $(OX)\sync$O \
251 $(OX)\tag$O \
252 $(OX)\tar$O \
253 $(OX)\th$O \
254 $(OX)\th_lang$O \
255 $(OX)\th_main$O \
256 $(OX)\timeline$O \
257 $(OX)\tkt$O \
258 $(OX)\tktsetup$O \
259 $(OX)\undo$O \
@@ -247,14 +269,11 @@
269 $(OX)\winhttp$O \
270 $(OX)\wysiwyg$O \
271 $(OX)\xfer$O \
272 $(OX)\xfersetup$O \
273 $(OX)\zip$O \
274 $(OX)\fossil.res
 
 
 
275
276 APPNAME = $(OX)\fossil$(E)
277
278 all: $(OX) $(APPNAME)
279
@@ -262,11 +281,11 @@
281 @echo Building zlib from "$(ZLIBDIR)"...
282 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
283
284 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
285 cd $(OX)
286 link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
287
288 $(OX)\linkopts: $B\win\Makefile.msc
289 echo $(OX)\add.obj > $@
290 echo $(OX)\allrepo.obj >> $@
291 echo $(OX)\attach.obj >> $@
@@ -282,10 +301,11 @@
301 echo $(OX)\clearsign.obj >> $@
302 echo $(OX)\clone.obj >> $@
303 echo $(OX)\comformat.obj >> $@
304 echo $(OX)\configure.obj >> $@
305 echo $(OX)\content.obj >> $@
306 echo $(OX)\cson_amalgamation.obj >> $@
307 echo $(OX)\db.obj >> $@
308 echo $(OX)\delta.obj >> $@
309 echo $(OX)\deltacmd.obj >> $@
310 echo $(OX)\descendants.obj >> $@
311 echo $(OX)\diff.obj >> $@
@@ -407,12 +427,12 @@
427 $(OX)\th_lang$O : $(SRCDIR)\th_lang.c
428 $(TCC) /Fo$@ -c $**
429
430 VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
431 $** > $@
432 $(OX)\cson_amalgamation$O : $(SRCDIR)\cson_amalgamation.c
433 $(TCC) /Fo$@ -c $**
434
435 page_index.h: mkindex$E $(SRC)
436 $** > $@
437
438 clean:
@@ -422,10 +442,11 @@
442 -del *.h
443 -del *.map
444 -del *.manifest
445 -del headers
446 -del linkopts
447 -del *.res
448
449 realclean: clean
450 -del $(APPNAME)
451 -del translate$E
452 -del mkindex$E
@@ -1070,10 +1091,12 @@
1091 $(TCC) /Fo$@ -c zip_.c
1092
1093 zip_.c : $(SRCDIR)\zip.c
1094 translate$E $** > $@
1095
1096 fossil.res : $B\win\fossil.rc
1097 $(RCC) -fo $@ $**
1098 headers: makeheaders$E page_index.h VERSION.h
1099 makeheaders$E add_.c:add.h \
1100 allrepo_.c:allrepo.h \
1101 attach_.c:attach.h \
1102 bag_.c:bag.h \
1103
M win/include/dirent.h
+3 -3
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -866,18 +866,18 @@
866866
 /* Set errno variable */
867867
 static void
868868
 dirent_set_errno(
869869
 int error)
870870
 {
871
-#if defined(_MSC_VER)
871
+#if defined(_MSC_VER) && _MSC_VER >= 1400
872872
873
- /* Microsoft Visual Studio */
873
+ /* Microsoft Visual Studio 2005 and later */
874874
 _set_errno (error);
875875
876876
 #else
877877
878
- /* Non-Microsoft compiler */
878
+ /* Non-Microsoft compiler or older Microsoft compiler */
879879
 errno = error;
880880
881881
 #endif
882882
 }
883883
884884
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -866,18 +866,18 @@
866 /* Set errno variable */
867 static void
868 dirent_set_errno(
869 int error)
870 {
871 #if defined(_MSC_VER)
872
873 /* Microsoft Visual Studio */
874 _set_errno (error);
875
876 #else
877
878 /* Non-Microsoft compiler */
879 errno = error;
880
881 #endif
882 }
883
884
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -866,18 +866,18 @@
866 /* Set errno variable */
867 static void
868 dirent_set_errno(
869 int error)
870 {
871 #if defined(_MSC_VER) && _MSC_VER >= 1400
872
873 /* Microsoft Visual Studio 2005 and later */
874 _set_errno (error);
875
876 #else
877
878 /* Non-Microsoft compiler or older Microsoft compiler */
879 errno = error;
880
881 #endif
882 }
883
884
M win/include/dirent.h
+3 -3
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -866,18 +866,18 @@
866866
 /* Set errno variable */
867867
 static void
868868
 dirent_set_errno(
869869
 int error)
870870
 {
871
-#if defined(_MSC_VER)
871
+#if defined(_MSC_VER) && _MSC_VER >= 1400
872872
873
- /* Microsoft Visual Studio */
873
+ /* Microsoft Visual Studio 2005 and later */
874874
 _set_errno (error);
875875
876876
 #else
877877
878
- /* Non-Microsoft compiler */
878
+ /* Non-Microsoft compiler or older Microsoft compiler */
879879
 errno = error;
880880
881881
 #endif
882882
 }
883883
884884
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -866,18 +866,18 @@
866 /* Set errno variable */
867 static void
868 dirent_set_errno(
869 int error)
870 {
871 #if defined(_MSC_VER)
872
873 /* Microsoft Visual Studio */
874 _set_errno (error);
875
876 #else
877
878 /* Non-Microsoft compiler */
879 errno = error;
880
881 #endif
882 }
883
884
--- win/include/dirent.h
+++ win/include/dirent.h
@@ -866,18 +866,18 @@
866 /* Set errno variable */
867 static void
868 dirent_set_errno(
869 int error)
870 {
871 #if defined(_MSC_VER) && _MSC_VER >= 1400
872
873 /* Microsoft Visual Studio 2005 and later */
874 _set_errno (error);
875
876 #else
877
878 /* Non-Microsoft compiler or older Microsoft compiler */
879 errno = error;
880
881 #endif
882 }
883
884

Keyboard Shortcuts

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