Fossil SCM

merge from trunk and add sqlite shell to windows make

wolfgang 2010-10-29 21:11 StvPrivateHook2 merge
Commit 6d334ac9ed2f7d98336c9150940ae082723484e4
Parent e6dce6a16afe218…
13 files changed +24 +24 +7 -2 +13 -2 +4 -4 +4 -4 +4 +1 -1 +1 -1 +13 -6 +13 -6 +5 -2 +5 -2
~ src/main.c ~ src/main.c ~ src/main.mk ~ src/makemake.tcl ~ src/rebuild.c ~ src/rebuild.c ~ src/shell.c ~ src/xfer.c ~ src/xfer.c ~ win/Makefile.PellesCGMake ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.dmc
M src/main.c
+24
--- src/main.c
+++ src/main.c
@@ -1243,5 +1243,29 @@
12431243
 }
12441244
 db_close();
12451245
 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
12461246
 #endif
12471247
 }
1248
+
1249
+/*
1250
+** COMMAND: sqlite3
1251
+**
1252
+** Usage: %fossil sqlite3 ?DATABASE? ?OPTIONS?
1253
+**
1254
+** Run the standalone sqlite3 command-line shell on DATABASE with OPTIONS.
1255
+** If DATABASE is omitted, then the repository that serves the working
1256
+** directory is opened.
1257
+*/
1258
+void sqlite3_cmd(void){
1259
+ extern int sqlite3_shell(int, char**);
1260
+ sqlite3_shell(g.argc-1, g.argv+1);
1261
+}
1262
+
1263
+/*
1264
+** This routine is called by the patched sqlite3 command-line shell in order
1265
+** to load the name and database connection for the open Fossil database.
1266
+*/
1267
+void fossil_open(sqlite3 **pDb, const char **pzRepoName){
1268
+ db_must_be_within_tree();
1269
+ *pDb = 0;
1270
+ *pzRepoName = g.zRepositoryName;
1271
+}
12481272
--- src/main.c
+++ src/main.c
@@ -1243,5 +1243,29 @@
1243 }
1244 db_close();
1245 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
1246 #endif
1247 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1248
--- src/main.c
+++ src/main.c
@@ -1243,5 +1243,29 @@
1243 }
1244 db_close();
1245 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
1246 #endif
1247 }
1248
1249 /*
1250 ** COMMAND: sqlite3
1251 **
1252 ** Usage: %fossil sqlite3 ?DATABASE? ?OPTIONS?
1253 **
1254 ** Run the standalone sqlite3 command-line shell on DATABASE with OPTIONS.
1255 ** If DATABASE is omitted, then the repository that serves the working
1256 ** directory is opened.
1257 */
1258 void sqlite3_cmd(void){
1259 extern int sqlite3_shell(int, char**);
1260 sqlite3_shell(g.argc-1, g.argv+1);
1261 }
1262
1263 /*
1264 ** This routine is called by the patched sqlite3 command-line shell in order
1265 ** to load the name and database connection for the open Fossil database.
1266 */
1267 void fossil_open(sqlite3 **pDb, const char **pzRepoName){
1268 db_must_be_within_tree();
1269 *pDb = 0;
1270 *pzRepoName = g.zRepositoryName;
1271 }
1272
M src/main.c
+24
--- src/main.c
+++ src/main.c
@@ -1243,5 +1243,29 @@
12431243
 }
12441244
 db_close();
12451245
 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
12461246
 #endif
12471247
 }
1248
+
1249
+/*
1250
+** COMMAND: sqlite3
1251
+**
1252
+** Usage: %fossil sqlite3 ?DATABASE? ?OPTIONS?
1253
+**
1254
+** Run the standalone sqlite3 command-line shell on DATABASE with OPTIONS.
1255
+** If DATABASE is omitted, then the repository that serves the working
1256
+** directory is opened.
1257
+*/
1258
+void sqlite3_cmd(void){
1259
+ extern int sqlite3_shell(int, char**);
1260
+ sqlite3_shell(g.argc-1, g.argv+1);
1261
+}
1262
+
1263
+/*
1264
+** This routine is called by the patched sqlite3 command-line shell in order
1265
+** to load the name and database connection for the open Fossil database.
1266
+*/
1267
+void fossil_open(sqlite3 **pDb, const char **pzRepoName){
1268
+ db_must_be_within_tree();
1269
+ *pDb = 0;
1270
+ *pzRepoName = g.zRepositoryName;
1271
+}
12481272
--- src/main.c
+++ src/main.c
@@ -1243,5 +1243,29 @@
1243 }
1244 db_close();
1245 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
1246 #endif
1247 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1248
--- src/main.c
+++ src/main.c
@@ -1243,5 +1243,29 @@
1243 }
1244 db_close();
1245 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
1246 #endif
1247 }
1248
1249 /*
1250 ** COMMAND: sqlite3
1251 **
1252 ** Usage: %fossil sqlite3 ?DATABASE? ?OPTIONS?
1253 **
1254 ** Run the standalone sqlite3 command-line shell on DATABASE with OPTIONS.
1255 ** If DATABASE is omitted, then the repository that serves the working
1256 ** directory is opened.
1257 */
1258 void sqlite3_cmd(void){
1259 extern int sqlite3_shell(int, char**);
1260 sqlite3_shell(g.argc-1, g.argv+1);
1261 }
1262
1263 /*
1264 ** This routine is called by the patched sqlite3 command-line shell in order
1265 ** to load the name and database connection for the open Fossil database.
1266 */
1267 void fossil_open(sqlite3 **pDb, const char **pzRepoName){
1268 db_must_be_within_tree();
1269 *pDb = 0;
1270 *pzRepoName = g.zRepositoryName;
1271 }
1272
M src/main.mk
+7 -2
--- src/main.mk
+++ src/main.mk
@@ -264,12 +264,14 @@
264264
 VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
