Fossil SCM
Remove the code that implemented legacy "fossil search" command. FTS4 will be used moving forward.
Commit
389c70a56a6a92221c134547a0d74fcfbed242c1
Parent
9f9dfe3a9881aeb…
7 files changed
+4
-12
-1
-6
+4
-10
-12
-10
+4
| --- src/ftsearch.c | ||
| +++ src/ftsearch.c | ||
| @@ -322,10 +322,14 @@ | ||
| 322 | 322 | const char *zMark2 = "*"; |
| 323 | 323 | #else |
| 324 | 324 | const char *zMark1 = "\033[1m"; |
| 325 | 325 | const char *zMark2 = "\033[0m"; |
| 326 | 326 | #endif |
| 327 | + if( !db_table_exists("repository","ftsearch") ){ | |
| 328 | + fossil_fatal("search is disabled - see \"fossil help search\"" | |
| 329 | + " for more information"); | |
| 330 | + } | |
| 327 | 331 | db_prepare(&q, "SELECT " |
| 328 | 332 | " snippet(ftsearch,%Q,%Q,'...')," |
| 329 | 333 | " ftsearchxref.ftsid" |
| 330 | 334 | " FROM ftsearch, ftsearchxref" |
| 331 | 335 | " WHERE ftsearch.body MATCH %Q" |
| 332 | 336 |
| --- src/ftsearch.c | |
| +++ src/ftsearch.c | |
| @@ -322,10 +322,14 @@ | |
| 322 | const char *zMark2 = "*"; |
| 323 | #else |
| 324 | const char *zMark1 = "\033[1m"; |
| 325 | const char *zMark2 = "\033[0m"; |
| 326 | #endif |
| 327 | db_prepare(&q, "SELECT " |
| 328 | " snippet(ftsearch,%Q,%Q,'...')," |
| 329 | " ftsearchxref.ftsid" |
| 330 | " FROM ftsearch, ftsearchxref" |
| 331 | " WHERE ftsearch.body MATCH %Q" |
| 332 |
| --- src/ftsearch.c | |
| +++ src/ftsearch.c | |
| @@ -322,10 +322,14 @@ | |
| 322 | const char *zMark2 = "*"; |
| 323 | #else |
| 324 | const char *zMark1 = "\033[1m"; |
| 325 | const char *zMark2 = "\033[0m"; |
| 326 | #endif |
| 327 | if( !db_table_exists("repository","ftsearch") ){ |
| 328 | fossil_fatal("search is disabled - see \"fossil help search\"" |
| 329 | " for more information"); |
| 330 | } |
| 331 | db_prepare(&q, "SELECT " |
| 332 | " snippet(ftsearch,%Q,%Q,'...')," |
| 333 | " ftsearchxref.ftsid" |
| 334 | " FROM ftsearch, ftsearchxref" |
| 335 | " WHERE ftsearch.body MATCH %Q" |
| 336 |
-12
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -96,11 +96,10 @@ | ||
| 96 | 96 | $(SRCDIR)/rebuild.c \ |
| 97 | 97 | $(SRCDIR)/regexp.c \ |
| 98 | 98 | $(SRCDIR)/report.c \ |
| 99 | 99 | $(SRCDIR)/rss.c \ |
| 100 | 100 | $(SRCDIR)/schema.c \ |
| 101 | - $(SRCDIR)/search.c \ | |
| 102 | 101 | $(SRCDIR)/setup.c \ |
| 103 | 102 | $(SRCDIR)/sha1.c \ |
| 104 | 103 | $(SRCDIR)/shun.c \ |
| 105 | 104 | $(SRCDIR)/sitemap.c \ |
| 106 | 105 | $(SRCDIR)/skins.c \ |
| @@ -219,11 +218,10 @@ | ||
| 219 | 218 | $(OBJDIR)/rebuild_.c \ |
| 220 | 219 | $(OBJDIR)/regexp_.c \ |
| 221 | 220 | $(OBJDIR)/report_.c \ |
| 222 | 221 | $(OBJDIR)/rss_.c \ |
| 223 | 222 | $(OBJDIR)/schema_.c \ |
| 224 | - $(OBJDIR)/search_.c \ | |
| 225 | 223 | $(OBJDIR)/setup_.c \ |
| 226 | 224 | $(OBJDIR)/sha1_.c \ |
| 227 | 225 | $(OBJDIR)/shun_.c \ |
| 228 | 226 | $(OBJDIR)/sitemap_.c \ |
| 229 | 227 | $(OBJDIR)/skins_.c \ |
| @@ -339,11 +337,10 @@ | ||
| 339 | 337 | $(OBJDIR)/rebuild.o \ |
| 340 | 338 | $(OBJDIR)/regexp.o \ |
| 341 | 339 | $(OBJDIR)/report.o \ |
| 342 | 340 | $(OBJDIR)/rss.o \ |
| 343 | 341 | $(OBJDIR)/schema.o \ |
| 344 | - $(OBJDIR)/search.o \ | |
| 345 | 342 | $(OBJDIR)/setup.o \ |
| 346 | 343 | $(OBJDIR)/sha1.o \ |
| 347 | 344 | $(OBJDIR)/shun.o \ |
| 348 | 345 | $(OBJDIR)/sitemap.o \ |
| 349 | 346 | $(OBJDIR)/skins.o \ |
| @@ -568,11 +565,10 @@ | ||
| 568 | 565 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 569 | 566 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 570 | 567 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 571 | 568 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| 572 | 569 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 573 | - $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ | |
| 574 | 570 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 575 | 571 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 576 | 572 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 577 | 573 | $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ |
| 578 | 574 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| @@ -1281,18 +1277,10 @@ | ||
| 1281 | 1277 | $(OBJDIR)/schema.o: $(OBJDIR)/schema_.c $(OBJDIR)/schema.h $(SRCDIR)/config.h |
| 1282 | 1278 | $(XTCC) -o $(OBJDIR)/schema.o -c $(OBJDIR)/schema_.c |
| 1283 | 1279 | |
| 1284 | 1280 | $(OBJDIR)/schema.h: $(OBJDIR)/headers |
| 1285 | 1281 | |
| 1286 | -$(OBJDIR)/search_.c: $(SRCDIR)/search.c $(OBJDIR)/translate | |
| 1287 | - $(OBJDIR)/translate $(SRCDIR)/search.c >$@ | |
| 1288 | - | |
| 1289 | -$(OBJDIR)/search.o: $(OBJDIR)/search_.c $(OBJDIR)/search.h $(SRCDIR)/config.h | |
| 1290 | - $(XTCC) -o $(OBJDIR)/search.o -c $(OBJDIR)/search_.c | |
| 1291 | - | |
| 1292 | -$(OBJDIR)/search.h: $(OBJDIR)/headers | |
| 1293 | - | |
| 1294 | 1282 | $(OBJDIR)/setup_.c: $(SRCDIR)/setup.c $(OBJDIR)/translate |
| 1295 | 1283 | $(OBJDIR)/translate $(SRCDIR)/setup.c >$@ |
| 1296 | 1284 | |
| 1297 | 1285 | $(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h |
| 1298 | 1286 | $(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c |
| 1299 | 1287 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -96,11 +96,10 @@ | |
| 96 | $(SRCDIR)/rebuild.c \ |
| 97 | $(SRCDIR)/regexp.c \ |
| 98 | $(SRCDIR)/report.c \ |
| 99 | $(SRCDIR)/rss.c \ |
| 100 | $(SRCDIR)/schema.c \ |
| 101 | $(SRCDIR)/search.c \ |
| 102 | $(SRCDIR)/setup.c \ |
| 103 | $(SRCDIR)/sha1.c \ |
| 104 | $(SRCDIR)/shun.c \ |
| 105 | $(SRCDIR)/sitemap.c \ |
| 106 | $(SRCDIR)/skins.c \ |
| @@ -219,11 +218,10 @@ | |
| 219 | $(OBJDIR)/rebuild_.c \ |
| 220 | $(OBJDIR)/regexp_.c \ |
| 221 | $(OBJDIR)/report_.c \ |
| 222 | $(OBJDIR)/rss_.c \ |
| 223 | $(OBJDIR)/schema_.c \ |
| 224 | $(OBJDIR)/search_.c \ |
| 225 | $(OBJDIR)/setup_.c \ |
| 226 | $(OBJDIR)/sha1_.c \ |
| 227 | $(OBJDIR)/shun_.c \ |
| 228 | $(OBJDIR)/sitemap_.c \ |
| 229 | $(OBJDIR)/skins_.c \ |
| @@ -339,11 +337,10 @@ | |
| 339 | $(OBJDIR)/rebuild.o \ |
| 340 | $(OBJDIR)/regexp.o \ |
| 341 | $(OBJDIR)/report.o \ |
| 342 | $(OBJDIR)/rss.o \ |
| 343 | $(OBJDIR)/schema.o \ |
| 344 | $(OBJDIR)/search.o \ |
| 345 | $(OBJDIR)/setup.o \ |
| 346 | $(OBJDIR)/sha1.o \ |
| 347 | $(OBJDIR)/shun.o \ |
| 348 | $(OBJDIR)/sitemap.o \ |
| 349 | $(OBJDIR)/skins.o \ |
| @@ -568,11 +565,10 @@ | |
| 568 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 569 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 570 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 571 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| 572 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 573 | $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ |
| 574 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 575 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 576 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 577 | $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ |
| 578 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| @@ -1281,18 +1277,10 @@ | |
| 1281 | $(OBJDIR)/schema.o: $(OBJDIR)/schema_.c $(OBJDIR)/schema.h $(SRCDIR)/config.h |
| 1282 | $(XTCC) -o $(OBJDIR)/schema.o -c $(OBJDIR)/schema_.c |
| 1283 | |
| 1284 | $(OBJDIR)/schema.h: $(OBJDIR)/headers |
| 1285 | |
| 1286 | $(OBJDIR)/search_.c: $(SRCDIR)/search.c $(OBJDIR)/translate |
| 1287 | $(OBJDIR)/translate $(SRCDIR)/search.c >$@ |
| 1288 | |
| 1289 | $(OBJDIR)/search.o: $(OBJDIR)/search_.c $(OBJDIR)/search.h $(SRCDIR)/config.h |
| 1290 | $(XTCC) -o $(OBJDIR)/search.o -c $(OBJDIR)/search_.c |
| 1291 | |
| 1292 | $(OBJDIR)/search.h: $(OBJDIR)/headers |
| 1293 | |
| 1294 | $(OBJDIR)/setup_.c: $(SRCDIR)/setup.c $(OBJDIR)/translate |
| 1295 | $(OBJDIR)/translate $(SRCDIR)/setup.c >$@ |
| 1296 | |
| 1297 | $(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h |
| 1298 | $(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c |
| 1299 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -96,11 +96,10 @@ | |
| 96 | $(SRCDIR)/rebuild.c \ |
| 97 | $(SRCDIR)/regexp.c \ |
| 98 | $(SRCDIR)/report.c \ |
| 99 | $(SRCDIR)/rss.c \ |
| 100 | $(SRCDIR)/schema.c \ |
| 101 | $(SRCDIR)/setup.c \ |
| 102 | $(SRCDIR)/sha1.c \ |
| 103 | $(SRCDIR)/shun.c \ |
| 104 | $(SRCDIR)/sitemap.c \ |
| 105 | $(SRCDIR)/skins.c \ |
| @@ -219,11 +218,10 @@ | |
| 218 | $(OBJDIR)/rebuild_.c \ |
| 219 | $(OBJDIR)/regexp_.c \ |
| 220 | $(OBJDIR)/report_.c \ |
| 221 | $(OBJDIR)/rss_.c \ |
| 222 | $(OBJDIR)/schema_.c \ |
| 223 | $(OBJDIR)/setup_.c \ |
| 224 | $(OBJDIR)/sha1_.c \ |
| 225 | $(OBJDIR)/shun_.c \ |
| 226 | $(OBJDIR)/sitemap_.c \ |
| 227 | $(OBJDIR)/skins_.c \ |
| @@ -339,11 +337,10 @@ | |
| 337 | $(OBJDIR)/rebuild.o \ |
| 338 | $(OBJDIR)/regexp.o \ |
| 339 | $(OBJDIR)/report.o \ |
| 340 | $(OBJDIR)/rss.o \ |
| 341 | $(OBJDIR)/schema.o \ |
| 342 | $(OBJDIR)/setup.o \ |
| 343 | $(OBJDIR)/sha1.o \ |
| 344 | $(OBJDIR)/shun.o \ |
| 345 | $(OBJDIR)/sitemap.o \ |
| 346 | $(OBJDIR)/skins.o \ |
| @@ -568,11 +565,10 @@ | |
| 565 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 566 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 567 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 568 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| 569 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 570 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 571 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 572 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 573 | $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ |
| 574 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| @@ -1281,18 +1277,10 @@ | |
| 1277 | $(OBJDIR)/schema.o: $(OBJDIR)/schema_.c $(OBJDIR)/schema.h $(SRCDIR)/config.h |
| 1278 | $(XTCC) -o $(OBJDIR)/schema.o -c $(OBJDIR)/schema_.c |
| 1279 | |
| 1280 | $(OBJDIR)/schema.h: $(OBJDIR)/headers |
| 1281 | |
| 1282 | $(OBJDIR)/setup_.c: $(SRCDIR)/setup.c $(OBJDIR)/translate |
| 1283 | $(OBJDIR)/translate $(SRCDIR)/setup.c >$@ |
| 1284 | |
| 1285 | $(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h |
| 1286 | $(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c |
| 1287 |
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -102,11 +102,10 @@ | ||
| 102 | 102 | rebuild |
| 103 | 103 | regexp |
| 104 | 104 | report |
| 105 | 105 | rss |
| 106 | 106 | schema |
| 107 | - search | |
| 108 | 107 | setup |
| 109 | 108 | sha1 |
| 110 | 109 | shun |
| 111 | 110 | sitemap |
| 112 | 111 | skins |
| 113 | 112 | |
| 114 | 113 | DELETED src/search.c |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -102,11 +102,10 @@ | |
| 102 | rebuild |
| 103 | regexp |
| 104 | report |
| 105 | rss |
| 106 | schema |
| 107 | search |
| 108 | setup |
| 109 | sha1 |
| 110 | shun |
| 111 | sitemap |
| 112 | skins |
| 113 | |
| 114 | ELETED src/search.c |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -102,11 +102,10 @@ | |
| 102 | rebuild |
| 103 | regexp |
| 104 | report |
| 105 | rss |
| 106 | schema |
| 107 | setup |
| 108 | sha1 |
| 109 | shun |
| 110 | sitemap |
| 111 | skins |
| 112 | |
| 113 | ELETED src/search.c |
D
src/search.c
-6
| --- a/src/search.c | ||
| +++ b/src/search.c | ||
| @@ -1,6 +0,0 @@ | ||
| 1 | -if( nHdr || zType[0]!='d' ){else{value(context, argv[2]); | |
| 2 | - }body if( nHdr || zType[0]!='d' ){else{value(context, argv[2]); | |
| 3 | - }bodycore() AS y AND y>08] | |
| 4 | -}; | |
| 5 | -#endif){ | |
| 6 | - int n |
| --- a/src/search.c | |
| +++ b/src/search.c | |
| @@ -1,6 +0,0 @@ | |
| 1 | if( nHdr || zType[0]!='d' ){else{value(context, argv[2]); |
| 2 | }body if( nHdr || zType[0]!='d' ){else{value(context, argv[2]); |
| 3 | }bodycore() AS y AND y>08] |
| 4 | }; |
| 5 | #endif){ |
| 6 | int n |
| --- a/src/search.c | |
| +++ b/src/search.c | |
| @@ -1,6 +0,0 @@ | |
+4
-10
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -28,13 +28,13 @@ | ||
| 28 | 28 | |
| 29 | 29 | SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 |
| 30 | 30 | |
| 31 | 31 | SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | 32 | |
| 33 | -SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c foci_.c ftsearch_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c | |
| 33 | +SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c foci_.c ftsearch_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c | |
| 34 | 34 | |
| 35 | -OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$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)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\ftsearch$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O | |
| 35 | +OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$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)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\ftsearch$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O | |
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | RC=$(DMDIR)\bin\rcc |
| 39 | 39 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 40 | 40 | |
| @@ -49,11 +49,11 @@ | ||
| 49 | 49 | |
| 50 | 50 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 51 | 51 | $(RC) $(RCFLAGS) -o$@ $** |
| 52 | 52 | |
| 53 | 53 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 54 | - +echo add allrepo attach bag bisect blob branch browse builtin bundle cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo foci ftsearch fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf publish purge rebuild regexp report rss schema search setup sha1 shun sitemap skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@ | |
| 54 | + +echo add allrepo attach bag bisect blob branch browse builtin bundle cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo foci ftsearch fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf publish purge rebuild regexp report rss schema setup sha1 shun sitemap skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@ | |
| 55 | 55 | +echo fossil >> $@ |
| 56 | 56 | +echo fossil >> $@ |
| 57 | 57 | +echo $(LIBS) >> $@ |
| 58 | 58 | +echo. >> $@ |
| 59 | 59 | +echo fossil >> $@ |
| @@ -627,16 +627,10 @@ | ||
| 627 | 627 | $(TCC) -o$@ -c schema_.c |
| 628 | 628 | |
| 629 | 629 | schema_.c : $(SRCDIR)\schema.c |
| 630 | 630 | +translate$E $** > $@ |
| 631 | 631 | |
| 632 | -$(OBJDIR)\search$O : search_.c search.h | |
| 633 | - $(TCC) -o$@ -c search_.c | |
| 634 | - | |
| 635 | -search_.c : $(SRCDIR)\search.c | |
| 636 | - +translate$E $** > $@ | |
| 637 | - | |
| 638 | 632 | $(OBJDIR)\setup$O : setup_.c setup.h |
| 639 | 633 | $(TCC) -o$@ -c setup_.c |
| 640 | 634 | |
| 641 | 635 | setup_.c : $(SRCDIR)\setup.c |
| 642 | 636 | +translate$E $** > $@ |
| @@ -832,7 +826,7 @@ | ||
| 832 | 826 | |
| 833 | 827 | zip_.c : $(SRCDIR)\zip.c |
| 834 | 828 | +translate$E $** > $@ |
| 835 | 829 | |
| 836 | 830 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 837 | - +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h ftsearch_.c:ftsearch.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h | |
| 831 | + +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h ftsearch_.c:ftsearch.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h | |
| 838 | 832 | @copy /Y nul: headers |
| 839 | 833 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -28,13 +28,13 @@ | |
| 28 | |
| 29 | SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 |
| 30 | |
| 31 | SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | |
| 33 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c foci_.c ftsearch_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c |
| 34 | |
| 35 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$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)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\ftsearch$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 36 | |
| 37 | |
| 38 | RC=$(DMDIR)\bin\rcc |
| 39 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 40 | |
| @@ -49,11 +49,11 @@ | |
| 49 | |
| 50 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 51 | $(RC) $(RCFLAGS) -o$@ $** |
| 52 | |
| 53 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 54 | +echo add allrepo attach bag bisect blob branch browse builtin bundle cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo foci ftsearch fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf publish purge rebuild regexp report rss schema search setup sha1 shun sitemap skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@ |
| 55 | +echo fossil >> $@ |
| 56 | +echo fossil >> $@ |
| 57 | +echo $(LIBS) >> $@ |
| 58 | +echo. >> $@ |
| 59 | +echo fossil >> $@ |
| @@ -627,16 +627,10 @@ | |
| 627 | $(TCC) -o$@ -c schema_.c |
| 628 | |
| 629 | schema_.c : $(SRCDIR)\schema.c |
| 630 | +translate$E $** > $@ |
| 631 | |
| 632 | $(OBJDIR)\search$O : search_.c search.h |
| 633 | $(TCC) -o$@ -c search_.c |
| 634 | |
| 635 | search_.c : $(SRCDIR)\search.c |
| 636 | +translate$E $** > $@ |
| 637 | |
| 638 | $(OBJDIR)\setup$O : setup_.c setup.h |
| 639 | $(TCC) -o$@ -c setup_.c |
| 640 | |
| 641 | setup_.c : $(SRCDIR)\setup.c |
| 642 | +translate$E $** > $@ |
| @@ -832,7 +826,7 @@ | |
| 832 | |
| 833 | zip_.c : $(SRCDIR)\zip.c |
| 834 | +translate$E $** > $@ |
| 835 | |
| 836 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 837 | +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h ftsearch_.c:ftsearch.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h |
| 838 | @copy /Y nul: headers |
| 839 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -28,13 +28,13 @@ | |
| 28 | |
| 29 | SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 |
| 30 | |
| 31 | SHELL_OPTIONS = -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=fossil_open -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | |
| 33 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c foci_.c ftsearch_.c fusefs_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c setup_.c sha1_.c shun_.c sitemap_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c |
| 34 | |
| 35 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$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)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\ftsearch$O $(OBJDIR)\fusefs$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 36 | |
| 37 | |
| 38 | RC=$(DMDIR)\bin\rcc |
| 39 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 40 | |
| @@ -49,11 +49,11 @@ | |
| 49 | |
| 50 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 51 | $(RC) $(RCFLAGS) -o$@ $** |
| 52 | |
| 53 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 54 | +echo add allrepo attach bag bisect blob branch browse builtin bundle cache captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo foci ftsearch fusefs glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf loadctrl login lookslike main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf publish purge rebuild regexp report rss schema setup sha1 shun sitemap skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winfile winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@ |
| 55 | +echo fossil >> $@ |
| 56 | +echo fossil >> $@ |
| 57 | +echo $(LIBS) >> $@ |
| 58 | +echo. >> $@ |
| 59 | +echo fossil >> $@ |
| @@ -627,16 +627,10 @@ | |
| 627 | $(TCC) -o$@ -c schema_.c |
| 628 | |
| 629 | schema_.c : $(SRCDIR)\schema.c |
| 630 | +translate$E $** > $@ |
| 631 | |
| 632 | $(OBJDIR)\setup$O : setup_.c setup.h |
| 633 | $(TCC) -o$@ -c setup_.c |
| 634 | |
| 635 | setup_.c : $(SRCDIR)\setup.c |
| 636 | +translate$E $** > $@ |
| @@ -832,7 +826,7 @@ | |
| 826 | |
| 827 | zip_.c : $(SRCDIR)\zip.c |
| 828 | +translate$E $** > $@ |
| 829 | |
| 830 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 831 | +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h foci_.c:foci.h ftsearch_.c:ftsearch.h fusefs_.c:fusefs.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h |
| 832 | @copy /Y nul: headers |
| 833 |
-12
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -432,11 +432,10 @@ | ||
| 432 | 432 | $(SRCDIR)/rebuild.c \ |
| 433 | 433 | $(SRCDIR)/regexp.c \ |
| 434 | 434 | $(SRCDIR)/report.c \ |
| 435 | 435 | $(SRCDIR)/rss.c \ |
| 436 | 436 | $(SRCDIR)/schema.c \ |
| 437 | - $(SRCDIR)/search.c \ | |
| 438 | 437 | $(SRCDIR)/setup.c \ |
| 439 | 438 | $(SRCDIR)/sha1.c \ |
| 440 | 439 | $(SRCDIR)/shun.c \ |
| 441 | 440 | $(SRCDIR)/sitemap.c \ |
| 442 | 441 | $(SRCDIR)/skins.c \ |
| @@ -555,11 +554,10 @@ | ||
| 555 | 554 | $(OBJDIR)/rebuild_.c \ |
| 556 | 555 | $(OBJDIR)/regexp_.c \ |
| 557 | 556 | $(OBJDIR)/report_.c \ |
| 558 | 557 | $(OBJDIR)/rss_.c \ |
| 559 | 558 | $(OBJDIR)/schema_.c \ |
| 560 | - $(OBJDIR)/search_.c \ | |
| 561 | 559 | $(OBJDIR)/setup_.c \ |
| 562 | 560 | $(OBJDIR)/sha1_.c \ |
| 563 | 561 | $(OBJDIR)/shun_.c \ |
| 564 | 562 | $(OBJDIR)/sitemap_.c \ |
| 565 | 563 | $(OBJDIR)/skins_.c \ |
| @@ -675,11 +673,10 @@ | ||
| 675 | 673 | $(OBJDIR)/rebuild.o \ |
| 676 | 674 | $(OBJDIR)/regexp.o \ |
| 677 | 675 | $(OBJDIR)/report.o \ |
| 678 | 676 | $(OBJDIR)/rss.o \ |
| 679 | 677 | $(OBJDIR)/schema.o \ |
| 680 | - $(OBJDIR)/search.o \ | |
| 681 | 678 | $(OBJDIR)/setup.o \ |
| 682 | 679 | $(OBJDIR)/sha1.o \ |
| 683 | 680 | $(OBJDIR)/shun.o \ |
| 684 | 681 | $(OBJDIR)/sitemap.o \ |
| 685 | 682 | $(OBJDIR)/skins.o \ |
| @@ -988,11 +985,10 @@ | ||
| 988 | 985 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 989 | 986 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 990 | 987 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 991 | 988 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| 992 | 989 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 993 | - $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ | |
| 994 | 990 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 995 | 991 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 996 | 992 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 997 | 993 | $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ |
| 998 | 994 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| @@ -1703,18 +1699,10 @@ | ||
| 1703 | 1699 | $(OBJDIR)/schema.o: $(OBJDIR)/schema_.c $(OBJDIR)/schema.h $(SRCDIR)/config.h |
| 1704 | 1700 | $(XTCC) -o $(OBJDIR)/schema.o -c $(OBJDIR)/schema_.c |
| 1705 | 1701 | |
| 1706 | 1702 | $(OBJDIR)/schema.h: $(OBJDIR)/headers |
| 1707 | 1703 | |
| 1708 | -$(OBJDIR)/search_.c: $(SRCDIR)/search.c $(TRANSLATE) | |
| 1709 | - $(TRANSLATE) $(SRCDIR)/search.c >$@ | |
| 1710 | - | |
| 1711 | -$(OBJDIR)/search.o: $(OBJDIR)/search_.c $(OBJDIR)/search.h $(SRCDIR)/config.h | |
| 1712 | - $(XTCC) -o $(OBJDIR)/search.o -c $(OBJDIR)/search_.c | |
| 1713 | - | |
| 1714 | -$(OBJDIR)/search.h: $(OBJDIR)/headers | |
| 1715 | - | |
| 1716 | 1704 | $(OBJDIR)/setup_.c: $(SRCDIR)/setup.c $(TRANSLATE) |
| 1717 | 1705 | $(TRANSLATE) $(SRCDIR)/setup.c >$@ |
| 1718 | 1706 | |
| 1719 | 1707 | $(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h |
| 1720 | 1708 | $(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c |
| 1721 | 1709 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -432,11 +432,10 @@ | |
| 432 | $(SRCDIR)/rebuild.c \ |
| 433 | $(SRCDIR)/regexp.c \ |
| 434 | $(SRCDIR)/report.c \ |
| 435 | $(SRCDIR)/rss.c \ |
| 436 | $(SRCDIR)/schema.c \ |
| 437 | $(SRCDIR)/search.c \ |
| 438 | $(SRCDIR)/setup.c \ |
| 439 | $(SRCDIR)/sha1.c \ |
| 440 | $(SRCDIR)/shun.c \ |
| 441 | $(SRCDIR)/sitemap.c \ |
| 442 | $(SRCDIR)/skins.c \ |
| @@ -555,11 +554,10 @@ | |
| 555 | $(OBJDIR)/rebuild_.c \ |
| 556 | $(OBJDIR)/regexp_.c \ |
| 557 | $(OBJDIR)/report_.c \ |
| 558 | $(OBJDIR)/rss_.c \ |
| 559 | $(OBJDIR)/schema_.c \ |
| 560 | $(OBJDIR)/search_.c \ |
| 561 | $(OBJDIR)/setup_.c \ |
| 562 | $(OBJDIR)/sha1_.c \ |
| 563 | $(OBJDIR)/shun_.c \ |
| 564 | $(OBJDIR)/sitemap_.c \ |
| 565 | $(OBJDIR)/skins_.c \ |
| @@ -675,11 +673,10 @@ | |
| 675 | $(OBJDIR)/rebuild.o \ |
| 676 | $(OBJDIR)/regexp.o \ |
| 677 | $(OBJDIR)/report.o \ |
| 678 | $(OBJDIR)/rss.o \ |
| 679 | $(OBJDIR)/schema.o \ |
| 680 | $(OBJDIR)/search.o \ |
| 681 | $(OBJDIR)/setup.o \ |
| 682 | $(OBJDIR)/sha1.o \ |
| 683 | $(OBJDIR)/shun.o \ |
| 684 | $(OBJDIR)/sitemap.o \ |
| 685 | $(OBJDIR)/skins.o \ |
| @@ -988,11 +985,10 @@ | |
| 988 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 989 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 990 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 991 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| 992 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 993 | $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ |
| 994 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 995 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 996 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 997 | $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ |
| 998 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| @@ -1703,18 +1699,10 @@ | |
| 1703 | $(OBJDIR)/schema.o: $(OBJDIR)/schema_.c $(OBJDIR)/schema.h $(SRCDIR)/config.h |
| 1704 | $(XTCC) -o $(OBJDIR)/schema.o -c $(OBJDIR)/schema_.c |
| 1705 | |
| 1706 | $(OBJDIR)/schema.h: $(OBJDIR)/headers |
| 1707 | |
| 1708 | $(OBJDIR)/search_.c: $(SRCDIR)/search.c $(TRANSLATE) |
| 1709 | $(TRANSLATE) $(SRCDIR)/search.c >$@ |
| 1710 | |
| 1711 | $(OBJDIR)/search.o: $(OBJDIR)/search_.c $(OBJDIR)/search.h $(SRCDIR)/config.h |
| 1712 | $(XTCC) -o $(OBJDIR)/search.o -c $(OBJDIR)/search_.c |
| 1713 | |
| 1714 | $(OBJDIR)/search.h: $(OBJDIR)/headers |
| 1715 | |
| 1716 | $(OBJDIR)/setup_.c: $(SRCDIR)/setup.c $(TRANSLATE) |
| 1717 | $(TRANSLATE) $(SRCDIR)/setup.c >$@ |
| 1718 | |
| 1719 | $(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h |
| 1720 | $(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c |
| 1721 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -432,11 +432,10 @@ | |
| 432 | $(SRCDIR)/rebuild.c \ |
| 433 | $(SRCDIR)/regexp.c \ |
| 434 | $(SRCDIR)/report.c \ |
| 435 | $(SRCDIR)/rss.c \ |
| 436 | $(SRCDIR)/schema.c \ |
| 437 | $(SRCDIR)/setup.c \ |
| 438 | $(SRCDIR)/sha1.c \ |
| 439 | $(SRCDIR)/shun.c \ |
| 440 | $(SRCDIR)/sitemap.c \ |
| 441 | $(SRCDIR)/skins.c \ |
| @@ -555,11 +554,10 @@ | |
| 554 | $(OBJDIR)/rebuild_.c \ |
| 555 | $(OBJDIR)/regexp_.c \ |
| 556 | $(OBJDIR)/report_.c \ |
| 557 | $(OBJDIR)/rss_.c \ |
| 558 | $(OBJDIR)/schema_.c \ |
| 559 | $(OBJDIR)/setup_.c \ |
| 560 | $(OBJDIR)/sha1_.c \ |
| 561 | $(OBJDIR)/shun_.c \ |
| 562 | $(OBJDIR)/sitemap_.c \ |
| 563 | $(OBJDIR)/skins_.c \ |
| @@ -675,11 +673,10 @@ | |
| 673 | $(OBJDIR)/rebuild.o \ |
| 674 | $(OBJDIR)/regexp.o \ |
| 675 | $(OBJDIR)/report.o \ |
| 676 | $(OBJDIR)/rss.o \ |
| 677 | $(OBJDIR)/schema.o \ |
| 678 | $(OBJDIR)/setup.o \ |
| 679 | $(OBJDIR)/sha1.o \ |
| 680 | $(OBJDIR)/shun.o \ |
| 681 | $(OBJDIR)/sitemap.o \ |
| 682 | $(OBJDIR)/skins.o \ |
| @@ -988,11 +985,10 @@ | |
| 985 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 986 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 987 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 988 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| 989 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 990 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 991 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 992 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 993 | $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ |
| 994 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| @@ -1703,18 +1699,10 @@ | |
| 1699 | $(OBJDIR)/schema.o: $(OBJDIR)/schema_.c $(OBJDIR)/schema.h $(SRCDIR)/config.h |
| 1700 | $(XTCC) -o $(OBJDIR)/schema.o -c $(OBJDIR)/schema_.c |
| 1701 | |
| 1702 | $(OBJDIR)/schema.h: $(OBJDIR)/headers |
| 1703 | |
| 1704 | $(OBJDIR)/setup_.c: $(SRCDIR)/setup.c $(TRANSLATE) |
| 1705 | $(TRANSLATE) $(SRCDIR)/setup.c >$@ |
| 1706 | |
| 1707 | $(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h |
| 1708 | $(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c |
| 1709 |
-10
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -279,11 +279,10 @@ | ||
| 279 | 279 | rebuild_.c \ |
| 280 | 280 | regexp_.c \ |
| 281 | 281 | report_.c \ |
| 282 | 282 | rss_.c \ |
| 283 | 283 | schema_.c \ |
| 284 | - search_.c \ | |
| 285 | 284 | setup_.c \ |
| 286 | 285 | sha1_.c \ |
| 287 | 286 | shun_.c \ |
| 288 | 287 | sitemap_.c \ |
| 289 | 288 | skins_.c \ |
| @@ -401,11 +400,10 @@ | ||
| 401 | 400 | $(OX)\rebuild$O \ |
| 402 | 401 | $(OX)\regexp$O \ |
| 403 | 402 | $(OX)\report$O \ |
| 404 | 403 | $(OX)\rss$O \ |
| 405 | 404 | $(OX)\schema$O \ |
| 406 | - $(OX)\search$O \ | |
| 407 | 405 | $(OX)\setup$O \ |
| 408 | 406 | $(OX)\sha1$O \ |
| 409 | 407 | $(OX)\shell$O \ |
| 410 | 408 | $(OX)\shun$O \ |
| 411 | 409 | $(OX)\sitemap$O \ |
| @@ -576,11 +574,10 @@ | ||
| 576 | 574 | echo $(OX)\rebuild.obj >> $@ |
| 577 | 575 | echo $(OX)\regexp.obj >> $@ |
| 578 | 576 | echo $(OX)\report.obj >> $@ |
| 579 | 577 | echo $(OX)\rss.obj >> $@ |
| 580 | 578 | echo $(OX)\schema.obj >> $@ |
| 581 | - echo $(OX)\search.obj >> $@ | |
| 582 | 579 | echo $(OX)\setup.obj >> $@ |
| 583 | 580 | echo $(OX)\sha1.obj >> $@ |
| 584 | 581 | echo $(OX)\shell.obj >> $@ |
| 585 | 582 | echo $(OX)\shun.obj >> $@ |
| 586 | 583 | echo $(OX)\sitemap.obj >> $@ |
| @@ -1218,16 +1215,10 @@ | ||
| 1218 | 1215 | $(TCC) /Fo$@ -c schema_.c |
| 1219 | 1216 | |
| 1220 | 1217 | schema_.c : $(SRCDIR)\schema.c |
| 1221 | 1218 | translate$E $** > $@ |
| 1222 | 1219 | |
| 1223 | -$(OX)\search$O : search_.c search.h | |
| 1224 | - $(TCC) /Fo$@ -c search_.c | |
| 1225 | - | |
| 1226 | -search_.c : $(SRCDIR)\search.c | |
| 1227 | - translate$E $** > $@ | |
| 1228 | - | |
| 1229 | 1220 | $(OX)\setup$O : setup_.c setup.h |
| 1230 | 1221 | $(TCC) /Fo$@ -c setup_.c |
| 1231 | 1222 | |
| 1232 | 1223 | setup_.c : $(SRCDIR)\setup.c |
| 1233 | 1224 | translate$E $** > $@ |
| @@ -1510,11 +1501,10 @@ | ||
| 1510 | 1501 | rebuild_.c:rebuild.h \ |
| 1511 | 1502 | regexp_.c:regexp.h \ |
| 1512 | 1503 | report_.c:report.h \ |
| 1513 | 1504 | rss_.c:rss.h \ |
| 1514 | 1505 | schema_.c:schema.h \ |
| 1515 | - search_.c:search.h \ | |
| 1516 | 1506 | setup_.c:setup.h \ |
| 1517 | 1507 | sha1_.c:sha1.h \ |
| 1518 | 1508 | shun_.c:shun.h \ |
| 1519 | 1509 | sitemap_.c:sitemap.h \ |
| 1520 | 1510 | skins_.c:skins.h \ |
| 1521 | 1511 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -279,11 +279,10 @@ | |
| 279 | rebuild_.c \ |
| 280 | regexp_.c \ |
| 281 | report_.c \ |
| 282 | rss_.c \ |
| 283 | schema_.c \ |
| 284 | search_.c \ |
| 285 | setup_.c \ |
| 286 | sha1_.c \ |
| 287 | shun_.c \ |
| 288 | sitemap_.c \ |
| 289 | skins_.c \ |
| @@ -401,11 +400,10 @@ | |
| 401 | $(OX)\rebuild$O \ |
| 402 | $(OX)\regexp$O \ |
| 403 | $(OX)\report$O \ |
| 404 | $(OX)\rss$O \ |
| 405 | $(OX)\schema$O \ |
| 406 | $(OX)\search$O \ |
| 407 | $(OX)\setup$O \ |
| 408 | $(OX)\sha1$O \ |
| 409 | $(OX)\shell$O \ |
| 410 | $(OX)\shun$O \ |
| 411 | $(OX)\sitemap$O \ |
| @@ -576,11 +574,10 @@ | |
| 576 | echo $(OX)\rebuild.obj >> $@ |
| 577 | echo $(OX)\regexp.obj >> $@ |
| 578 | echo $(OX)\report.obj >> $@ |
| 579 | echo $(OX)\rss.obj >> $@ |
| 580 | echo $(OX)\schema.obj >> $@ |
| 581 | echo $(OX)\search.obj >> $@ |
| 582 | echo $(OX)\setup.obj >> $@ |
| 583 | echo $(OX)\sha1.obj >> $@ |
| 584 | echo $(OX)\shell.obj >> $@ |
| 585 | echo $(OX)\shun.obj >> $@ |
| 586 | echo $(OX)\sitemap.obj >> $@ |
| @@ -1218,16 +1215,10 @@ | |
| 1218 | $(TCC) /Fo$@ -c schema_.c |
| 1219 | |
| 1220 | schema_.c : $(SRCDIR)\schema.c |
| 1221 | translate$E $** > $@ |
| 1222 | |
| 1223 | $(OX)\search$O : search_.c search.h |
| 1224 | $(TCC) /Fo$@ -c search_.c |
| 1225 | |
| 1226 | search_.c : $(SRCDIR)\search.c |
| 1227 | translate$E $** > $@ |
| 1228 | |
| 1229 | $(OX)\setup$O : setup_.c setup.h |
| 1230 | $(TCC) /Fo$@ -c setup_.c |
| 1231 | |
| 1232 | setup_.c : $(SRCDIR)\setup.c |
| 1233 | translate$E $** > $@ |
| @@ -1510,11 +1501,10 @@ | |
| 1510 | rebuild_.c:rebuild.h \ |
| 1511 | regexp_.c:regexp.h \ |
| 1512 | report_.c:report.h \ |
| 1513 | rss_.c:rss.h \ |
| 1514 | schema_.c:schema.h \ |
| 1515 | search_.c:search.h \ |
| 1516 | setup_.c:setup.h \ |
| 1517 | sha1_.c:sha1.h \ |
| 1518 | shun_.c:shun.h \ |
| 1519 | sitemap_.c:sitemap.h \ |
| 1520 | skins_.c:skins.h \ |
| 1521 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -279,11 +279,10 @@ | |
| 279 | rebuild_.c \ |
| 280 | regexp_.c \ |
| 281 | report_.c \ |
| 282 | rss_.c \ |
| 283 | schema_.c \ |
| 284 | setup_.c \ |
| 285 | sha1_.c \ |
| 286 | shun_.c \ |
| 287 | sitemap_.c \ |
| 288 | skins_.c \ |
| @@ -401,11 +400,10 @@ | |
| 400 | $(OX)\rebuild$O \ |
| 401 | $(OX)\regexp$O \ |
| 402 | $(OX)\report$O \ |
| 403 | $(OX)\rss$O \ |
| 404 | $(OX)\schema$O \ |
| 405 | $(OX)\setup$O \ |
| 406 | $(OX)\sha1$O \ |
| 407 | $(OX)\shell$O \ |
| 408 | $(OX)\shun$O \ |
| 409 | $(OX)\sitemap$O \ |
| @@ -576,11 +574,10 @@ | |
| 574 | echo $(OX)\rebuild.obj >> $@ |
| 575 | echo $(OX)\regexp.obj >> $@ |
| 576 | echo $(OX)\report.obj >> $@ |
| 577 | echo $(OX)\rss.obj >> $@ |
| 578 | echo $(OX)\schema.obj >> $@ |
| 579 | echo $(OX)\setup.obj >> $@ |
| 580 | echo $(OX)\sha1.obj >> $@ |
| 581 | echo $(OX)\shell.obj >> $@ |
| 582 | echo $(OX)\shun.obj >> $@ |
| 583 | echo $(OX)\sitemap.obj >> $@ |
| @@ -1218,16 +1215,10 @@ | |
| 1215 | $(TCC) /Fo$@ -c schema_.c |
| 1216 | |
| 1217 | schema_.c : $(SRCDIR)\schema.c |
| 1218 | translate$E $** > $@ |
| 1219 | |
| 1220 | $(OX)\setup$O : setup_.c setup.h |
| 1221 | $(TCC) /Fo$@ -c setup_.c |
| 1222 | |
| 1223 | setup_.c : $(SRCDIR)\setup.c |
| 1224 | translate$E $** > $@ |
| @@ -1510,11 +1501,10 @@ | |
| 1501 | rebuild_.c:rebuild.h \ |
| 1502 | regexp_.c:regexp.h \ |
| 1503 | report_.c:report.h \ |
| 1504 | rss_.c:rss.h \ |
| 1505 | schema_.c:schema.h \ |
| 1506 | setup_.c:setup.h \ |
| 1507 | sha1_.c:sha1.h \ |
| 1508 | shun_.c:shun.h \ |
| 1509 | sitemap_.c:sitemap.h \ |
| 1510 | skins_.c:skins.h \ |
| 1511 |