Fossil SCM
Add the "fossil unpublished" and the "fossil publish" commands.
Commit
b543373febb6b35fc466c7948ca3083b363402be
Parent
19d325b759c1fee…
8 files changed
+1
-1
+12
+1
+21
+38
-24
+10
-4
+12
+10
+1
-1
| --- src/bundle.c | ||
| +++ src/bundle.c | ||
| @@ -254,11 +254,11 @@ | ||
| 254 | 254 | |
| 255 | 255 | /* Decode the arguments (like --branch) that specify which artifacts |
| 256 | 256 | ** should be in the bundle */ |
| 257 | 257 | db_multi_exec("CREATE TEMP TABLE tobundle(rid INTEGER PRIMARY KEY);"); |
| 258 | 258 | subtree_from_arguments("tobundle"); |
| 259 | - find_checkin_associates("tobundle"); | |
| 259 | + find_checkin_associates("tobundle", !bStandalone); | |
| 260 | 260 | verify_all_options(); |
| 261 | 261 | |
| 262 | 262 | /* Create the new bundle */ |
| 263 | 263 | bundle_attach_file(g.argv[3], "b1", 1); |
| 264 | 264 | db_begin_transaction(); |
| 265 | 265 |
| --- src/bundle.c | |
| +++ src/bundle.c | |
| @@ -254,11 +254,11 @@ | |
| 254 | |
| 255 | /* Decode the arguments (like --branch) that specify which artifacts |
| 256 | ** should be in the bundle */ |
| 257 | db_multi_exec("CREATE TEMP TABLE tobundle(rid INTEGER PRIMARY KEY);"); |
| 258 | subtree_from_arguments("tobundle"); |
| 259 | find_checkin_associates("tobundle"); |
| 260 | verify_all_options(); |
| 261 | |
| 262 | /* Create the new bundle */ |
| 263 | bundle_attach_file(g.argv[3], "b1", 1); |
| 264 | db_begin_transaction(); |
| 265 |
| --- src/bundle.c | |
| +++ src/bundle.c | |
| @@ -254,11 +254,11 @@ | |
| 254 | |
| 255 | /* Decode the arguments (like --branch) that specify which artifacts |
| 256 | ** should be in the bundle */ |
| 257 | db_multi_exec("CREATE TEMP TABLE tobundle(rid INTEGER PRIMARY KEY);"); |
| 258 | subtree_from_arguments("tobundle"); |
| 259 | find_checkin_associates("tobundle", !bStandalone); |
| 260 | verify_all_options(); |
| 261 | |
| 262 | /* Create the new bundle */ |
| 263 | bundle_attach_file(g.argv[3], "b1", 1); |
| 264 | db_begin_transaction(); |
| 265 |
+12
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -87,10 +87,11 @@ | ||
| 87 | 87 | $(SRCDIR)/path.c \ |
| 88 | 88 | $(SRCDIR)/pivot.c \ |
| 89 | 89 | $(SRCDIR)/popen.c \ |
| 90 | 90 | $(SRCDIR)/pqueue.c \ |
| 91 | 91 | $(SRCDIR)/printf.c \ |
| 92 | + $(SRCDIR)/publish.c \ | |
| 92 | 93 | $(SRCDIR)/purge.c \ |
| 93 | 94 | $(SRCDIR)/rebuild.c \ |
| 94 | 95 | $(SRCDIR)/regexp.c \ |
| 95 | 96 | $(SRCDIR)/report.c \ |
| 96 | 97 | $(SRCDIR)/rss.c \ |
| @@ -206,10 +207,11 @@ | ||
| 206 | 207 | $(OBJDIR)/path_.c \ |
| 207 | 208 | $(OBJDIR)/pivot_.c \ |
| 208 | 209 | $(OBJDIR)/popen_.c \ |
| 209 | 210 | $(OBJDIR)/pqueue_.c \ |
| 210 | 211 | $(OBJDIR)/printf_.c \ |
| 212 | + $(OBJDIR)/publish_.c \ | |
| 211 | 213 | $(OBJDIR)/purge_.c \ |
| 212 | 214 | $(OBJDIR)/rebuild_.c \ |
| 213 | 215 | $(OBJDIR)/regexp_.c \ |
| 214 | 216 | $(OBJDIR)/report_.c \ |
| 215 | 217 | $(OBJDIR)/rss_.c \ |
| @@ -322,10 +324,11 @@ | ||
| 322 | 324 | $(OBJDIR)/path.o \ |
| 323 | 325 | $(OBJDIR)/pivot.o \ |
| 324 | 326 | $(OBJDIR)/popen.o \ |
| 325 | 327 | $(OBJDIR)/pqueue.o \ |
| 326 | 328 | $(OBJDIR)/printf.o \ |
| 329 | + $(OBJDIR)/publish.o \ | |
| 327 | 330 | $(OBJDIR)/purge.o \ |
| 328 | 331 | $(OBJDIR)/rebuild.o \ |
| 329 | 332 | $(OBJDIR)/regexp.o \ |
| 330 | 333 | $(OBJDIR)/report.o \ |
| 331 | 334 | $(OBJDIR)/rss.o \ |
| @@ -547,10 +550,11 @@ | ||
| 547 | 550 | $(OBJDIR)/path_.c:$(OBJDIR)/path.h \ |
| 548 | 551 | $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \ |
| 549 | 552 | $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \ |
| 550 | 553 | $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \ |
| 551 | 554 | $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \ |
| 555 | + $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \ | |
| 552 | 556 | $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \ |
| 553 | 557 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 554 | 558 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 555 | 559 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 556 | 560 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| @@ -1192,10 +1196,18 @@ | ||
| 1192 | 1196 | |
| 1193 | 1197 | $(OBJDIR)/printf.o: $(OBJDIR)/printf_.c $(OBJDIR)/printf.h $(SRCDIR)/config.h |
| 1194 | 1198 | $(XTCC) -o $(OBJDIR)/printf.o -c $(OBJDIR)/printf_.c |
| 1195 | 1199 | |
| 1196 | 1200 | $(OBJDIR)/printf.h: $(OBJDIR)/headers |
| 1201 | + | |
| 1202 | +$(OBJDIR)/publish_.c: $(SRCDIR)/publish.c $(OBJDIR)/translate | |
| 1203 | + $(OBJDIR)/translate $(SRCDIR)/publish.c >$@ | |
| 1204 | + | |
| 1205 | +$(OBJDIR)/publish.o: $(OBJDIR)/publish_.c $(OBJDIR)/publish.h $(SRCDIR)/config.h | |
| 1206 | + $(XTCC) -o $(OBJDIR)/publish.o -c $(OBJDIR)/publish_.c | |
| 1207 | + | |
| 1208 | +$(OBJDIR)/publish.h: $(OBJDIR)/headers | |
| 1197 | 1209 | |
| 1198 | 1210 | $(OBJDIR)/purge_.c: $(SRCDIR)/purge.c $(OBJDIR)/translate |
| 1199 | 1211 | $(OBJDIR)/translate $(SRCDIR)/purge.c >$@ |
| 1200 | 1212 | |
| 1201 | 1213 | $(OBJDIR)/purge.o: $(OBJDIR)/purge_.c $(OBJDIR)/purge.h $(SRCDIR)/config.h |
| 1202 | 1214 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -87,10 +87,11 @@ | |
| 87 | $(SRCDIR)/path.c \ |
| 88 | $(SRCDIR)/pivot.c \ |
| 89 | $(SRCDIR)/popen.c \ |
| 90 | $(SRCDIR)/pqueue.c \ |
| 91 | $(SRCDIR)/printf.c \ |
| 92 | $(SRCDIR)/purge.c \ |
| 93 | $(SRCDIR)/rebuild.c \ |
| 94 | $(SRCDIR)/regexp.c \ |
| 95 | $(SRCDIR)/report.c \ |
| 96 | $(SRCDIR)/rss.c \ |
| @@ -206,10 +207,11 @@ | |
| 206 | $(OBJDIR)/path_.c \ |
| 207 | $(OBJDIR)/pivot_.c \ |
| 208 | $(OBJDIR)/popen_.c \ |
| 209 | $(OBJDIR)/pqueue_.c \ |
| 210 | $(OBJDIR)/printf_.c \ |
| 211 | $(OBJDIR)/purge_.c \ |
| 212 | $(OBJDIR)/rebuild_.c \ |
| 213 | $(OBJDIR)/regexp_.c \ |
| 214 | $(OBJDIR)/report_.c \ |
| 215 | $(OBJDIR)/rss_.c \ |
| @@ -322,10 +324,11 @@ | |
| 322 | $(OBJDIR)/path.o \ |
| 323 | $(OBJDIR)/pivot.o \ |
| 324 | $(OBJDIR)/popen.o \ |
| 325 | $(OBJDIR)/pqueue.o \ |
| 326 | $(OBJDIR)/printf.o \ |
| 327 | $(OBJDIR)/purge.o \ |
| 328 | $(OBJDIR)/rebuild.o \ |
| 329 | $(OBJDIR)/regexp.o \ |
| 330 | $(OBJDIR)/report.o \ |
| 331 | $(OBJDIR)/rss.o \ |
| @@ -547,10 +550,11 @@ | |
| 547 | $(OBJDIR)/path_.c:$(OBJDIR)/path.h \ |
| 548 | $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \ |
| 549 | $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \ |
| 550 | $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \ |
| 551 | $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \ |
| 552 | $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \ |
| 553 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 554 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 555 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 556 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| @@ -1192,10 +1196,18 @@ | |
| 1192 | |
| 1193 | $(OBJDIR)/printf.o: $(OBJDIR)/printf_.c $(OBJDIR)/printf.h $(SRCDIR)/config.h |
| 1194 | $(XTCC) -o $(OBJDIR)/printf.o -c $(OBJDIR)/printf_.c |
| 1195 | |
| 1196 | $(OBJDIR)/printf.h: $(OBJDIR)/headers |
| 1197 | |
| 1198 | $(OBJDIR)/purge_.c: $(SRCDIR)/purge.c $(OBJDIR)/translate |
| 1199 | $(OBJDIR)/translate $(SRCDIR)/purge.c >$@ |
| 1200 | |
| 1201 | $(OBJDIR)/purge.o: $(OBJDIR)/purge_.c $(OBJDIR)/purge.h $(SRCDIR)/config.h |
| 1202 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -87,10 +87,11 @@ | |
| 87 | $(SRCDIR)/path.c \ |
| 88 | $(SRCDIR)/pivot.c \ |
| 89 | $(SRCDIR)/popen.c \ |
| 90 | $(SRCDIR)/pqueue.c \ |
| 91 | $(SRCDIR)/printf.c \ |
| 92 | $(SRCDIR)/publish.c \ |
| 93 | $(SRCDIR)/purge.c \ |
| 94 | $(SRCDIR)/rebuild.c \ |
| 95 | $(SRCDIR)/regexp.c \ |
| 96 | $(SRCDIR)/report.c \ |
| 97 | $(SRCDIR)/rss.c \ |
| @@ -206,10 +207,11 @@ | |
| 207 | $(OBJDIR)/path_.c \ |
| 208 | $(OBJDIR)/pivot_.c \ |
| 209 | $(OBJDIR)/popen_.c \ |
| 210 | $(OBJDIR)/pqueue_.c \ |
| 211 | $(OBJDIR)/printf_.c \ |
| 212 | $(OBJDIR)/publish_.c \ |
| 213 | $(OBJDIR)/purge_.c \ |
| 214 | $(OBJDIR)/rebuild_.c \ |
| 215 | $(OBJDIR)/regexp_.c \ |
| 216 | $(OBJDIR)/report_.c \ |
| 217 | $(OBJDIR)/rss_.c \ |
| @@ -322,10 +324,11 @@ | |
| 324 | $(OBJDIR)/path.o \ |
| 325 | $(OBJDIR)/pivot.o \ |
| 326 | $(OBJDIR)/popen.o \ |
| 327 | $(OBJDIR)/pqueue.o \ |
| 328 | $(OBJDIR)/printf.o \ |
| 329 | $(OBJDIR)/publish.o \ |
| 330 | $(OBJDIR)/purge.o \ |
| 331 | $(OBJDIR)/rebuild.o \ |
| 332 | $(OBJDIR)/regexp.o \ |
| 333 | $(OBJDIR)/report.o \ |
| 334 | $(OBJDIR)/rss.o \ |
| @@ -547,10 +550,11 @@ | |
| 550 | $(OBJDIR)/path_.c:$(OBJDIR)/path.h \ |
| 551 | $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \ |
| 552 | $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \ |
| 553 | $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \ |
| 554 | $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \ |
| 555 | $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \ |
| 556 | $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \ |
| 557 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 558 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 559 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 560 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| @@ -1192,10 +1196,18 @@ | |
| 1196 | |
| 1197 | $(OBJDIR)/printf.o: $(OBJDIR)/printf_.c $(OBJDIR)/printf.h $(SRCDIR)/config.h |
| 1198 | $(XTCC) -o $(OBJDIR)/printf.o -c $(OBJDIR)/printf_.c |
| 1199 | |
| 1200 | $(OBJDIR)/printf.h: $(OBJDIR)/headers |
| 1201 | |
| 1202 | $(OBJDIR)/publish_.c: $(SRCDIR)/publish.c $(OBJDIR)/translate |
| 1203 | $(OBJDIR)/translate $(SRCDIR)/publish.c >$@ |
| 1204 | |
| 1205 | $(OBJDIR)/publish.o: $(OBJDIR)/publish_.c $(OBJDIR)/publish.h $(SRCDIR)/config.h |
| 1206 | $(XTCC) -o $(OBJDIR)/publish.o -c $(OBJDIR)/publish_.c |
| 1207 | |
| 1208 | $(OBJDIR)/publish.h: $(OBJDIR)/headers |
| 1209 | |
| 1210 | $(OBJDIR)/purge_.c: $(SRCDIR)/purge.c $(OBJDIR)/translate |
| 1211 | $(OBJDIR)/translate $(SRCDIR)/purge.c >$@ |
| 1212 | |
| 1213 | $(OBJDIR)/purge.o: $(OBJDIR)/purge_.c $(OBJDIR)/purge.h $(SRCDIR)/config.h |
| 1214 |
+1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -93,10 +93,11 @@ | ||
| 93 | 93 | path |
| 94 | 94 | pivot |
| 95 | 95 | popen |
| 96 | 96 | pqueue |
| 97 | 97 | printf |
| 98 | + publish | |
| 98 | 99 | purge |
| 99 | 100 | rebuild |
| 100 | 101 | regexp |
| 101 | 102 | report |
| 102 | 103 | rss |
| 103 | 104 | |
| 104 | 105 | ADDED src/publish.c |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -93,10 +93,11 @@ | |
| 93 | path |
| 94 | pivot |
| 95 | popen |
| 96 | pqueue |
| 97 | printf |
| 98 | purge |
| 99 | rebuild |
| 100 | regexp |
| 101 | report |
| 102 | rss |
| 103 | |
| 104 | DDED src/publish.c |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -93,10 +93,11 @@ | |
| 93 | path |
| 94 | pivot |
| 95 | popen |
| 96 | pqueue |
| 97 | printf |
| 98 | publish |
| 99 | purge |
| 100 | rebuild |
| 101 | regexp |
| 102 | report |
| 103 | rss |
| 104 | |
| 105 | DDED src/publish.c |
+21
| --- a/src/publish.c | ||
| +++ b/src/publish.c | ||
| @@ -0,0 +1,21 @@ | ||
| 1 | +* --briefShow just int bBriefbrief Stmt qbBrief ){ | |
| 2 | + zCols = "(SELECT uuid FROM blob WHERE rid=private.rid)"; | |
| 3 | + }else{ | |
| 4 | + zCols = "private.rid"; | |
| 5 | + } | |
| 6 | + if( bAll ){ | |
| 7 | + db_prepare(&q, "SELECT %s FROM private", zCols/*safe-for-%s*/); | |
| 8 | + }else{ | |
| 9 | + db_prepare(&q, "SE;", zCols/*safe-for-%s*/); | |
| 10 | + } | |
| 11 | + while( db_step(&q)==SQLITE_ROW ){ | |
| 12 | + if( bBrief ){ | |
| 13 | + fossil_print("%s\n", db_column_text(&q,0)); | |
| 14 | + }else{ | |
| 15 | + if( n++ > 0 ) fossil_print("%.78c\n",'-'); | |
| 16 | + whatis_rid(db_column_int(&q,0),0); | |
| 17 | + } | |
| 18 | + } | |
| 19 | + db_finalize(&q);*/ | |
| 20 | + Stmt q; | |
| 21 | + int " |
| --- a/src/publish.c | |
| +++ b/src/publish.c | |
| @@ -0,0 +1,21 @@ | |
| --- a/src/publish.c | |
| +++ b/src/publish.c | |
| @@ -0,0 +1,21 @@ | |
| 1 | * --briefShow just int bBriefbrief Stmt qbBrief ){ |
| 2 | zCols = "(SELECT uuid FROM blob WHERE rid=private.rid)"; |
| 3 | }else{ |
| 4 | zCols = "private.rid"; |
| 5 | } |
| 6 | if( bAll ){ |
| 7 | db_prepare(&q, "SELECT %s FROM private", zCols/*safe-for-%s*/); |
| 8 | }else{ |
| 9 | db_prepare(&q, "SE;", zCols/*safe-for-%s*/); |
| 10 | } |
| 11 | while( db_step(&q)==SQLITE_ROW ){ |
| 12 | if( bBrief ){ |
| 13 | fossil_print("%s\n", db_column_text(&q,0)); |
| 14 | }else{ |
| 15 | if( n++ > 0 ) fossil_print("%.78c\n",'-'); |
| 16 | whatis_rid(db_column_int(&q,0),0); |
| 17 | } |
| 18 | } |
| 19 | db_finalize(&q);*/ |
| 20 | Stmt q; |
| 21 | int " |
+38
-24
| --- src/purge.c | ||
| +++ src/purge.c | ||
| @@ -208,52 +208,66 @@ | ||
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 | /* |
| 211 | 211 | ** The TEMP table named zTab contains the RIDs for a set of checkin |
| 212 | 212 | ** artifacts. Expand this set (by adding new entries to zTab) to include |
| 213 | -** all other artifacts that are used exclusively by the set of checkins in | |
| 213 | +** all other artifacts that are used the set of checkins in | |
| 214 | 214 | ** the original list. |
| 215 | +** | |
| 216 | +** If the bExclusive flag is true, then the set is only expanded by | |
| 217 | +** artifacts that are used exclusively by the checkins in the set. | |
| 218 | +** When bExclusive is false, then all artifacts used by the checkins | |
| 219 | +** are added even if those artifacts are also used by other checkins | |
| 220 | +** not in the set. | |
| 221 | +** | |
| 222 | +** The "fossil publish" command with the (undocumented) --test and | |
| 223 | +** --exclusive options can be used for interactiving testing of this | |
| 224 | +** function. | |
| 215 | 225 | */ |
| 216 | -void find_checkin_associates(const char *zTab){ | |
| 226 | +void find_checkin_associates(const char *zTab, int bExclusive){ | |
| 217 | 227 | db_begin_transaction(); |
| 218 | 228 | |
| 219 | 229 | /* Compute the set of files that need to be added to zTab */ |
| 220 | 230 | db_multi_exec("CREATE TEMP TABLE \"%w_files\"(fid INTEGER PRIMARY KEY)",zTab); |
| 221 | 231 | db_multi_exec( |
| 222 | 232 | "INSERT OR IGNORE INTO \"%w_files\"(fid)" |
| 223 | 233 | " SELECT fid FROM mlink WHERE fid!=0 AND mid IN \"%w\"", |
| 224 | 234 | zTab, zTab |
| 225 | 235 | ); |
| 226 | - /* But take out all files that are referenced by check-ins not in zTab */ | |
| 227 | - db_multi_exec( | |
| 228 | - "DELETE FROM \"%w_files\"" | |
| 229 | - " WHERE fid IN (SELECT fid FROM mlink" | |
| 230 | - " WHERE fid IN \"%w_files\"" | |
| 231 | - " AND mid NOT IN \"%w\")", | |
| 232 | - zTab, zTab, zTab | |
| 233 | - ); | |
| 236 | + if( bExclusive ){ | |
| 237 | + /* But take out all files that are referenced by check-ins not in zTab */ | |
| 238 | + db_multi_exec( | |
| 239 | + "DELETE FROM \"%w_files\"" | |
| 240 | + " WHERE fid IN (SELECT fid FROM mlink" | |
| 241 | + " WHERE fid IN \"%w_files\"" | |
| 242 | + " AND mid NOT IN \"%w\")", | |
| 243 | + zTab, zTab, zTab | |
| 244 | + ); | |
| 245 | + } | |
| 234 | 246 | |
| 235 | 247 | /* Compute the set of tags that need to be added to zTag */ |
| 236 | 248 | db_multi_exec("CREATE TEMP TABLE \"%w_tags\"(tid INTEGER PRIMARY KEY)",zTab); |
| 237 | 249 | db_multi_exec( |
| 238 | 250 | "INSERT OR IGNORE INTO \"%w_tags\"(tid)" |
| 239 | 251 | " SELECT DISTINCT srcid FROM tagxref WHERE rid in \"%w\" AND srcid!=0", |
| 240 | 252 | zTab, zTab |
| 241 | 253 | ); |
| 242 | - /* But take out tags that references some check-ins in zTab and other | |
| 243 | - ** check-ins not in zTab. The current Fossil implementation never creates | |
| 244 | - ** such tags, so the following should usually be a no-op. But the file | |
| 245 | - ** format specification allows such tags, so we should check for them. | |
| 246 | - */ | |
| 247 | - db_multi_exec( | |
| 248 | - "DELETE FROM \"%w_tags\"" | |
| 249 | - " WHERE tid IN (SELECT srcid FROM tagxref" | |
| 250 | - " WHERE srcid IN \"%w_tags\"" | |
| 251 | - " AND rid NOT IN \"%w\")", | |
| 252 | - zTab, zTab, zTab | |
| 253 | - ); | |
| 254 | - | |
| 254 | + if( bExclusive ){ | |
| 255 | + /* But take out tags that references some check-ins in zTab and other | |
| 256 | + ** check-ins not in zTab. The current Fossil implementation never creates | |
| 257 | + ** such tags, so the following should usually be a no-op. But the file | |
| 258 | + ** format specification allows such tags, so we should check for them. | |
| 259 | + */ | |
| 260 | + db_multi_exec( | |
| 261 | + "DELETE FROM \"%w_tags\"" | |
| 262 | + " WHERE tid IN (SELECT srcid FROM tagxref" | |
| 263 | + " WHERE srcid IN \"%w_tags\"" | |
| 264 | + " AND rid NOT IN \"%w\")", | |
| 265 | + zTab, zTab, zTab | |
| 266 | + ); | |
| 267 | + } | |
| 268 | + | |
| 255 | 269 | /* Transfer the extra artifacts into zTab */ |
| 256 | 270 | db_multi_exec( |
| 257 | 271 | "INSERT OR IGNORE INTO \"%w\" SELECT fid FROM \"%w_files\";" |
| 258 | 272 | "INSERT OR IGNORE INTO \"%w\" SELECT tid FROM \"%w_tags\";" |
| 259 | 273 | "DROP TABLE \"%w_files\";" |
| @@ -543,11 +557,11 @@ | ||
| 543 | 557 | vid = db_lget_int("checkout",0); |
| 544 | 558 | if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){ |
| 545 | 559 | fossil_fatal("cannot purge the current checkout"); |
| 546 | 560 | } |
| 547 | 561 | nCkin = db_int(0, "SELECT count(*) FROM ok"); |
| 548 | - find_checkin_associates("ok"); | |
| 562 | + find_checkin_associates("ok", 1); | |
| 549 | 563 | nArtifact = db_int(0, "SELECT count(*) FROM ok"); |
| 550 | 564 | if( explainOnly ){ |
| 551 | 565 | i = 0; |
| 552 | 566 | db_prepare(&q, "SELECT rid FROM ok"); |
| 553 | 567 | while( db_step(&q)==SQLITE_ROW ){ |
| 554 | 568 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -208,52 +208,66 @@ | |
| 208 | |
| 209 | |
| 210 | /* |
| 211 | ** The TEMP table named zTab contains the RIDs for a set of checkin |
| 212 | ** artifacts. Expand this set (by adding new entries to zTab) to include |
| 213 | ** all other artifacts that are used exclusively by the set of checkins in |
| 214 | ** the original list. |
| 215 | */ |
| 216 | void find_checkin_associates(const char *zTab){ |
| 217 | db_begin_transaction(); |
| 218 | |
| 219 | /* Compute the set of files that need to be added to zTab */ |
| 220 | db_multi_exec("CREATE TEMP TABLE \"%w_files\"(fid INTEGER PRIMARY KEY)",zTab); |
| 221 | db_multi_exec( |
| 222 | "INSERT OR IGNORE INTO \"%w_files\"(fid)" |
| 223 | " SELECT fid FROM mlink WHERE fid!=0 AND mid IN \"%w\"", |
| 224 | zTab, zTab |
| 225 | ); |
| 226 | /* But take out all files that are referenced by check-ins not in zTab */ |
| 227 | db_multi_exec( |
| 228 | "DELETE FROM \"%w_files\"" |
| 229 | " WHERE fid IN (SELECT fid FROM mlink" |
| 230 | " WHERE fid IN \"%w_files\"" |
| 231 | " AND mid NOT IN \"%w\")", |
| 232 | zTab, zTab, zTab |
| 233 | ); |
| 234 | |
| 235 | /* Compute the set of tags that need to be added to zTag */ |
| 236 | db_multi_exec("CREATE TEMP TABLE \"%w_tags\"(tid INTEGER PRIMARY KEY)",zTab); |
| 237 | db_multi_exec( |
| 238 | "INSERT OR IGNORE INTO \"%w_tags\"(tid)" |
| 239 | " SELECT DISTINCT srcid FROM tagxref WHERE rid in \"%w\" AND srcid!=0", |
| 240 | zTab, zTab |
| 241 | ); |
| 242 | /* But take out tags that references some check-ins in zTab and other |
| 243 | ** check-ins not in zTab. The current Fossil implementation never creates |
| 244 | ** such tags, so the following should usually be a no-op. But the file |
| 245 | ** format specification allows such tags, so we should check for them. |
| 246 | */ |
| 247 | db_multi_exec( |
| 248 | "DELETE FROM \"%w_tags\"" |
| 249 | " WHERE tid IN (SELECT srcid FROM tagxref" |
| 250 | " WHERE srcid IN \"%w_tags\"" |
| 251 | " AND rid NOT IN \"%w\")", |
| 252 | zTab, zTab, zTab |
| 253 | ); |
| 254 | |
| 255 | /* Transfer the extra artifacts into zTab */ |
| 256 | db_multi_exec( |
| 257 | "INSERT OR IGNORE INTO \"%w\" SELECT fid FROM \"%w_files\";" |
| 258 | "INSERT OR IGNORE INTO \"%w\" SELECT tid FROM \"%w_tags\";" |
| 259 | "DROP TABLE \"%w_files\";" |
| @@ -543,11 +557,11 @@ | |
| 543 | vid = db_lget_int("checkout",0); |
| 544 | if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){ |
| 545 | fossil_fatal("cannot purge the current checkout"); |
| 546 | } |
| 547 | nCkin = db_int(0, "SELECT count(*) FROM ok"); |
| 548 | find_checkin_associates("ok"); |
| 549 | nArtifact = db_int(0, "SELECT count(*) FROM ok"); |
| 550 | if( explainOnly ){ |
| 551 | i = 0; |
| 552 | db_prepare(&q, "SELECT rid FROM ok"); |
| 553 | while( db_step(&q)==SQLITE_ROW ){ |
| 554 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -208,52 +208,66 @@ | |
| 208 | |
| 209 | |
| 210 | /* |
| 211 | ** The TEMP table named zTab contains the RIDs for a set of checkin |
| 212 | ** artifacts. Expand this set (by adding new entries to zTab) to include |
| 213 | ** all other artifacts that are used the set of checkins in |
| 214 | ** the original list. |
| 215 | ** |
| 216 | ** If the bExclusive flag is true, then the set is only expanded by |
| 217 | ** artifacts that are used exclusively by the checkins in the set. |
| 218 | ** When bExclusive is false, then all artifacts used by the checkins |
| 219 | ** are added even if those artifacts are also used by other checkins |
| 220 | ** not in the set. |
| 221 | ** |
| 222 | ** The "fossil publish" command with the (undocumented) --test and |
| 223 | ** --exclusive options can be used for interactiving testing of this |
| 224 | ** function. |
| 225 | */ |
| 226 | void find_checkin_associates(const char *zTab, int bExclusive){ |
| 227 | db_begin_transaction(); |
| 228 | |
| 229 | /* Compute the set of files that need to be added to zTab */ |
| 230 | db_multi_exec("CREATE TEMP TABLE \"%w_files\"(fid INTEGER PRIMARY KEY)",zTab); |
| 231 | db_multi_exec( |
| 232 | "INSERT OR IGNORE INTO \"%w_files\"(fid)" |
| 233 | " SELECT fid FROM mlink WHERE fid!=0 AND mid IN \"%w\"", |
| 234 | zTab, zTab |
| 235 | ); |
| 236 | if( bExclusive ){ |
| 237 | /* But take out all files that are referenced by check-ins not in zTab */ |
| 238 | db_multi_exec( |
| 239 | "DELETE FROM \"%w_files\"" |
| 240 | " WHERE fid IN (SELECT fid FROM mlink" |
| 241 | " WHERE fid IN \"%w_files\"" |
| 242 | " AND mid NOT IN \"%w\")", |
| 243 | zTab, zTab, zTab |
| 244 | ); |
| 245 | } |
| 246 | |
| 247 | /* Compute the set of tags that need to be added to zTag */ |
| 248 | db_multi_exec("CREATE TEMP TABLE \"%w_tags\"(tid INTEGER PRIMARY KEY)",zTab); |
| 249 | db_multi_exec( |
| 250 | "INSERT OR IGNORE INTO \"%w_tags\"(tid)" |
| 251 | " SELECT DISTINCT srcid FROM tagxref WHERE rid in \"%w\" AND srcid!=0", |
| 252 | zTab, zTab |
| 253 | ); |
| 254 | if( bExclusive ){ |
| 255 | /* But take out tags that references some check-ins in zTab and other |
| 256 | ** check-ins not in zTab. The current Fossil implementation never creates |
| 257 | ** such tags, so the following should usually be a no-op. But the file |
| 258 | ** format specification allows such tags, so we should check for them. |
| 259 | */ |
| 260 | db_multi_exec( |
| 261 | "DELETE FROM \"%w_tags\"" |
| 262 | " WHERE tid IN (SELECT srcid FROM tagxref" |
| 263 | " WHERE srcid IN \"%w_tags\"" |
| 264 | " AND rid NOT IN \"%w\")", |
| 265 | zTab, zTab, zTab |
| 266 | ); |
| 267 | } |
| 268 | |
| 269 | /* Transfer the extra artifacts into zTab */ |
| 270 | db_multi_exec( |
| 271 | "INSERT OR IGNORE INTO \"%w\" SELECT fid FROM \"%w_files\";" |
| 272 | "INSERT OR IGNORE INTO \"%w\" SELECT tid FROM \"%w_tags\";" |
| 273 | "DROP TABLE \"%w_files\";" |
| @@ -543,11 +557,11 @@ | |
| 557 | vid = db_lget_int("checkout",0); |
| 558 | if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){ |
| 559 | fossil_fatal("cannot purge the current checkout"); |
| 560 | } |
| 561 | nCkin = db_int(0, "SELECT count(*) FROM ok"); |
| 562 | find_checkin_associates("ok", 1); |
| 563 | nArtifact = db_int(0, "SELECT count(*) FROM ok"); |
| 564 | if( explainOnly ){ |
| 565 | i = 0; |
| 566 | db_prepare(&q, "SELECT rid FROM ok"); |
| 567 | while( db_step(&q)==SQLITE_ROW ){ |
| 568 |
+10
-4
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -28,13 +28,13 @@ | ||
| 28 | 28 | |
| 29 | 29 | SQLITE_OPTIONS = -DNDEBUG=1 -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 |
| 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 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 purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.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 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 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)\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)\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)\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)\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)\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 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 purge rebuild regexp report rss schema search setup sha1 shun 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 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 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 >> $@ |
| @@ -572,10 +572,16 @@ | ||
| 572 | 572 | $(OBJDIR)\printf$O : printf_.c printf.h |
| 573 | 573 | $(TCC) -o$@ -c printf_.c |
| 574 | 574 | |
| 575 | 575 | printf_.c : $(SRCDIR)\printf.c |
| 576 | 576 | +translate$E $** > $@ |
| 577 | + | |
| 578 | +$(OBJDIR)\publish$O : publish_.c publish.h | |
| 579 | + $(TCC) -o$@ -c publish_.c | |
| 580 | + | |
| 581 | +publish_.c : $(SRCDIR)\publish.c | |
| 582 | + +translate$E $** > $@ | |
| 577 | 583 | |
| 578 | 584 | $(OBJDIR)\purge$O : purge_.c purge.h |
| 579 | 585 | $(TCC) -o$@ -c purge_.c |
| 580 | 586 | |
| 581 | 587 | purge_.c : $(SRCDIR)\purge.c |
| @@ -808,7 +814,7 @@ | ||
| 808 | 814 | |
| 809 | 815 | zip_.c : $(SRCDIR)\zip.c |
| 810 | 816 | +translate$E $** > $@ |
| 811 | 817 | |
| 812 | 818 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 813 | - +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 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 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 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 | |
| 819 | + +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 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 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 | |
| 814 | 820 | @copy /Y nul: headers |
| 815 | 821 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -28,13 +28,13 @@ | |
| 28 | |
| 29 | SQLITE_OPTIONS = -DNDEBUG=1 -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 |
| 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 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 purge_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.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)\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)\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)\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 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 purge rebuild regexp report rss schema search setup sha1 shun 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 >> $@ |
| @@ -572,10 +572,16 @@ | |
| 572 | $(OBJDIR)\printf$O : printf_.c printf.h |
| 573 | $(TCC) -o$@ -c printf_.c |
| 574 | |
| 575 | printf_.c : $(SRCDIR)\printf.c |
| 576 | +translate$E $** > $@ |
| 577 | |
| 578 | $(OBJDIR)\purge$O : purge_.c purge.h |
| 579 | $(TCC) -o$@ -c purge_.c |
| 580 | |
| 581 | purge_.c : $(SRCDIR)\purge.c |
| @@ -808,7 +814,7 @@ | |
| 808 | |
| 809 | zip_.c : $(SRCDIR)\zip.c |
| 810 | +translate$E $** > $@ |
| 811 | |
| 812 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 813 | +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 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 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 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 |
| 814 | @copy /Y nul: headers |
| 815 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -28,13 +28,13 @@ | |
| 28 | |
| 29 | SQLITE_OPTIONS = -DNDEBUG=1 -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 |
| 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 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 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)\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)\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 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 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 >> $@ |
| @@ -572,10 +572,16 @@ | |
| 572 | $(OBJDIR)\printf$O : printf_.c printf.h |
| 573 | $(TCC) -o$@ -c printf_.c |
| 574 | |
| 575 | printf_.c : $(SRCDIR)\printf.c |
| 576 | +translate$E $** > $@ |
| 577 | |
| 578 | $(OBJDIR)\publish$O : publish_.c publish.h |
| 579 | $(TCC) -o$@ -c publish_.c |
| 580 | |
| 581 | publish_.c : $(SRCDIR)\publish.c |
| 582 | +translate$E $** > $@ |
| 583 | |
| 584 | $(OBJDIR)\purge$O : purge_.c purge.h |
| 585 | $(TCC) -o$@ -c purge_.c |
| 586 | |
| 587 | purge_.c : $(SRCDIR)\purge.c |
| @@ -808,7 +814,7 @@ | |
| 814 | |
| 815 | zip_.c : $(SRCDIR)\zip.c |
| 816 | +translate$E $** > $@ |
| 817 | |
| 818 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 819 | +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 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 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 |
| 820 | @copy /Y nul: headers |
| 821 |
+12
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -418,10 +418,11 @@ | ||
| 418 | 418 | $(SRCDIR)/path.c \ |
| 419 | 419 | $(SRCDIR)/pivot.c \ |
| 420 | 420 | $(SRCDIR)/popen.c \ |
| 421 | 421 | $(SRCDIR)/pqueue.c \ |
| 422 | 422 | $(SRCDIR)/printf.c \ |
| 423 | + $(SRCDIR)/publish.c \ | |
| 423 | 424 | $(SRCDIR)/purge.c \ |
| 424 | 425 | $(SRCDIR)/rebuild.c \ |
| 425 | 426 | $(SRCDIR)/regexp.c \ |
| 426 | 427 | $(SRCDIR)/report.c \ |
| 427 | 428 | $(SRCDIR)/rss.c \ |
| @@ -537,10 +538,11 @@ | ||
| 537 | 538 | $(OBJDIR)/path_.c \ |
| 538 | 539 | $(OBJDIR)/pivot_.c \ |
| 539 | 540 | $(OBJDIR)/popen_.c \ |
| 540 | 541 | $(OBJDIR)/pqueue_.c \ |
| 541 | 542 | $(OBJDIR)/printf_.c \ |
| 543 | + $(OBJDIR)/publish_.c \ | |
| 542 | 544 | $(OBJDIR)/purge_.c \ |
| 543 | 545 | $(OBJDIR)/rebuild_.c \ |
| 544 | 546 | $(OBJDIR)/regexp_.c \ |
| 545 | 547 | $(OBJDIR)/report_.c \ |
| 546 | 548 | $(OBJDIR)/rss_.c \ |
| @@ -653,10 +655,11 @@ | ||
| 653 | 655 | $(OBJDIR)/path.o \ |
| 654 | 656 | $(OBJDIR)/pivot.o \ |
| 655 | 657 | $(OBJDIR)/popen.o \ |
| 656 | 658 | $(OBJDIR)/pqueue.o \ |
| 657 | 659 | $(OBJDIR)/printf.o \ |
| 660 | + $(OBJDIR)/publish.o \ | |
| 658 | 661 | $(OBJDIR)/purge.o \ |
| 659 | 662 | $(OBJDIR)/rebuild.o \ |
| 660 | 663 | $(OBJDIR)/regexp.o \ |
| 661 | 664 | $(OBJDIR)/report.o \ |
| 662 | 665 | $(OBJDIR)/rss.o \ |
| @@ -962,10 +965,11 @@ | ||
| 962 | 965 | $(OBJDIR)/path_.c:$(OBJDIR)/path.h \ |
| 963 | 966 | $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \ |
| 964 | 967 | $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \ |
| 965 | 968 | $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \ |
| 966 | 969 | $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \ |
| 970 | + $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \ | |
| 967 | 971 | $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \ |
| 968 | 972 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 969 | 973 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 970 | 974 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 971 | 975 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| @@ -1609,10 +1613,18 @@ | ||
| 1609 | 1613 | |
| 1610 | 1614 | $(OBJDIR)/printf.o: $(OBJDIR)/printf_.c $(OBJDIR)/printf.h $(SRCDIR)/config.h |
| 1611 | 1615 | $(XTCC) -o $(OBJDIR)/printf.o -c $(OBJDIR)/printf_.c |
| 1612 | 1616 | |
| 1613 | 1617 | $(OBJDIR)/printf.h: $(OBJDIR)/headers |
| 1618 | + | |
| 1619 | +$(OBJDIR)/publish_.c: $(SRCDIR)/publish.c $(TRANSLATE) | |
| 1620 | + $(TRANSLATE) $(SRCDIR)/publish.c >$@ | |
| 1621 | + | |
| 1622 | +$(OBJDIR)/publish.o: $(OBJDIR)/publish_.c $(OBJDIR)/publish.h $(SRCDIR)/config.h | |
| 1623 | + $(XTCC) -o $(OBJDIR)/publish.o -c $(OBJDIR)/publish_.c | |
| 1624 | + | |
| 1625 | +$(OBJDIR)/publish.h: $(OBJDIR)/headers | |
| 1614 | 1626 | |
| 1615 | 1627 | $(OBJDIR)/purge_.c: $(SRCDIR)/purge.c $(TRANSLATE) |
| 1616 | 1628 | $(TRANSLATE) $(SRCDIR)/purge.c >$@ |
| 1617 | 1629 | |
| 1618 | 1630 | $(OBJDIR)/purge.o: $(OBJDIR)/purge_.c $(OBJDIR)/purge.h $(SRCDIR)/config.h |
| 1619 | 1631 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -418,10 +418,11 @@ | |
| 418 | $(SRCDIR)/path.c \ |
| 419 | $(SRCDIR)/pivot.c \ |
| 420 | $(SRCDIR)/popen.c \ |
| 421 | $(SRCDIR)/pqueue.c \ |
| 422 | $(SRCDIR)/printf.c \ |
| 423 | $(SRCDIR)/purge.c \ |
| 424 | $(SRCDIR)/rebuild.c \ |
| 425 | $(SRCDIR)/regexp.c \ |
| 426 | $(SRCDIR)/report.c \ |
| 427 | $(SRCDIR)/rss.c \ |
| @@ -537,10 +538,11 @@ | |
| 537 | $(OBJDIR)/path_.c \ |
| 538 | $(OBJDIR)/pivot_.c \ |
| 539 | $(OBJDIR)/popen_.c \ |
| 540 | $(OBJDIR)/pqueue_.c \ |
| 541 | $(OBJDIR)/printf_.c \ |
| 542 | $(OBJDIR)/purge_.c \ |
| 543 | $(OBJDIR)/rebuild_.c \ |
| 544 | $(OBJDIR)/regexp_.c \ |
| 545 | $(OBJDIR)/report_.c \ |
| 546 | $(OBJDIR)/rss_.c \ |
| @@ -653,10 +655,11 @@ | |
| 653 | $(OBJDIR)/path.o \ |
| 654 | $(OBJDIR)/pivot.o \ |
| 655 | $(OBJDIR)/popen.o \ |
| 656 | $(OBJDIR)/pqueue.o \ |
| 657 | $(OBJDIR)/printf.o \ |
| 658 | $(OBJDIR)/purge.o \ |
| 659 | $(OBJDIR)/rebuild.o \ |
| 660 | $(OBJDIR)/regexp.o \ |
| 661 | $(OBJDIR)/report.o \ |
| 662 | $(OBJDIR)/rss.o \ |
| @@ -962,10 +965,11 @@ | |
| 962 | $(OBJDIR)/path_.c:$(OBJDIR)/path.h \ |
| 963 | $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \ |
| 964 | $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \ |
| 965 | $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \ |
| 966 | $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \ |
| 967 | $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \ |
| 968 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 969 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 970 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 971 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| @@ -1609,10 +1613,18 @@ | |
| 1609 | |
| 1610 | $(OBJDIR)/printf.o: $(OBJDIR)/printf_.c $(OBJDIR)/printf.h $(SRCDIR)/config.h |
| 1611 | $(XTCC) -o $(OBJDIR)/printf.o -c $(OBJDIR)/printf_.c |
| 1612 | |
| 1613 | $(OBJDIR)/printf.h: $(OBJDIR)/headers |
| 1614 | |
| 1615 | $(OBJDIR)/purge_.c: $(SRCDIR)/purge.c $(TRANSLATE) |
| 1616 | $(TRANSLATE) $(SRCDIR)/purge.c >$@ |
| 1617 | |
| 1618 | $(OBJDIR)/purge.o: $(OBJDIR)/purge_.c $(OBJDIR)/purge.h $(SRCDIR)/config.h |
| 1619 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -418,10 +418,11 @@ | |
| 418 | $(SRCDIR)/path.c \ |
| 419 | $(SRCDIR)/pivot.c \ |
| 420 | $(SRCDIR)/popen.c \ |
| 421 | $(SRCDIR)/pqueue.c \ |
| 422 | $(SRCDIR)/printf.c \ |
| 423 | $(SRCDIR)/publish.c \ |
| 424 | $(SRCDIR)/purge.c \ |
| 425 | $(SRCDIR)/rebuild.c \ |
| 426 | $(SRCDIR)/regexp.c \ |
| 427 | $(SRCDIR)/report.c \ |
| 428 | $(SRCDIR)/rss.c \ |
| @@ -537,10 +538,11 @@ | |
| 538 | $(OBJDIR)/path_.c \ |
| 539 | $(OBJDIR)/pivot_.c \ |
| 540 | $(OBJDIR)/popen_.c \ |
| 541 | $(OBJDIR)/pqueue_.c \ |
| 542 | $(OBJDIR)/printf_.c \ |
| 543 | $(OBJDIR)/publish_.c \ |
| 544 | $(OBJDIR)/purge_.c \ |
| 545 | $(OBJDIR)/rebuild_.c \ |
| 546 | $(OBJDIR)/regexp_.c \ |
| 547 | $(OBJDIR)/report_.c \ |
| 548 | $(OBJDIR)/rss_.c \ |
| @@ -653,10 +655,11 @@ | |
| 655 | $(OBJDIR)/path.o \ |
| 656 | $(OBJDIR)/pivot.o \ |
| 657 | $(OBJDIR)/popen.o \ |
| 658 | $(OBJDIR)/pqueue.o \ |
| 659 | $(OBJDIR)/printf.o \ |
| 660 | $(OBJDIR)/publish.o \ |
| 661 | $(OBJDIR)/purge.o \ |
| 662 | $(OBJDIR)/rebuild.o \ |
| 663 | $(OBJDIR)/regexp.o \ |
| 664 | $(OBJDIR)/report.o \ |
| 665 | $(OBJDIR)/rss.o \ |
| @@ -962,10 +965,11 @@ | |
| 965 | $(OBJDIR)/path_.c:$(OBJDIR)/path.h \ |
| 966 | $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \ |
| 967 | $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \ |
| 968 | $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \ |
| 969 | $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \ |
| 970 | $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \ |
| 971 | $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \ |
| 972 | $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \ |
| 973 | $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \ |
| 974 | $(OBJDIR)/report_.c:$(OBJDIR)/report.h \ |
| 975 | $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \ |
| @@ -1609,10 +1613,18 @@ | |
| 1613 | |
| 1614 | $(OBJDIR)/printf.o: $(OBJDIR)/printf_.c $(OBJDIR)/printf.h $(SRCDIR)/config.h |
| 1615 | $(XTCC) -o $(OBJDIR)/printf.o -c $(OBJDIR)/printf_.c |
| 1616 | |
| 1617 | $(OBJDIR)/printf.h: $(OBJDIR)/headers |
| 1618 | |
| 1619 | $(OBJDIR)/publish_.c: $(SRCDIR)/publish.c $(TRANSLATE) |
| 1620 | $(TRANSLATE) $(SRCDIR)/publish.c >$@ |
| 1621 | |
| 1622 | $(OBJDIR)/publish.o: $(OBJDIR)/publish_.c $(OBJDIR)/publish.h $(SRCDIR)/config.h |
| 1623 | $(XTCC) -o $(OBJDIR)/publish.o -c $(OBJDIR)/publish_.c |
| 1624 | |
| 1625 | $(OBJDIR)/publish.h: $(OBJDIR)/headers |
| 1626 | |
| 1627 | $(OBJDIR)/purge_.c: $(SRCDIR)/purge.c $(TRANSLATE) |
| 1628 | $(TRANSLATE) $(SRCDIR)/purge.c >$@ |
| 1629 | |
| 1630 | $(OBJDIR)/purge.o: $(OBJDIR)/purge_.c $(OBJDIR)/purge.h $(SRCDIR)/config.h |
| 1631 |
+10
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -270,10 +270,11 @@ | ||
| 270 | 270 | path_.c \ |
| 271 | 271 | pivot_.c \ |
| 272 | 272 | popen_.c \ |
| 273 | 273 | pqueue_.c \ |
| 274 | 274 | printf_.c \ |
| 275 | + publish_.c \ | |
| 275 | 276 | purge_.c \ |
| 276 | 277 | rebuild_.c \ |
| 277 | 278 | regexp_.c \ |
| 278 | 279 | report_.c \ |
| 279 | 280 | rss_.c \ |
| @@ -388,10 +389,11 @@ | ||
| 388 | 389 | $(OX)\path$O \ |
| 389 | 390 | $(OX)\pivot$O \ |
| 390 | 391 | $(OX)\popen$O \ |
| 391 | 392 | $(OX)\pqueue$O \ |
| 392 | 393 | $(OX)\printf$O \ |
| 394 | + $(OX)\publish$O \ | |
| 393 | 395 | $(OX)\purge$O \ |
| 394 | 396 | $(OX)\rebuild$O \ |
| 395 | 397 | $(OX)\regexp$O \ |
| 396 | 398 | $(OX)\report$O \ |
| 397 | 399 | $(OX)\rss$O \ |
| @@ -559,10 +561,11 @@ | ||
| 559 | 561 | echo $(OX)\path.obj >> $@ |
| 560 | 562 | echo $(OX)\pivot.obj >> $@ |
| 561 | 563 | echo $(OX)\popen.obj >> $@ |
| 562 | 564 | echo $(OX)\pqueue.obj >> $@ |
| 563 | 565 | echo $(OX)\printf.obj >> $@ |
| 566 | + echo $(OX)\publish.obj >> $@ | |
| 564 | 567 | echo $(OX)\purge.obj >> $@ |
| 565 | 568 | echo $(OX)\rebuild.obj >> $@ |
| 566 | 569 | echo $(OX)\regexp.obj >> $@ |
| 567 | 570 | echo $(OX)\report.obj >> $@ |
| 568 | 571 | echo $(OX)\rss.obj >> $@ |
| @@ -1151,10 +1154,16 @@ | ||
| 1151 | 1154 | $(OX)\printf$O : printf_.c printf.h |
| 1152 | 1155 | $(TCC) /Fo$@ -c printf_.c |
| 1153 | 1156 | |
| 1154 | 1157 | printf_.c : $(SRCDIR)\printf.c |
| 1155 | 1158 | translate$E $** > $@ |
| 1159 | + | |
| 1160 | +$(OX)\publish$O : publish_.c publish.h | |
| 1161 | + $(TCC) /Fo$@ -c publish_.c | |
| 1162 | + | |
| 1163 | +publish_.c : $(SRCDIR)\publish.c | |
| 1164 | + translate$E $** > $@ | |
| 1156 | 1165 | |
| 1157 | 1166 | $(OX)\purge$O : purge_.c purge.h |
| 1158 | 1167 | $(TCC) /Fo$@ -c purge_.c |
| 1159 | 1168 | |
| 1160 | 1169 | purge_.c : $(SRCDIR)\purge.c |
| @@ -1465,10 +1474,11 @@ | ||
| 1465 | 1474 | path_.c:path.h \ |
| 1466 | 1475 | pivot_.c:pivot.h \ |
| 1467 | 1476 | popen_.c:popen.h \ |
| 1468 | 1477 | pqueue_.c:pqueue.h \ |
| 1469 | 1478 | printf_.c:printf.h \ |
| 1479 | + publish_.c:publish.h \ | |
| 1470 | 1480 | purge_.c:purge.h \ |
| 1471 | 1481 | rebuild_.c:rebuild.h \ |
| 1472 | 1482 | regexp_.c:regexp.h \ |
| 1473 | 1483 | report_.c:report.h \ |
| 1474 | 1484 | rss_.c:rss.h \ |
| 1475 | 1485 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -270,10 +270,11 @@ | |
| 270 | path_.c \ |
| 271 | pivot_.c \ |
| 272 | popen_.c \ |
| 273 | pqueue_.c \ |
| 274 | printf_.c \ |
| 275 | purge_.c \ |
| 276 | rebuild_.c \ |
| 277 | regexp_.c \ |
| 278 | report_.c \ |
| 279 | rss_.c \ |
| @@ -388,10 +389,11 @@ | |
| 388 | $(OX)\path$O \ |
| 389 | $(OX)\pivot$O \ |
| 390 | $(OX)\popen$O \ |
| 391 | $(OX)\pqueue$O \ |
| 392 | $(OX)\printf$O \ |
| 393 | $(OX)\purge$O \ |
| 394 | $(OX)\rebuild$O \ |
| 395 | $(OX)\regexp$O \ |
| 396 | $(OX)\report$O \ |
| 397 | $(OX)\rss$O \ |
| @@ -559,10 +561,11 @@ | |
| 559 | echo $(OX)\path.obj >> $@ |
| 560 | echo $(OX)\pivot.obj >> $@ |
| 561 | echo $(OX)\popen.obj >> $@ |
| 562 | echo $(OX)\pqueue.obj >> $@ |
| 563 | echo $(OX)\printf.obj >> $@ |
| 564 | echo $(OX)\purge.obj >> $@ |
| 565 | echo $(OX)\rebuild.obj >> $@ |
| 566 | echo $(OX)\regexp.obj >> $@ |
| 567 | echo $(OX)\report.obj >> $@ |
| 568 | echo $(OX)\rss.obj >> $@ |
| @@ -1151,10 +1154,16 @@ | |
| 1151 | $(OX)\printf$O : printf_.c printf.h |
| 1152 | $(TCC) /Fo$@ -c printf_.c |
| 1153 | |
| 1154 | printf_.c : $(SRCDIR)\printf.c |
| 1155 | translate$E $** > $@ |
| 1156 | |
| 1157 | $(OX)\purge$O : purge_.c purge.h |
| 1158 | $(TCC) /Fo$@ -c purge_.c |
| 1159 | |
| 1160 | purge_.c : $(SRCDIR)\purge.c |
| @@ -1465,10 +1474,11 @@ | |
| 1465 | path_.c:path.h \ |
| 1466 | pivot_.c:pivot.h \ |
| 1467 | popen_.c:popen.h \ |
| 1468 | pqueue_.c:pqueue.h \ |
| 1469 | printf_.c:printf.h \ |
| 1470 | purge_.c:purge.h \ |
| 1471 | rebuild_.c:rebuild.h \ |
| 1472 | regexp_.c:regexp.h \ |
| 1473 | report_.c:report.h \ |
| 1474 | rss_.c:rss.h \ |
| 1475 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -270,10 +270,11 @@ | |
| 270 | path_.c \ |
| 271 | pivot_.c \ |
| 272 | popen_.c \ |
| 273 | pqueue_.c \ |
| 274 | printf_.c \ |
| 275 | publish_.c \ |
| 276 | purge_.c \ |
| 277 | rebuild_.c \ |
| 278 | regexp_.c \ |
| 279 | report_.c \ |
| 280 | rss_.c \ |
| @@ -388,10 +389,11 @@ | |
| 389 | $(OX)\path$O \ |
| 390 | $(OX)\pivot$O \ |
| 391 | $(OX)\popen$O \ |
| 392 | $(OX)\pqueue$O \ |
| 393 | $(OX)\printf$O \ |
| 394 | $(OX)\publish$O \ |
| 395 | $(OX)\purge$O \ |
| 396 | $(OX)\rebuild$O \ |
| 397 | $(OX)\regexp$O \ |
| 398 | $(OX)\report$O \ |
| 399 | $(OX)\rss$O \ |
| @@ -559,10 +561,11 @@ | |
| 561 | echo $(OX)\path.obj >> $@ |
| 562 | echo $(OX)\pivot.obj >> $@ |
| 563 | echo $(OX)\popen.obj >> $@ |
| 564 | echo $(OX)\pqueue.obj >> $@ |
| 565 | echo $(OX)\printf.obj >> $@ |
| 566 | echo $(OX)\publish.obj >> $@ |
| 567 | echo $(OX)\purge.obj >> $@ |
| 568 | echo $(OX)\rebuild.obj >> $@ |
| 569 | echo $(OX)\regexp.obj >> $@ |
| 570 | echo $(OX)\report.obj >> $@ |
| 571 | echo $(OX)\rss.obj >> $@ |
| @@ -1151,10 +1154,16 @@ | |
| 1154 | $(OX)\printf$O : printf_.c printf.h |
| 1155 | $(TCC) /Fo$@ -c printf_.c |
| 1156 | |
| 1157 | printf_.c : $(SRCDIR)\printf.c |
| 1158 | translate$E $** > $@ |
| 1159 | |
| 1160 | $(OX)\publish$O : publish_.c publish.h |
| 1161 | $(TCC) /Fo$@ -c publish_.c |
| 1162 | |
| 1163 | publish_.c : $(SRCDIR)\publish.c |
| 1164 | translate$E $** > $@ |
| 1165 | |
| 1166 | $(OX)\purge$O : purge_.c purge.h |
| 1167 | $(TCC) /Fo$@ -c purge_.c |
| 1168 | |
| 1169 | purge_.c : $(SRCDIR)\purge.c |
| @@ -1465,10 +1474,11 @@ | |
| 1474 | path_.c:path.h \ |
| 1475 | pivot_.c:pivot.h \ |
| 1476 | popen_.c:popen.h \ |
| 1477 | pqueue_.c:pqueue.h \ |
| 1478 | printf_.c:printf.h \ |
| 1479 | publish_.c:publish.h \ |
| 1480 | purge_.c:purge.h \ |
| 1481 | rebuild_.c:rebuild.h \ |
| 1482 | regexp_.c:regexp.h \ |
| 1483 | report_.c:report.h \ |
| 1484 | rss_.c:rss.h \ |
| 1485 |