265265
 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >VERSION.h
266266
 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>VERSION.h
267267
 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}' $(SRCDIR)/../manifest >>VERSION.h
268268
269
-$(APPNAME): headers $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
270
- $(TCC) -o $(APPNAME) $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(LIB)
269
+EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
270
+
271
+$(APPNAME): headers $(OBJ) $(EXTRAOBJ)
272
+ $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
271273
272274
 # This rule prevents make from using its default rules to try build
273275
 # an executable named "manifest" out of the file named "manifest.c"
274276
 #
275277
 $(SRCDIR)/../manifest:
@@ -792,11 +794,14 @@
792794
793795
 zip.h: headers
794796
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
795797
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
796798
799
+$(OBJDIR)/shell.o: $(SRCDIR)/shell.c
800
+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
801
+
797802
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
798803
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
799804
800805
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
801806
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
802807
803808
--- src/main.mk
+++ src/main.mk
@@ -264,12 +264,14 @@
264 VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
265 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >VERSION.h
266 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>VERSION.h
267 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}' $(SRCDIR)/../manifest >>VERSION.h
268
269 $(APPNAME): headers $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
270 $(TCC) -o $(APPNAME) $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(LIB)
 
 
271
272 # This rule prevents make from using its default rules to try build
273 # an executable named "manifest" out of the file named "manifest.c"
274 #
275 $(SRCDIR)/../manifest:
@@ -792,11 +794,14 @@
792
793 zip.h: headers
794 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
795 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
796
 
 
 
797 $(OBJDIR)/th.o: $(SRCDIR)/th.c
798 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
799
800 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
801 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
802
803
--- src/main.mk
+++ src/main.mk
@@ -264,12 +264,14 @@
264 VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest
265 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' $(SRCDIR)/../manifest.uuid >VERSION.h
266 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' $(SRCDIR)/../manifest.uuid >>VERSION.h
267 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n", substr($$2,1,10),substr($$2,12)}' $(SRCDIR)/../manifest >>VERSION.h
268
269 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
270
271 $(APPNAME): headers $(OBJ) $(EXTRAOBJ)
272 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
273
274 # This rule prevents make from using its default rules to try build
275 # an executable named "manifest" out of the file named "manifest.c"
276 #
277 $(SRCDIR)/../manifest:
@@ -792,11 +794,14 @@
794
795 zip.h: headers
796 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
797 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
798
799 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c
800 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
801
802 $(OBJDIR)/th.o: $(SRCDIR)/th.c
803 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
804
805 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
806 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
807
808
M src/makemake.tcl
+13 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,18 @@
148148
 $(SRCDIR)/../manifest.uuid >>VERSION.h
149149
 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\
150150
 substr($$2,1,10),substr($$2,12)}' \
151151
 $(SRCDIR)/../manifest >>VERSION.h
152152
153
-$(APPNAME): headers $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
154
- $(TCC) -o $(APPNAME) $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(LIB)
153
+EXTRAOBJ = \
154
+ $(OBJDIR)/sqlite3.o \
155
+ $(OBJDIR)/shell.o \
156
+ $(OBJDIR)/th.o \
157
+ $(OBJDIR)/th_lang.o
158
+
159
+$(APPNAME): headers $(OBJ) $(EXTRAOBJ)
160
+ $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
155161
156162
 # This rule prevents make from using its default rules to try build
157163
 # an executable named "manifest" out of the file named "manifest.c"
158164
 #
159165
 $(SRCDIR)/../manifest:
@@ -201,10 +207,15 @@
201207
 #append opt " -DSQLITE_ENABLE_FTS3=1"
202208
 append opt " -Dlocaltime=fossil_localtime"
203209
 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
204210
 puts "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
205211
212
+puts "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c"
213
+set opt {-Dmain=sqlite3_shell}
214
+append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
215
+puts "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
216
+
206217
 puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
207218
 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
208219
209220
 puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
210221
 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
211222
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,18 @@
148 $(SRCDIR)/../manifest.uuid >>VERSION.h
149 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\
150 substr($$2,1,10),substr($$2,12)}' \
151 $(SRCDIR)/../manifest >>VERSION.h
152
153 $(APPNAME): headers $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
154 $(TCC) -o $(APPNAME) $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(LIB)
 
 
 
 
 
 
155
156 # This rule prevents make from using its default rules to try build
157 # an executable named "manifest" out of the file named "manifest.c"
158 #
159 $(SRCDIR)/../manifest:
@@ -201,10 +207,15 @@
201 #append opt " -DSQLITE_ENABLE_FTS3=1"
202 append opt " -Dlocaltime=fossil_localtime"
203 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
204 puts "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
205
 
 
 
 
 
206 puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
207 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
208
209 puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
210 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
211
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -148,12 +148,18 @@
148 $(SRCDIR)/../manifest.uuid >>VERSION.h
149 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\
150 substr($$2,1,10),substr($$2,12)}' \
151 $(SRCDIR)/../manifest >>VERSION.h
152
153 EXTRAOBJ = \
154 $(OBJDIR)/sqlite3.o \
155 $(OBJDIR)/shell.o \
156 $(OBJDIR)/th.o \
157 $(OBJDIR)/th_lang.o
158
159 $(APPNAME): headers $(OBJ) $(EXTRAOBJ)
160 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
161
162 # This rule prevents make from using its default rules to try build
163 # an executable named "manifest" out of the file named "manifest.c"
164 #
165 $(SRCDIR)/../manifest:
@@ -201,10 +207,15 @@
207 #append opt " -DSQLITE_ENABLE_FTS3=1"
208 append opt " -Dlocaltime=fossil_localtime"
209 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
210 puts "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
211
212 puts "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c"
213 set opt {-Dmain=sqlite3_shell}
214 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
215 puts "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
216
217 puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
218 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
219
220 puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
221 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
222
M src/rebuild.c
+4 -4
--- src/rebuild.c
+++ src/rebuild.c
@@ -106,11 +106,11 @@
106106
 static void rebuild_step_done(rid){
107107
 /* assert( bag_find(&bagDone, rid)==0 ); */
108108
 bag_insert(&bagDone, rid);
109109
 if( ttyOutput ){
110110
 processCnt++;
111
- if (!g.fQuiet) {
111
+ if (!g.fQuiet && totalSize>0) {
112112
 percent_complete((processCnt*1000)/totalSize);
113113
 }
114114
 }
115115
 }
116116
@@ -324,16 +324,16 @@
324324
 }
325325
 }
326326
 db_finalize(&s);
327327
 manifest_crosslink_end();
328328
 rebuild_tag_trunk();
329
- if (!g.fQuiet) {
329
+ if( !g.fQuiet && totalSize>0 ){
330330
 processCnt += incrSize;
331331
 percent_complete((processCnt*1000)/totalSize);
332332
 }
333333
 create_cluster();
334
- if (!g.fQuiet) {
334
+ if( !g.fQuiet && totalSize>0 ){
335335
 processCnt += incrSize;
336336
 percent_complete((processCnt*1000)/totalSize);
337337
 }
338338
 if(!g.fQuiet && ttyOutput ){
339339
 printf("\n");
@@ -417,11 +417,11 @@
417417
 db_close();
418418
 db_open_repository(g.zRepositoryName);
419419
 }
420420
 db_begin_transaction();
421421
 create_cluster();
422
- db_end_transaction(0);
422
+ db_end_transaction(0);
423423
 }
424424
425425
 /*
426426
 ** COMMAND: scrub
427427
 ** %fossil scrub [--verily] [--force] [REPOSITORY]
428428
429429
ADDED src/shell.c
--- src/rebuild.c
+++ src/rebuild.c
@@ -106,11 +106,11 @@
106 static void rebuild_step_done(rid){
107 /* assert( bag_find(&bagDone, rid)==0 ); */
108 bag_insert(&bagDone, rid);
109 if( ttyOutput ){
110 processCnt++;
111 if (!g.fQuiet) {
112 percent_complete((processCnt*1000)/totalSize);
113 }
114 }
115 }
116
@@ -324,16 +324,16 @@
324 }
325 }
326 db_finalize(&s);
327 manifest_crosslink_end();
328 rebuild_tag_trunk();
329 if (!g.fQuiet) {
330 processCnt += incrSize;
331 percent_complete((processCnt*1000)/totalSize);
332 }
333 create_cluster();
334 if (!g.fQuiet) {
335 processCnt += incrSize;
336 percent_complete((processCnt*1000)/totalSize);
337 }
338 if(!g.fQuiet && ttyOutput ){
339 printf("\n");
@@ -417,11 +417,11 @@
417 db_close();
418 db_open_repository(g.zRepositoryName);
419 }
420 db_begin_transaction();
421 create_cluster();
422 db_end_transaction(0);
423 }
424
425 /*
426 ** COMMAND: scrub
427 ** %fossil scrub [--verily] [--force] [REPOSITORY]
428
429 DDED src/shell.c
--- src/rebuild.c
+++ src/rebuild.c
@@ -106,11 +106,11 @@
106 static void rebuild_step_done(rid){
107 /* assert( bag_find(&bagDone, rid)==0 ); */
108 bag_insert(&bagDone, rid);
109 if( ttyOutput ){
110 processCnt++;
111 if (!g.fQuiet && totalSize>0) {
112 percent_complete((processCnt*1000)/totalSize);
113 }
114 }
115 }
116
@@ -324,16 +324,16 @@
324 }
325 }
326 db_finalize(&s);
327 manifest_crosslink_end();
328 rebuild_tag_trunk();
329 if( !g.fQuiet && totalSize>0 ){
330 processCnt += incrSize;
331 percent_complete((processCnt*1000)/totalSize);
332 }
333 create_cluster();
334 if( !g.fQuiet && totalSize>0 ){
335 processCnt += incrSize;
336 percent_complete((processCnt*1000)/totalSize);
337 }
338 if(!g.fQuiet && ttyOutput ){
339 printf("\n");
@@ -417,11 +417,11 @@
417 db_close();
418 db_open_repository(g.zRepositoryName);
419 }
420 db_begin_transaction();
421 create_cluster();
422 db_end_transaction(0);
423 }
424
425 /*
426 ** COMMAND: scrub
427 ** %fossil scrub [--verily] [--force] [REPOSITORY]
428
429 DDED src/shell.c
M src/rebuild.c
+4 -4
--- src/rebuild.c
+++ src/rebuild.c
@@ -106,11 +106,11 @@
106106
 static void rebuild_step_done(rid){
107107
 /* assert( bag_find(&bagDone, rid)==0 ); */
108108
 bag_insert(&bagDone, rid);
109109
 if( ttyOutput ){
110110
 processCnt++;
111
- if (!g.fQuiet) {
111
+ if (!g.fQuiet && totalSize>0) {
112112
 percent_complete((processCnt*1000)/totalSize);
113113
 }
114114
 }
115115
 }
116116
@@ -324,16 +324,16 @@
324324
 }
325325
 }
326326
 db_finalize(&s);
327327
 manifest_crosslink_end();
328328
 rebuild_tag_trunk();
329
- if (!g.fQuiet) {
329
+ if( !g.fQuiet && totalSize>0 ){
330330
 processCnt += incrSize;
331331
 percent_complete((processCnt*1000)/totalSize);
332332
 }
333333
 create_cluster();
334
- if (!g.fQuiet) {
334
+ if( !g.fQuiet && totalSize>0 ){
335335
 processCnt += incrSize;
336336
 percent_complete((processCnt*1000)/totalSize);
337337
 }
338338
 if(!g.fQuiet && ttyOutput ){
339339
 printf("\n");
@@ -417,11 +417,11 @@
417417
 db_close();
418418
 db_open_repository(g.zRepositoryName);
419419
 }
420420
 db_begin_transaction();
421421
 create_cluster();
422
- db_end_transaction(0);
422
+ db_end_transaction(0);
423423
 }
424424
425425
 /*
426426
 ** COMMAND: scrub
427427
 ** %fossil scrub [--verily] [--force] [REPOSITORY]
428428
429429
ADDED src/shell.c
--- src/rebuild.c
+++ src/rebuild.c
@@ -106,11 +106,11 @@
106 static void rebuild_step_done(rid){
107 /* assert( bag_find(&bagDone, rid)==0 ); */
108 bag_insert(&bagDone, rid);
109 if( ttyOutput ){
110 processCnt++;
111 if (!g.fQuiet) {
112 percent_complete((processCnt*1000)/totalSize);
113 }
114 }
115 }
116
@@ -324,16 +324,16 @@
324 }
325 }
326 db_finalize(&s);
327 manifest_crosslink_end();
328 rebuild_tag_trunk();
329 if (!g.fQuiet) {
330 processCnt += incrSize;
331 percent_complete((processCnt*1000)/totalSize);
332 }
333 create_cluster();
334 if (!g.fQuiet) {
335 processCnt += incrSize;
336 percent_complete((processCnt*1000)/totalSize);
337 }
338 if(!g.fQuiet && ttyOutput ){
339 printf("\n");
@@ -417,11 +417,11 @@
417 db_close();
418 db_open_repository(g.zRepositoryName);
419 }
420 db_begin_transaction();
421 create_cluster();
422 db_end_transaction(0);
423 }
424
425 /*
426 ** COMMAND: scrub
427 ** %fossil scrub [--verily] [--force] [REPOSITORY]
428
429 DDED src/shell.c
--- src/rebuild.c
+++ src/rebuild.c
@@ -106,11 +106,11 @@
106 static void rebuild_step_done(rid){
107 /* assert( bag_find(&bagDone, rid)==0 ); */
108 bag_insert(&bagDone, rid);
109 if( ttyOutput ){
110 processCnt++;
111 if (!g.fQuiet && totalSize>0) {
112 percent_complete((processCnt*1000)/totalSize);
113 }
114 }
115 }
116
@@ -324,16 +324,16 @@
324 }
325 }
326 db_finalize(&s);
327 manifest_crosslink_end();
328 rebuild_tag_trunk();
329 if( !g.fQuiet && totalSize>0 ){
330 processCnt += incrSize;
331 percent_complete((processCnt*1000)/totalSize);
332 }
333 create_cluster();
334 if( !g.fQuiet && totalSize>0 ){
335 processCnt += incrSize;
336 percent_complete((processCnt*1000)/totalSize);
337 }
338 if(!g.fQuiet && ttyOutput ){
339 printf("\n");
@@ -417,11 +417,11 @@
417 db_close();
418 db_open_repository(g.zRepositoryName);
419 }
420 db_begin_transaction();
421 create_cluster();
422 db_end_transaction(0);
423 }
424
425 /*
426 ** COMMAND: scrub
427 ** %fossil scrub [--verily] [--force] [REPOSITORY]
428
429 DDED src/shell.c
M src/shell.c
+4
--- a/src/shell.c
+++ b/src/shell.c
@@ -0,0 +1,4 @@
1
+;
2
+ datVReader C#ifde;AllocPAGE**lseif(cannot close database \"%s\"rc++rc;
3
+}
4
+sqlite3**, db,
--- a/src/shell.c
+++ b/src/shell.c
@@ -0,0 +1,4 @@
 
 
 
 
--- a/src/shell.c
+++ b/src/shell.c
@@ -0,0 +1,4 @@
1 ;
2 datVReader C#ifde;AllocPAGE**lseif(cannot close database \"%s\"rc++rc;
3 }
4 sqlite3**, db,
M src/xfer.c
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1309,11 +1309,11 @@
13091309
 }
13101310
 continue;
13111311
 }
13121312
 xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
13131313
 nCardRcvd++;
1314
- if( !g.cgiOutput && !g.fQuiet ){
1314
+ if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
13151315
 pctDone = (recv.iCursor*100)/recv.nUsed;
13161316
 if( pctDone!=lastPctDone ){
13171317
 printf("\rprocessed: %d%% ", pctDone);
13181318
 lastPctDone = pctDone;
13191319
 fflush(stdout);
13201320
--- src/xfer.c
+++ src/xfer.c
@@ -1309,11 +1309,11 @@
1309 }
1310 continue;
1311 }
1312 xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
1313 nCardRcvd++;
1314 if( !g.cgiOutput && !g.fQuiet ){
1315 pctDone = (recv.iCursor*100)/recv.nUsed;
1316 if( pctDone!=lastPctDone ){
1317 printf("\rprocessed: %d%% ", pctDone);
1318 lastPctDone = pctDone;
1319 fflush(stdout);
1320
--- src/xfer.c
+++ src/xfer.c
@@ -1309,11 +1309,11 @@
1309 }
1310 continue;
1311 }
1312 xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
1313 nCardRcvd++;
1314 if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
1315 pctDone = (recv.iCursor*100)/recv.nUsed;
1316 if( pctDone!=lastPctDone ){
1317 printf("\rprocessed: %d%% ", pctDone);
1318 lastPctDone = pctDone;
1319 fflush(stdout);
1320
M src/xfer.c
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1309,11 +1309,11 @@
13091309
 }
13101310
 continue;
13111311
 }
13121312
 xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
13131313
 nCardRcvd++;
1314
- if( !g.cgiOutput && !g.fQuiet ){
1314
+ if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
13151315
 pctDone = (recv.iCursor*100)/recv.nUsed;
13161316
 if( pctDone!=lastPctDone ){
13171317
 printf("\rprocessed: %d%% ", pctDone);
13181318
 lastPctDone = pctDone;
13191319
 fflush(stdout);
13201320
--- src/xfer.c
+++ src/xfer.c
@@ -1309,11 +1309,11 @@
1309 }
1310 continue;
1311 }
1312 xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
1313 nCardRcvd++;
1314 if( !g.cgiOutput && !g.fQuiet ){
1315 pctDone = (recv.iCursor*100)/recv.nUsed;
1316 if( pctDone!=lastPctDone ){
1317 printf("\rprocessed: %d%% ", pctDone);
1318 lastPctDone = pctDone;
1319 fflush(stdout);
1320
--- src/xfer.c
+++ src/xfer.c
@@ -1309,11 +1309,11 @@
1309 }
1310 continue;
1311 }
1312 xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
1313 nCardRcvd++;
1314 if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
1315 pctDone = (recv.iCursor*100)/recv.nUsed;
1316 if( pctDone!=lastPctDone ){
1317 printf("\rprocessed: %d%% ", pctDone);
1318 lastPctDone = pctDone;
1319 fflush(stdout);
1320
M win/Makefile.PellesCGMake
+13 -6
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -75,14 +75,18 @@
7575
 UTILS=translate.exe mkindex.exe makeheaders.exe
7676
 UTILS_OBJ=$(UTILS:.exe=.obj)
7777
 UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
7878
7979
 # define the sqlite files, which need special flags on compile
80
-SQLITESRC=sqlite3.c
81
-ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
82
-SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
83
-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
80
+SQLITESRC1=sqlite3.c
81
+SQLITESRC2=shell.c
82
+ORIGSQLITESRC=$(foreach sf,$(SQLITESRC1) $(SQLITESRC2),$(SRCDIR)$(sf))
83
+SQLITEOBJ1=$(foreach sf,$(SQLITESRC1),$(sf:.c=.obj))
84
+SQLITEOBJ2=$(foreach sf,$(SQLITESRC2),$(sf:.c=.obj))
85
+SQLITEOBJ=$(foreach sf,$(SQLITESRC1) $(SQLITESRC2),$(sf:.c=.obj))
86
+SQLITEDEFINES1=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
87
+SQLITEDEFINES2=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1
8488
8589
 # define the th scripting files, which need special flags on compile
8690
 THSRC=th.c th_lang.c
8791
 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
8892
 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
@@ -150,12 +154,15 @@
150154
 # compile C sources with relevant options
151155
152156
 $(TRANSLATEDOBJ): %_.obj: %_.c %.h
153157
 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
154158
155
-$(SQLITEOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h
156
- $(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
159
+$(SQLITEOBJ1): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h
160
+ $(CC) $(CCFLAGS) $(SQLITEDEFINES1) $(INCLUDE) "$<" -Fo"$@"
161
+
162
+$(SQLITEOBJ2): %.obj: $(SRCDIR)%.c
163
+ $(CC) $(CCFLAGS) $(SQLITEDEFINES2) $(INCLUDE) "$<" -Fo"$@"
157164
158165
 $(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
159166
 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
160167
161168
 $(ZLIBOBJ): %.obj: $(ZLIBSRCDIR)%.c
162169
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -75,14 +75,18 @@
75 UTILS=translate.exe mkindex.exe makeheaders.exe
76 UTILS_OBJ=$(UTILS:.exe=.obj)
77 UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
78
79 # define the sqlite files, which need special flags on compile
80 SQLITESRC=sqlite3.c
81 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
82 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
83 SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
 
 
 
 
84
85 # define the th scripting files, which need special flags on compile
86 THSRC=th.c th_lang.c
87 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
88 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
@@ -150,12 +154,15 @@
150 # compile C sources with relevant options
151
152 $(TRANSLATEDOBJ): %_.obj: %_.c %.h
153 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
154
155 $(SQLITEOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h
156 $(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
 
 
 
157
158 $(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
159 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
160
161 $(ZLIBOBJ): %.obj: $(ZLIBSRCDIR)%.c
162
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -75,14 +75,18 @@
75 UTILS=translate.exe mkindex.exe makeheaders.exe
76 UTILS_OBJ=$(UTILS:.exe=.obj)
77 UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
78
79 # define the sqlite files, which need special flags on compile
80 SQLITESRC1=sqlite3.c
81 SQLITESRC2=shell.c
82 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC1) $(SQLITESRC2),$(SRCDIR)$(sf))
83 SQLITEOBJ1=$(foreach sf,$(SQLITESRC1),$(sf:.c=.obj))
84 SQLITEOBJ2=$(foreach sf,$(SQLITESRC2),$(sf:.c=.obj))
85 SQLITEOBJ=$(foreach sf,$(SQLITESRC1) $(SQLITESRC2),$(sf:.c=.obj))
86 SQLITEDEFINES1=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
87 SQLITEDEFINES2=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1
88
89 # define the th scripting files, which need special flags on compile
90 THSRC=th.c th_lang.c
91 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
92 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
@@ -150,12 +154,15 @@
154 # compile C sources with relevant options
155
156 $(TRANSLATEDOBJ): %_.obj: %_.c %.h
157 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
158
159 $(SQLITEOBJ1): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h
160 $(CC) $(CCFLAGS) $(SQLITEDEFINES1) $(INCLUDE) "$<" -Fo"$@"
161
162 $(SQLITEOBJ2): %.obj: $(SRCDIR)%.c
163 $(CC) $(CCFLAGS) $(SQLITEDEFINES2) $(INCLUDE) "$<" -Fo"$@"
164
165 $(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
166 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
167
168 $(ZLIBOBJ): %.obj: $(ZLIBSRCDIR)%.c
169
M win/Makefile.PellesCGMake
+13 -6
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -75,14 +75,18 @@
7575
 UTILS=translate.exe mkindex.exe makeheaders.exe
7676
 UTILS_OBJ=$(UTILS:.exe=.obj)
7777
 UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
7878
7979
 # define the sqlite files, which need special flags on compile
80
-SQLITESRC=sqlite3.c
81
-ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
82
-SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
83
-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
80
+SQLITESRC1=sqlite3.c
81
+SQLITESRC2=shell.c
82
+ORIGSQLITESRC=$(foreach sf,$(SQLITESRC1) $(SQLITESRC2),$(SRCDIR)$(sf))
83
+SQLITEOBJ1=$(foreach sf,$(SQLITESRC1),$(sf:.c=.obj))
84
+SQLITEOBJ2=$(foreach sf,$(SQLITESRC2),$(sf:.c=.obj))
85
+SQLITEOBJ=$(foreach sf,$(SQLITESRC1) $(SQLITESRC2),$(sf:.c=.obj))
86
+SQLITEDEFINES1=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
87
+SQLITEDEFINES2=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1
8488
8589
 # define the th scripting files, which need special flags on compile
8690
 THSRC=th.c th_lang.c
8791
 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
8892
 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
@@ -150,12 +154,15 @@
150154
 # compile C sources with relevant options
151155
152156
 $(TRANSLATEDOBJ): %_.obj: %_.c %.h
153157
 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
154158
155
-$(SQLITEOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h
156
- $(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
159
+$(SQLITEOBJ1): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h
160
+ $(CC) $(CCFLAGS) $(SQLITEDEFINES1) $(INCLUDE) "$<" -Fo"$@"
161
+
162
+$(SQLITEOBJ2): %.obj: $(SRCDIR)%.c
163
+ $(CC) $(CCFLAGS) $(SQLITEDEFINES2) $(INCLUDE) "$<" -Fo"$@"
157164
158165
 $(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
159166
 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
160167
161168
 $(ZLIBOBJ): %.obj: $(ZLIBSRCDIR)%.c
162169
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -75,14 +75,18 @@
75 UTILS=translate.exe mkindex.exe makeheaders.exe
76 UTILS_OBJ=$(UTILS:.exe=.obj)
77 UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
78
79 # define the sqlite files, which need special flags on compile
80 SQLITESRC=sqlite3.c
81 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
82 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
83 SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
 
 
 
 
84
85 # define the th scripting files, which need special flags on compile
86 THSRC=th.c th_lang.c
87 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
88 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
@@ -150,12 +154,15 @@
150 # compile C sources with relevant options
151
152 $(TRANSLATEDOBJ): %_.obj: %_.c %.h
153 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
154
155 $(SQLITEOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h
156 $(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@"
 
 
 
157
158 $(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
159 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
160
161 $(ZLIBOBJ): %.obj: $(ZLIBSRCDIR)%.c
162
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -75,14 +75,18 @@
75 UTILS=translate.exe mkindex.exe makeheaders.exe
76 UTILS_OBJ=$(UTILS:.exe=.obj)
77 UTILS_SRC=$(foreach uf,$(UTILS),$(SRCDIR)$(uf:.exe=.c))
78
79 # define the sqlite files, which need special flags on compile
80 SQLITESRC1=sqlite3.c
81 SQLITESRC2=shell.c
82 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC1) $(SQLITESRC2),$(SRCDIR)$(sf))
83 SQLITEOBJ1=$(foreach sf,$(SQLITESRC1),$(sf:.c=.obj))
84 SQLITEOBJ2=$(foreach sf,$(SQLITESRC2),$(sf:.c=.obj))
85 SQLITEOBJ=$(foreach sf,$(SQLITESRC1) $(SQLITESRC2),$(sf:.c=.obj))
86 SQLITEDEFINES1=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
87 SQLITEDEFINES2=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1
88
89 # define the th scripting files, which need special flags on compile
90 THSRC=th.c th_lang.c
91 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
92 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
@@ -150,12 +154,15 @@
154 # compile C sources with relevant options
155
156 $(TRANSLATEDOBJ): %_.obj: %_.c %.h
157 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
158
159 $(SQLITEOBJ1): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h
160 $(CC) $(CCFLAGS) $(SQLITEDEFINES1) $(INCLUDE) "$<" -Fo"$@"
161
162 $(SQLITEOBJ2): %.obj: $(SRCDIR)%.c
163 $(CC) $(CCFLAGS) $(SQLITEDEFINES2) $(INCLUDE) "$<" -Fo"$@"
164
165 $(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h
166 $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
167
168 $(ZLIBOBJ): %.obj: $(ZLIBSRCDIR)%.c
169
M win/Makefile.dmc
+5 -2
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
2626
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
2727
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
2828
2929
 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
3030
31
-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
31
+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\shell$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
3232
3333
 RC=$(DMDIR)\bin\rcc
3434
 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
3535
3636
 APPNAME = $(OBJDIR)\fossil$(E)
@@ -43,11 +43,11 @@
4343
4444
 fossil.res: $B\win\fossil.rc VERSION.h
4545
 $(RC) $(RCFLAGS) -o$@ $B\win\fossil.rc
4646
4747
 $(OBJDIR)\link: $B\win\Makefile.dmc
48
- +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
48
+ +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
4949
 +echo fossil >> $@
5050
 +echo fossil >> $@
5151
 +echo $(LIBS) >> $@
5252
 +echo. >> $@
5353
 +echo fossil >> $@
@@ -67,10 +67,13 @@
6767
 $(BCC) -o$@ $**
6868
6969
 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
7070
 $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
7171
72
+$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
73
+ $(TCC) -o$@ -c -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 $**
74
+
7275
 $(OBJDIR)\th$O : $(SRCDIR)\th.c
7376
 $(TCC) -o$@ -c $**
7477
7578
 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
7679
 $(TCC) -o$@ -c $**
7780
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
26 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33 RC=$(DMDIR)\bin\rcc
34 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36 APPNAME = $(OBJDIR)\fossil$(E)
@@ -43,11 +43,11 @@
43
44 fossil.res: $B\win\fossil.rc VERSION.h
45 $(RC) $(RCFLAGS) -o$@ $B\win\fossil.rc
46
47 $(OBJDIR)\link: $B\win\Makefile.dmc
48 +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
49 +echo fossil >> $@
50 +echo fossil >> $@
51 +echo $(LIBS) >> $@
52 +echo. >> $@
53 +echo fossil >> $@
@@ -67,10 +67,13 @@
67 $(BCC) -o$@ $**
68
69 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
70 $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
71
 
 
 
72 $(OBJDIR)\th$O : $(SRCDIR)\th.c
73 $(TCC) -o$@ -c $**
74
75 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
76 $(TCC) -o$@ -c $**
77
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
26 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\shell$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33 RC=$(DMDIR)\bin\rcc
34 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36 APPNAME = $(OBJDIR)\fossil$(E)
@@ -43,11 +43,11 @@
43
44 fossil.res: $B\win\fossil.rc VERSION.h
45 $(RC) $(RCFLAGS) -o$@ $B\win\fossil.rc
46
47 $(OBJDIR)\link: $B\win\Makefile.dmc
48 +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
49 +echo fossil >> $@
50 +echo fossil >> $@
51 +echo $(LIBS) >> $@
52 +echo. >> $@
53 +echo fossil >> $@
@@ -67,10 +67,13 @@
67 $(BCC) -o$@ $**
68
69 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
70 $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
71
72 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
73 $(TCC) -o$@ -c -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 $**
74
75 $(OBJDIR)\th$O : $(SRCDIR)\th.c
76 $(TCC) -o$@ -c $**
77
78 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
79 $(TCC) -o$@ -c $**
80
M win/Makefile.dmc
+5 -2
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
2626
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
2727
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
2828
2929
 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
3030
31
-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
31
+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\shell$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
3232
3333
 RC=$(DMDIR)\bin\rcc
3434
 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
3535
3636
 APPNAME = $(OBJDIR)\fossil$(E)
@@ -43,11 +43,11 @@
4343
4444
 fossil.res: $B\win\fossil.rc VERSION.h
4545
 $(RC) $(RCFLAGS) -o$@ $B\win\fossil.rc
4646
4747
 $(OBJDIR)\link: $B\win\Makefile.dmc
48
- +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
48
+ +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
4949
 +echo fossil >> $@
5050
 +echo fossil >> $@
5151
 +echo $(LIBS) >> $@
5252
 +echo. >> $@
5353
 +echo fossil >> $@
@@ -67,10 +67,13 @@
6767
 $(BCC) -o$@ $**
6868
6969
 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
7070
 $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
7171
72
+$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
73
+ $(TCC) -o$@ -c -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 $**
74
+
7275
 $(OBJDIR)\th$O : $(SRCDIR)\th.c
7376
 $(TCC) -o$@ -c $**
7477
7578
 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
7679
 $(TCC) -o$@ -c $**
7780
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
26 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33 RC=$(DMDIR)\bin\rcc
34 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36 APPNAME = $(OBJDIR)\fossil$(E)
@@ -43,11 +43,11 @@
43
44 fossil.res: $B\win\fossil.rc VERSION.h
45 $(RC) $(RCFLAGS) -o$@ $B\win\fossil.rc
46
47 $(OBJDIR)\link: $B\win\Makefile.dmc
48 +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
49 +echo fossil >> $@
50 +echo fossil >> $@
51 +echo $(LIBS) >> $@
52 +echo. >> $@
53 +echo fossil >> $@
@@ -67,10 +67,13 @@
67 $(BCC) -o$@ $**
68
69 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
70 $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
71
 
 
 
72 $(OBJDIR)\th$O : $(SRCDIR)\th.c
73 $(TCC) -o$@ -c $**
74
75 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
76 $(TCC) -o$@ -c $**
77
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,11 +26,11 @@
26 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29 SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\shell$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33 RC=$(DMDIR)\bin\rcc
34 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36 APPNAME = $(OBJDIR)\fossil$(E)
@@ -43,11 +43,11 @@
43
44 fossil.res: $B\win\fossil.rc VERSION.h
45 $(RC) $(RCFLAGS) -o$@ $B\win\fossil.rc
46
47 $(OBJDIR)\link: $B\win\Makefile.dmc
48 +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
49 +echo fossil >> $@
50 +echo fossil >> $@
51 +echo $(LIBS) >> $@
52 +echo. >> $@
53 +echo fossil >> $@
@@ -67,10 +67,13 @@
67 $(BCC) -o$@ $**
68
69 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
70 $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
71
72 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
73 $(TCC) -o$@ -c -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 $**
74
75 $(OBJDIR)\th$O : $(SRCDIR)\th.c
76 $(TCC) -o$@ -c $**
77
78 $(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
79 $(TCC) -o$@ -c $**
80

Keyboard Shortcuts

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