Fossil SCM
Merge trunk
Commit
839eca1842c2af687abbdfbc04ff356dbc8b4059
Parent
4630d9ba8b04e49…
10 files changed
+1
+2
-2
+11
-6
+7
-6
+26
-24
+1
-1
+1
-1
+2
-6
+2
-2
+2
-2
+1
| --- Makefile.in | ||
| +++ Makefile.in | ||
| @@ -37,10 +37,11 @@ | ||
| 37 | 37 | # care about testing the end result, this can be blank. |
| 38 | 38 | # |
| 39 | 39 | TCLSH = tclsh |
| 40 | 40 | |
| 41 | 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | +BCCFLAGS = @CPPFLAGS@ @CFLAGS@ | |
| 42 | 43 | TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H |
| 43 | 44 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 44 | 45 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 45 | 46 | USE_LINENOISE = @USE_LINENOISE@ |
| 46 | 47 | USE_SEE = @USE_SEE@ |
| 47 | 48 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -37,10 +37,11 @@ | |
| 37 | # care about testing the end result, this can be blank. |
| 38 | # |
| 39 | TCLSH = tclsh |
| 40 | |
| 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H |
| 43 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 44 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 45 | USE_LINENOISE = @USE_LINENOISE@ |
| 46 | USE_SEE = @USE_SEE@ |
| 47 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -37,10 +37,11 @@ | |
| 37 | # care about testing the end result, this can be blank. |
| 38 | # |
| 39 | TCLSH = tclsh |
| 40 | |
| 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | BCCFLAGS = @CPPFLAGS@ @CFLAGS@ |
| 43 | TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H |
| 44 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 45 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 46 | USE_LINENOISE = @USE_LINENOISE@ |
| 47 | USE_SEE = @USE_SEE@ |
| 48 |
+2
-2
| --- src/browse.c | ||
| +++ src/browse.c | ||
| @@ -689,15 +689,15 @@ | ||
| 689 | 689 | if( showDirOnly ){ |
| 690 | 690 | for(nFile=0, p=sTree.pFirst; p; p=p->pNext){ |
| 691 | 691 | if( p->pChild!=0 && p->nFullName>nD ) nFile++; |
| 692 | 692 | } |
| 693 | 693 | zObjType = "Folders"; |
| 694 | - style_submenu_element("Files", "%s", url_render(&sURI,"nofiles",0,0,0)); | |
| 695 | 694 | }else{ |
| 696 | 695 | zObjType = "Files"; |
| 697 | - style_submenu_element("Folders", "%s", url_render(&sURI,"nofiles","1",0,0)); | |
| 698 | 696 | } |
| 697 | + | |
| 698 | + style_submenu_checkbox("nofiles", "Folders Only", 0); | |
| 699 | 699 | |
| 700 | 700 | if( zCI ){ |
| 701 | 701 | @ <h2>%s(zObjType) from |
| 702 | 702 | if( sqlite3_strnicmp(zCI, zUuid, (int)strlen(zCI))!=0 ){ |
| 703 | 703 | @ "%h(zCI)" |
| 704 | 704 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -689,15 +689,15 @@ | |
| 689 | if( showDirOnly ){ |
| 690 | for(nFile=0, p=sTree.pFirst; p; p=p->pNext){ |
| 691 | if( p->pChild!=0 && p->nFullName>nD ) nFile++; |
| 692 | } |
| 693 | zObjType = "Folders"; |
| 694 | style_submenu_element("Files", "%s", url_render(&sURI,"nofiles",0,0,0)); |
| 695 | }else{ |
| 696 | zObjType = "Files"; |
| 697 | style_submenu_element("Folders", "%s", url_render(&sURI,"nofiles","1",0,0)); |
| 698 | } |
| 699 | |
| 700 | if( zCI ){ |
| 701 | @ <h2>%s(zObjType) from |
| 702 | if( sqlite3_strnicmp(zCI, zUuid, (int)strlen(zCI))!=0 ){ |
| 703 | @ "%h(zCI)" |
| 704 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -689,15 +689,15 @@ | |
| 689 | if( showDirOnly ){ |
| 690 | for(nFile=0, p=sTree.pFirst; p; p=p->pNext){ |
| 691 | if( p->pChild!=0 && p->nFullName>nD ) nFile++; |
| 692 | } |
| 693 | zObjType = "Folders"; |
| 694 | }else{ |
| 695 | zObjType = "Files"; |
| 696 | } |
| 697 | |
| 698 | style_submenu_checkbox("nofiles", "Folders Only", 0); |
| 699 | |
| 700 | if( zCI ){ |
| 701 | @ <h2>%s(zObjType) from |
| 702 | if( sqlite3_strnicmp(zCI, zUuid, (int)strlen(zCI))!=0 ){ |
| 703 | @ "%h(zCI)" |
| 704 |
+11
-6
| --- src/dispatch.c | ||
| +++ src/dispatch.c | ||
| @@ -233,14 +233,15 @@ | ||
| 233 | 233 | */ |
| 234 | 234 | void help_page(void){ |
| 235 | 235 | const char *zCmd = P("cmd"); |
| 236 | 236 | |
| 237 | 237 | if( zCmd==0 ) zCmd = P("name"); |
| 238 | - style_header("Command-line Help"); | |
| 239 | - if( zCmd ){ | |
| 238 | + if( zCmd && *zCmd ){ | |
| 240 | 239 | int rc; |
| 241 | 240 | const CmdOrPage *pCmd = 0; |
| 241 | + | |
| 242 | + style_header("Help: %s", zCmd); | |
| 242 | 243 | |
| 243 | 244 | style_submenu_element("Command-List", "%s/help", g.zTop); |
| 244 | 245 | if( *zCmd=='/' ){ |
| 245 | 246 | /* Some of the webpages require query parameters in order to work. |
| 246 | 247 | ** @ <h1>The "<a href='%R%s(zCmd)'>%s(zCmd)</a>" page:</h1> */ |
| @@ -262,26 +263,30 @@ | ||
| 262 | 263 | @ </blockquote> |
| 263 | 264 | } |
| 264 | 265 | } |
| 265 | 266 | }else{ |
| 266 | 267 | int i, j, n; |
| 268 | + | |
| 269 | + style_header("Help"); | |
| 267 | 270 | |
| 268 | 271 | @ <h1>Available commands:</h1> |
| 269 | 272 | @ <table border="0"><tr> |
| 270 | 273 | for(i=j=0; i<MX_COMMAND; i++){ |
| 271 | 274 | const char *z = aCommand[i].zName; |
| 272 | 275 | if( '/'==*z || strncmp(z,"test",4)==0 ) continue; |
| 273 | 276 | j++; |
| 274 | 277 | } |
| 275 | - n = (j+6)/7; | |
| 278 | + n = (j+5)/6; | |
| 276 | 279 | for(i=j=0; i<MX_COMMAND; i++){ |
| 277 | 280 | const char *z = aCommand[i].zName; |
| 281 | + const char *zBoldOn = aCommand[i].eCmdFlags&CMDFLAG_1ST_TIER?"<b>" :""; | |
| 282 | + const char *zBoldOff = aCommand[i].eCmdFlags&CMDFLAG_1ST_TIER?"</b>":""; | |
| 278 | 283 | if( '/'==*z || strncmp(z,"test",4)==0 ) continue; |
| 279 | 284 | if( j==0 ){ |
| 280 | 285 | @ <td valign="top"><ul> |
| 281 | 286 | } |
| 282 | - @ <li><a href="%R/help?cmd=%s(z)">%s(z)</a></li> | |
| 287 | + @ <li><a href="%R/help?cmd=%s(z)">%s(zBoldOn)%s(z)%s(zBoldOff)</a></li> | |
| 283 | 288 | j++; |
| 284 | 289 | if( j>=n ){ |
| 285 | 290 | @ </ul></td> |
| 286 | 291 | j = 0; |
| 287 | 292 | } |
| @@ -360,11 +365,11 @@ | ||
| 360 | 365 | ** |
| 361 | 366 | ** Show all help text on a single page. Useful for proof-reading. |
| 362 | 367 | */ |
| 363 | 368 | void test_all_help_page(void){ |
| 364 | 369 | int i; |
| 365 | - style_header("Testpage: All Help Text"); | |
| 370 | + style_header("All Help Text"); | |
| 366 | 371 | for(i=0; i<MX_COMMAND; i++){ |
| 367 | 372 | if( memcmp(aCommand[i].zName, "test", 4)==0 ) continue; |
| 368 | 373 | @ <h2>%s(aCommand[i].zName):</h2> |
| 369 | 374 | @ <blockquote> |
| 370 | 375 | help_to_html(aCommand[i].zHelp, cgi_output_blob()); |
| @@ -402,11 +407,11 @@ | ||
| 402 | 407 | */ |
| 403 | 408 | void cmd_test_webpage_list(void){ |
| 404 | 409 | int i, nCmd; |
| 405 | 410 | const char *aCmd[MX_COMMAND]; |
| 406 | 411 | for(i=nCmd=0; i<MX_COMMAND; i++){ |
| 407 | - if(0x08 & aCommand[i].eCmdFlags){ | |
| 412 | + if(CMDFLAG_WEBPAGE & aCommand[i].eCmdFlags){ | |
| 408 | 413 | aCmd[nCmd++] = aCommand[i].zName; |
| 409 | 414 | } |
| 410 | 415 | } |
| 411 | 416 | assert(nCmd && "page list is empty?"); |
| 412 | 417 | multi_column_list(aCmd, nCmd); |
| 413 | 418 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -233,14 +233,15 @@ | |
| 233 | */ |
| 234 | void help_page(void){ |
| 235 | const char *zCmd = P("cmd"); |
| 236 | |
| 237 | if( zCmd==0 ) zCmd = P("name"); |
| 238 | style_header("Command-line Help"); |
| 239 | if( zCmd ){ |
| 240 | int rc; |
| 241 | const CmdOrPage *pCmd = 0; |
| 242 | |
| 243 | style_submenu_element("Command-List", "%s/help", g.zTop); |
| 244 | if( *zCmd=='/' ){ |
| 245 | /* Some of the webpages require query parameters in order to work. |
| 246 | ** @ <h1>The "<a href='%R%s(zCmd)'>%s(zCmd)</a>" page:</h1> */ |
| @@ -262,26 +263,30 @@ | |
| 262 | @ </blockquote> |
| 263 | } |
| 264 | } |
| 265 | }else{ |
| 266 | int i, j, n; |
| 267 | |
| 268 | @ <h1>Available commands:</h1> |
| 269 | @ <table border="0"><tr> |
| 270 | for(i=j=0; i<MX_COMMAND; i++){ |
| 271 | const char *z = aCommand[i].zName; |
| 272 | if( '/'==*z || strncmp(z,"test",4)==0 ) continue; |
| 273 | j++; |
| 274 | } |
| 275 | n = (j+6)/7; |
| 276 | for(i=j=0; i<MX_COMMAND; i++){ |
| 277 | const char *z = aCommand[i].zName; |
| 278 | if( '/'==*z || strncmp(z,"test",4)==0 ) continue; |
| 279 | if( j==0 ){ |
| 280 | @ <td valign="top"><ul> |
| 281 | } |
| 282 | @ <li><a href="%R/help?cmd=%s(z)">%s(z)</a></li> |
| 283 | j++; |
| 284 | if( j>=n ){ |
| 285 | @ </ul></td> |
| 286 | j = 0; |
| 287 | } |
| @@ -360,11 +365,11 @@ | |
| 360 | ** |
| 361 | ** Show all help text on a single page. Useful for proof-reading. |
| 362 | */ |
| 363 | void test_all_help_page(void){ |
| 364 | int i; |
| 365 | style_header("Testpage: All Help Text"); |
| 366 | for(i=0; i<MX_COMMAND; i++){ |
| 367 | if( memcmp(aCommand[i].zName, "test", 4)==0 ) continue; |
| 368 | @ <h2>%s(aCommand[i].zName):</h2> |
| 369 | @ <blockquote> |
| 370 | help_to_html(aCommand[i].zHelp, cgi_output_blob()); |
| @@ -402,11 +407,11 @@ | |
| 402 | */ |
| 403 | void cmd_test_webpage_list(void){ |
| 404 | int i, nCmd; |
| 405 | const char *aCmd[MX_COMMAND]; |
| 406 | for(i=nCmd=0; i<MX_COMMAND; i++){ |
| 407 | if(0x08 & aCommand[i].eCmdFlags){ |
| 408 | aCmd[nCmd++] = aCommand[i].zName; |
| 409 | } |
| 410 | } |
| 411 | assert(nCmd && "page list is empty?"); |
| 412 | multi_column_list(aCmd, nCmd); |
| 413 |
| --- src/dispatch.c | |
| +++ src/dispatch.c | |
| @@ -233,14 +233,15 @@ | |
| 233 | */ |
| 234 | void help_page(void){ |
| 235 | const char *zCmd = P("cmd"); |
| 236 | |
| 237 | if( zCmd==0 ) zCmd = P("name"); |
| 238 | if( zCmd && *zCmd ){ |
| 239 | int rc; |
| 240 | const CmdOrPage *pCmd = 0; |
| 241 | |
| 242 | style_header("Help: %s", zCmd); |
| 243 | |
| 244 | style_submenu_element("Command-List", "%s/help", g.zTop); |
| 245 | if( *zCmd=='/' ){ |
| 246 | /* Some of the webpages require query parameters in order to work. |
| 247 | ** @ <h1>The "<a href='%R%s(zCmd)'>%s(zCmd)</a>" page:</h1> */ |
| @@ -262,26 +263,30 @@ | |
| 263 | @ </blockquote> |
| 264 | } |
| 265 | } |
| 266 | }else{ |
| 267 | int i, j, n; |
| 268 | |
| 269 | style_header("Help"); |
| 270 | |
| 271 | @ <h1>Available commands:</h1> |
| 272 | @ <table border="0"><tr> |
| 273 | for(i=j=0; i<MX_COMMAND; i++){ |
| 274 | const char *z = aCommand[i].zName; |
| 275 | if( '/'==*z || strncmp(z,"test",4)==0 ) continue; |
| 276 | j++; |
| 277 | } |
| 278 | n = (j+5)/6; |
| 279 | for(i=j=0; i<MX_COMMAND; i++){ |
| 280 | const char *z = aCommand[i].zName; |
| 281 | const char *zBoldOn = aCommand[i].eCmdFlags&CMDFLAG_1ST_TIER?"<b>" :""; |
| 282 | const char *zBoldOff = aCommand[i].eCmdFlags&CMDFLAG_1ST_TIER?"</b>":""; |
| 283 | if( '/'==*z || strncmp(z,"test",4)==0 ) continue; |
| 284 | if( j==0 ){ |
| 285 | @ <td valign="top"><ul> |
| 286 | } |
| 287 | @ <li><a href="%R/help?cmd=%s(z)">%s(zBoldOn)%s(z)%s(zBoldOff)</a></li> |
| 288 | j++; |
| 289 | if( j>=n ){ |
| 290 | @ </ul></td> |
| 291 | j = 0; |
| 292 | } |
| @@ -360,11 +365,11 @@ | |
| 365 | ** |
| 366 | ** Show all help text on a single page. Useful for proof-reading. |
| 367 | */ |
| 368 | void test_all_help_page(void){ |
| 369 | int i; |
| 370 | style_header("All Help Text"); |
| 371 | for(i=0; i<MX_COMMAND; i++){ |
| 372 | if( memcmp(aCommand[i].zName, "test", 4)==0 ) continue; |
| 373 | @ <h2>%s(aCommand[i].zName):</h2> |
| 374 | @ <blockquote> |
| 375 | help_to_html(aCommand[i].zHelp, cgi_output_blob()); |
| @@ -402,11 +407,11 @@ | |
| 407 | */ |
| 408 | void cmd_test_webpage_list(void){ |
| 409 | int i, nCmd; |
| 410 | const char *aCmd[MX_COMMAND]; |
| 411 | for(i=nCmd=0; i<MX_COMMAND; i++){ |
| 412 | if(CMDFLAG_WEBPAGE & aCommand[i].eCmdFlags){ |
| 413 | aCmd[nCmd++] = aCommand[i].zName; |
| 414 | } |
| 415 | } |
| 416 | assert(nCmd && "page list is empty?"); |
| 417 | multi_column_list(aCmd, nCmd); |
| 418 |
+7
-6
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -8,10 +8,11 @@ | ||
| 8 | 8 | # to regenerate this file. |
| 9 | 9 | # |
| 10 | 10 | # This file is included by primary Makefile. |
| 11 | 11 | # |
| 12 | 12 | |
| 13 | +XBCC = $(BCC) $(BCCFLAGS) $(CFLAGS) | |
| 13 | 14 | XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS) |
| 14 | 15 | |
| 15 | 16 | |
| 16 | 17 | SRC = \ |
| 17 | 18 | $(SRCDIR)/add.c \ |
| @@ -451,26 +452,26 @@ | ||
| 451 | 452 | |
| 452 | 453 | $(OBJDIR): |
| 453 | 454 | -mkdir $(OBJDIR) |
| 454 | 455 | |
| 455 | 456 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 456 | - $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c | |
| 457 | + $(XBCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c | |
| 457 | 458 | |
| 458 | 459 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| 459 | - $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c | |
| 460 | + $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c | |
| 460 | 461 | |
| 461 | 462 | $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c |
| 462 | - $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c | |
| 463 | + $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c | |
| 463 | 464 | |
| 464 | 465 | $(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c |
| 465 | - $(BCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c | |
| 466 | + $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c | |
| 466 | 467 | |
| 467 | 468 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c |
| 468 | - $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c | |
| 469 | + $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c | |
| 469 | 470 | |
| 470 | 471 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 471 | - $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c | |
| 472 | + $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c | |
| 472 | 473 | |
| 473 | 474 | # Run the test suite. |
| 474 | 475 | # Other flags that can be included in TESTFLAGS are: |
| 475 | 476 | # |
| 476 | 477 | # -halt Stop testing after the first failed test |
| 477 | 478 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -8,10 +8,11 @@ | |
| 8 | # to regenerate this file. |
| 9 | # |
| 10 | # This file is included by primary Makefile. |
| 11 | # |
| 12 | |
| 13 | XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS) |
| 14 | |
| 15 | |
| 16 | SRC = \ |
| 17 | $(SRCDIR)/add.c \ |
| @@ -451,26 +452,26 @@ | |
| 451 | |
| 452 | $(OBJDIR): |
| 453 | -mkdir $(OBJDIR) |
| 454 | |
| 455 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 456 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 457 | |
| 458 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| 459 | $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c |
| 460 | |
| 461 | $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c |
| 462 | $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c |
| 463 | |
| 464 | $(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c |
| 465 | $(BCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c |
| 466 | |
| 467 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c |
| 468 | $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 469 | |
| 470 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 471 | $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 472 | |
| 473 | # Run the test suite. |
| 474 | # Other flags that can be included in TESTFLAGS are: |
| 475 | # |
| 476 | # -halt Stop testing after the first failed test |
| 477 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -8,10 +8,11 @@ | |
| 8 | # to regenerate this file. |
| 9 | # |
| 10 | # This file is included by primary Makefile. |
| 11 | # |
| 12 | |
| 13 | XBCC = $(BCC) $(BCCFLAGS) $(CFLAGS) |
| 14 | XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS) |
| 15 | |
| 16 | |
| 17 | SRC = \ |
| 18 | $(SRCDIR)/add.c \ |
| @@ -451,26 +452,26 @@ | |
| 452 | |
| 453 | $(OBJDIR): |
| 454 | -mkdir $(OBJDIR) |
| 455 | |
| 456 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 457 | $(XBCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 458 | |
| 459 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| 460 | $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c |
| 461 | |
| 462 | $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c |
| 463 | $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c |
| 464 | |
| 465 | $(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c |
| 466 | $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c |
| 467 | |
| 468 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c |
| 469 | $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 470 | |
| 471 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 472 | $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 473 | |
| 474 | # Run the test suite. |
| 475 | # Other flags that can be included in TESTFLAGS are: |
| 476 | # |
| 477 | # -halt Stop testing after the first failed test |
| 478 |
+26
-24
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -255,10 +255,11 @@ | ||
| 255 | 255 | # to regenerate this file. |
| 256 | 256 | # |
| 257 | 257 | # This file is included by primary Makefile. |
| 258 | 258 | # |
| 259 | 259 | |
| 260 | +XBCC = $(BCC) $(BCCFLAGS) $(CFLAGS) | |
| 260 | 261 | XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS) |
| 261 | 262 | |
| 262 | 263 | } |
| 263 | 264 | writeln -nonewline "SRC =" |
| 264 | 265 | foreach s [lsort $src] { |
| @@ -298,26 +299,26 @@ | ||
| 298 | 299 | |
| 299 | 300 | $(OBJDIR): |
| 300 | 301 | -mkdir $(OBJDIR) |
| 301 | 302 | |
| 302 | 303 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 303 | - $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c | |
| 304 | + $(XBCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c | |
| 304 | 305 | |
| 305 | 306 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| 306 | - $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c | |
| 307 | + $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c | |
| 307 | 308 | |
| 308 | 309 | $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c |
| 309 | - $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c | |
| 310 | + $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c | |
| 310 | 311 | |
| 311 | 312 | $(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c |
| 312 | - $(BCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c | |
| 313 | + $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c | |
| 313 | 314 | |
| 314 | 315 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c |
| 315 | - $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c | |
| 316 | + $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c | |
| 316 | 317 | |
| 317 | 318 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 318 | - $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c | |
| 319 | + $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c | |
| 319 | 320 | |
| 320 | 321 | # Run the test suite. |
| 321 | 322 | # Other flags that can be included in TESTFLAGS are: |
| 322 | 323 | # |
| 323 | 324 | # -halt Stop testing after the first failed test |
| @@ -917,10 +918,11 @@ | ||
| 917 | 918 | -include config.w32 |
| 918 | 919 | |
| 919 | 920 | # STOP HERE |
| 920 | 921 | # You should not need to change anything below this line |
| 921 | 922 | #-------------------------------------------------------- |
| 923 | +XBCC = $(BCC) $(CFLAGS) | |
| 922 | 924 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 923 | 925 | } |
| 924 | 926 | writeln -nonewline "SRC =" |
| 925 | 927 | foreach s [lsort $src] { |
| 926 | 928 | writeln -nonewline " \\\n \$(SRCDIR)/$s.c" |
| @@ -1013,26 +1015,26 @@ | ||
| 1013 | 1015 | else |
| 1014 | 1016 | $(MKDIR) $(OBJDIR) |
| 1015 | 1017 | endif |
| 1016 | 1018 | |
| 1017 | 1019 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 1018 | - $(BCC) -o $@ $(SRCDIR)/translate.c | |
| 1020 | + $(XBCC) -o $@ $(SRCDIR)/translate.c | |
| 1019 | 1021 | |
| 1020 | 1022 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 1021 | - $(BCC) -o $@ $(SRCDIR)/makeheaders.c | |
| 1023 | + $(XBCC) -o $@ $(SRCDIR)/makeheaders.c | |
| 1022 | 1024 | |
| 1023 | 1025 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 1024 | - $(BCC) -o $@ $(SRCDIR)/mkindex.c | |
| 1026 | + $(XBCC) -o $@ $(SRCDIR)/mkindex.c | |
| 1025 | 1027 | |
| 1026 | 1028 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 1027 | - $(BCC) -o $@ $(SRCDIR)/mkbuiltin.c | |
| 1029 | + $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c | |
| 1028 | 1030 | |
| 1029 | 1031 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 1030 | - $(BCC) -o $@ $(SRCDIR)/mkversion.c | |
| 1032 | + $(XBCC) -o $@ $(SRCDIR)/mkversion.c | |
| 1031 | 1033 | |
| 1032 | 1034 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 1033 | - $(BCC) -o $@ $(SRCDIR)/codecheck1.c | |
| 1035 | + $(XBCC) -o $@ $(SRCDIR)/codecheck1.c | |
| 1034 | 1036 | |
| 1035 | 1037 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 1036 | 1038 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 1037 | 1039 | # the repository after running the tests. |
| 1038 | 1040 | test: $(OBJDIR) $(APPNAME) |
| @@ -1305,26 +1307,26 @@ | ||
| 1305 | 1307 | writeln "\t+echo. >> \$@" |
| 1306 | 1308 | writeln "\t+echo fossil >> \$@" |
| 1307 | 1309 | |
| 1308 | 1310 | writeln { |
| 1309 | 1311 | translate$E: $(SRCDIR)\translate.c |
| 1310 | - $(BCC) -o$@ $** | |
| 1312 | + $(XBCC) -o$@ $** | |
| 1311 | 1313 | |
| 1312 | 1314 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 1313 | - $(BCC) -o$@ $** | |
| 1315 | + $(XBCC) -o$@ $** | |
| 1314 | 1316 | |
| 1315 | 1317 | mkindex$E: $(SRCDIR)\mkindex.c |
| 1316 | - $(BCC) -o$@ $** | |
| 1318 | + $(XBCC) -o$@ $** | |
| 1317 | 1319 | |
| 1318 | 1320 | mkbuiltin$E: $(SRCDIR)\mkbuiltin.c |
| 1319 | - $(BCC) -o$@ $** | |
| 1321 | + $(XBCC) -o$@ $** | |
| 1320 | 1322 | |
| 1321 | 1323 | mkversion$E: $(SRCDIR)\mkversion.c |
| 1322 | - $(BCC) -o$@ $** | |
| 1324 | + $(XBCC) -o$@ $** | |
| 1323 | 1325 | |
| 1324 | 1326 | codecheck1$E: $(SRCDIR)\codecheck1.c |
| 1325 | - $(BCC) -o$@ $** | |
| 1327 | + $(XBCC) -o$@ $** | |
| 1326 | 1328 | |
| 1327 | 1329 | $(OBJDIR)\shell$O : $(SRCDIR)\shell.c |
| 1328 | 1330 | $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $** |
| 1329 | 1331 | |
| 1330 | 1332 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| @@ -1827,26 +1829,26 @@ | ||
| 1827 | 1829 | writeln { |
| 1828 | 1830 | $(OX): |
| 1829 | 1831 | @-mkdir $@ |
| 1830 | 1832 | |
| 1831 | 1833 | translate$E: $(SRCDIR)\translate.c |
| 1832 | - $(BCC) $** | |
| 1834 | + $(XBCC) $** | |
| 1833 | 1835 | |
| 1834 | 1836 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 1835 | - $(BCC) $** | |
| 1837 | + $(XBCC) $** | |
| 1836 | 1838 | |
| 1837 | 1839 | mkindex$E: $(SRCDIR)\mkindex.c |
| 1838 | - $(BCC) $** | |
| 1840 | + $(XBCC) $** | |
| 1839 | 1841 | |
| 1840 | 1842 | mkbuiltin$E: $(SRCDIR)\mkbuiltin.c |
| 1841 | - $(BCC) $** | |
| 1843 | + $(XBCC) $** | |
| 1842 | 1844 | |
| 1843 | 1845 | mkversion$E: $(SRCDIR)\mkversion.c |
| 1844 | - $(BCC) $** | |
| 1846 | + $(XBCC) $** | |
| 1845 | 1847 | |
| 1846 | 1848 | codecheck1$E: $(SRCDIR)\codecheck1.c |
| 1847 | - $(BCC) $** | |
| 1849 | + $(XBCC) $** | |
| 1848 | 1850 | |
| 1849 | 1851 | !if $(USE_SEE)!=0 |
| 1850 | 1852 | SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c |
| 1851 | 1853 | !else |
| 1852 | 1854 | SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c |
| 1853 | 1855 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -255,10 +255,11 @@ | |
| 255 | # to regenerate this file. |
| 256 | # |
| 257 | # This file is included by primary Makefile. |
| 258 | # |
| 259 | |
| 260 | XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS) |
| 261 | |
| 262 | } |
| 263 | writeln -nonewline "SRC =" |
| 264 | foreach s [lsort $src] { |
| @@ -298,26 +299,26 @@ | |
| 298 | |
| 299 | $(OBJDIR): |
| 300 | -mkdir $(OBJDIR) |
| 301 | |
| 302 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 303 | $(BCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 304 | |
| 305 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| 306 | $(BCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c |
| 307 | |
| 308 | $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c |
| 309 | $(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c |
| 310 | |
| 311 | $(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c |
| 312 | $(BCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c |
| 313 | |
| 314 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c |
| 315 | $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 316 | |
| 317 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 318 | $(BCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 319 | |
| 320 | # Run the test suite. |
| 321 | # Other flags that can be included in TESTFLAGS are: |
| 322 | # |
| 323 | # -halt Stop testing after the first failed test |
| @@ -917,10 +918,11 @@ | |
| 917 | -include config.w32 |
| 918 | |
| 919 | # STOP HERE |
| 920 | # You should not need to change anything below this line |
| 921 | #-------------------------------------------------------- |
| 922 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 923 | } |
| 924 | writeln -nonewline "SRC =" |
| 925 | foreach s [lsort $src] { |
| 926 | writeln -nonewline " \\\n \$(SRCDIR)/$s.c" |
| @@ -1013,26 +1015,26 @@ | |
| 1013 | else |
| 1014 | $(MKDIR) $(OBJDIR) |
| 1015 | endif |
| 1016 | |
| 1017 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 1018 | $(BCC) -o $@ $(SRCDIR)/translate.c |
| 1019 | |
| 1020 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 1021 | $(BCC) -o $@ $(SRCDIR)/makeheaders.c |
| 1022 | |
| 1023 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 1024 | $(BCC) -o $@ $(SRCDIR)/mkindex.c |
| 1025 | |
| 1026 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 1027 | $(BCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 1028 | |
| 1029 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 1030 | $(BCC) -o $@ $(SRCDIR)/mkversion.c |
| 1031 | |
| 1032 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 1033 | $(BCC) -o $@ $(SRCDIR)/codecheck1.c |
| 1034 | |
| 1035 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 1036 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 1037 | # the repository after running the tests. |
| 1038 | test: $(OBJDIR) $(APPNAME) |
| @@ -1305,26 +1307,26 @@ | |
| 1305 | writeln "\t+echo. >> \$@" |
| 1306 | writeln "\t+echo fossil >> \$@" |
| 1307 | |
| 1308 | writeln { |
| 1309 | translate$E: $(SRCDIR)\translate.c |
| 1310 | $(BCC) -o$@ $** |
| 1311 | |
| 1312 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 1313 | $(BCC) -o$@ $** |
| 1314 | |
| 1315 | mkindex$E: $(SRCDIR)\mkindex.c |
| 1316 | $(BCC) -o$@ $** |
| 1317 | |
| 1318 | mkbuiltin$E: $(SRCDIR)\mkbuiltin.c |
| 1319 | $(BCC) -o$@ $** |
| 1320 | |
| 1321 | mkversion$E: $(SRCDIR)\mkversion.c |
| 1322 | $(BCC) -o$@ $** |
| 1323 | |
| 1324 | codecheck1$E: $(SRCDIR)\codecheck1.c |
| 1325 | $(BCC) -o$@ $** |
| 1326 | |
| 1327 | $(OBJDIR)\shell$O : $(SRCDIR)\shell.c |
| 1328 | $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $** |
| 1329 | |
| 1330 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| @@ -1827,26 +1829,26 @@ | |
| 1827 | writeln { |
| 1828 | $(OX): |
| 1829 | @-mkdir $@ |
| 1830 | |
| 1831 | translate$E: $(SRCDIR)\translate.c |
| 1832 | $(BCC) $** |
| 1833 | |
| 1834 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 1835 | $(BCC) $** |
| 1836 | |
| 1837 | mkindex$E: $(SRCDIR)\mkindex.c |
| 1838 | $(BCC) $** |
| 1839 | |
| 1840 | mkbuiltin$E: $(SRCDIR)\mkbuiltin.c |
| 1841 | $(BCC) $** |
| 1842 | |
| 1843 | mkversion$E: $(SRCDIR)\mkversion.c |
| 1844 | $(BCC) $** |
| 1845 | |
| 1846 | codecheck1$E: $(SRCDIR)\codecheck1.c |
| 1847 | $(BCC) $** |
| 1848 | |
| 1849 | !if $(USE_SEE)!=0 |
| 1850 | SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c |
| 1851 | !else |
| 1852 | SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c |
| 1853 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -255,10 +255,11 @@ | |
| 255 | # to regenerate this file. |
| 256 | # |
| 257 | # This file is included by primary Makefile. |
| 258 | # |
| 259 | |
| 260 | XBCC = $(BCC) $(BCCFLAGS) $(CFLAGS) |
| 261 | XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS) $(CFLAGS) |
| 262 | |
| 263 | } |
| 264 | writeln -nonewline "SRC =" |
| 265 | foreach s [lsort $src] { |
| @@ -298,26 +299,26 @@ | |
| 299 | |
| 300 | $(OBJDIR): |
| 301 | -mkdir $(OBJDIR) |
| 302 | |
| 303 | $(OBJDIR)/translate: $(SRCDIR)/translate.c |
| 304 | $(XBCC) -o $(OBJDIR)/translate $(SRCDIR)/translate.c |
| 305 | |
| 306 | $(OBJDIR)/makeheaders: $(SRCDIR)/makeheaders.c |
| 307 | $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR)/makeheaders.c |
| 308 | |
| 309 | $(OBJDIR)/mkindex: $(SRCDIR)/mkindex.c |
| 310 | $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c |
| 311 | |
| 312 | $(OBJDIR)/mkbuiltin: $(SRCDIR)/mkbuiltin.c |
| 313 | $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR)/mkbuiltin.c |
| 314 | |
| 315 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c |
| 316 | $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c |
| 317 | |
| 318 | $(OBJDIR)/codecheck1: $(SRCDIR)/codecheck1.c |
| 319 | $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR)/codecheck1.c |
| 320 | |
| 321 | # Run the test suite. |
| 322 | # Other flags that can be included in TESTFLAGS are: |
| 323 | # |
| 324 | # -halt Stop testing after the first failed test |
| @@ -917,10 +918,11 @@ | |
| 918 | -include config.w32 |
| 919 | |
| 920 | # STOP HERE |
| 921 | # You should not need to change anything below this line |
| 922 | #-------------------------------------------------------- |
| 923 | XBCC = $(BCC) $(CFLAGS) |
| 924 | XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) |
| 925 | } |
| 926 | writeln -nonewline "SRC =" |
| 927 | foreach s [lsort $src] { |
| 928 | writeln -nonewline " \\\n \$(SRCDIR)/$s.c" |
| @@ -1013,26 +1015,26 @@ | |
| 1015 | else |
| 1016 | $(MKDIR) $(OBJDIR) |
| 1017 | endif |
| 1018 | |
| 1019 | $(TRANSLATE): $(SRCDIR)/translate.c |
| 1020 | $(XBCC) -o $@ $(SRCDIR)/translate.c |
| 1021 | |
| 1022 | $(MAKEHEADERS): $(SRCDIR)/makeheaders.c |
| 1023 | $(XBCC) -o $@ $(SRCDIR)/makeheaders.c |
| 1024 | |
| 1025 | $(MKINDEX): $(SRCDIR)/mkindex.c |
| 1026 | $(XBCC) -o $@ $(SRCDIR)/mkindex.c |
| 1027 | |
| 1028 | $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c |
| 1029 | $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c |
| 1030 | |
| 1031 | $(MKVERSION): $(SRCDIR)/mkversion.c |
| 1032 | $(XBCC) -o $@ $(SRCDIR)/mkversion.c |
| 1033 | |
| 1034 | $(CODECHECK1): $(SRCDIR)/codecheck1.c |
| 1035 | $(XBCC) -o $@ $(SRCDIR)/codecheck1.c |
| 1036 | |
| 1037 | # WARNING. DANGER. Running the test suite modifies the repository the |
| 1038 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 1039 | # the repository after running the tests. |
| 1040 | test: $(OBJDIR) $(APPNAME) |
| @@ -1305,26 +1307,26 @@ | |
| 1307 | writeln "\t+echo. >> \$@" |
| 1308 | writeln "\t+echo fossil >> \$@" |
| 1309 | |
| 1310 | writeln { |
| 1311 | translate$E: $(SRCDIR)\translate.c |
| 1312 | $(XBCC) -o$@ $** |
| 1313 | |
| 1314 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 1315 | $(XBCC) -o$@ $** |
| 1316 | |
| 1317 | mkindex$E: $(SRCDIR)\mkindex.c |
| 1318 | $(XBCC) -o$@ $** |
| 1319 | |
| 1320 | mkbuiltin$E: $(SRCDIR)\mkbuiltin.c |
| 1321 | $(XBCC) -o$@ $** |
| 1322 | |
| 1323 | mkversion$E: $(SRCDIR)\mkversion.c |
| 1324 | $(XBCC) -o$@ $** |
| 1325 | |
| 1326 | codecheck1$E: $(SRCDIR)\codecheck1.c |
| 1327 | $(XBCC) -o$@ $** |
| 1328 | |
| 1329 | $(OBJDIR)\shell$O : $(SRCDIR)\shell.c |
| 1330 | $(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $** |
| 1331 | |
| 1332 | $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| @@ -1827,26 +1829,26 @@ | |
| 1829 | writeln { |
| 1830 | $(OX): |
| 1831 | @-mkdir $@ |
| 1832 | |
| 1833 | translate$E: $(SRCDIR)\translate.c |
| 1834 | $(XBCC) $** |
| 1835 | |
| 1836 | makeheaders$E: $(SRCDIR)\makeheaders.c |
| 1837 | $(XBCC) $** |
| 1838 | |
| 1839 | mkindex$E: $(SRCDIR)\mkindex.c |
| 1840 | $(XBCC) $** |
| 1841 | |
| 1842 | mkbuiltin$E: $(SRCDIR)\mkbuiltin.c |
| 1843 | $(XBCC) $** |
| 1844 | |
| 1845 | mkversion$E: $(SRCDIR)\mkversion.c |
| 1846 | $(XBCC) $** |
| 1847 | |
| 1848 | codecheck1$E: $(SRCDIR)\codecheck1.c |
| 1849 | $(XBCC) $** |
| 1850 | |
| 1851 | !if $(USE_SEE)!=0 |
| 1852 | SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c |
| 1853 | !else |
| 1854 | SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c |
| 1855 |
+1
-1
| --- src/mkindex.c | ||
| +++ src/mkindex.c | ||
| @@ -202,11 +202,11 @@ | ||
| 202 | 202 | /* Otherwise, this is a first-tier command */ |
| 203 | 203 | aEntry[nUsed].eType |= CMDFLAG_1ST_TIER; |
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - /* Processing additional flags that might following the command name */ | |
| 207 | + /* Process additional flags that might follow the command name */ | |
| 208 | 208 | while( zLine[i+j]!=0 ){ |
| 209 | 209 | i += j; |
| 210 | 210 | while( fossil_isspace(zLine[i]) ){ i++; } |
| 211 | 211 | if( zLine[i]==0 ) break; |
| 212 | 212 | for(j=0; zLine[i+j] && !fossil_isspace(zLine[i+j]); j++){} |
| 213 | 213 |
| --- src/mkindex.c | |
| +++ src/mkindex.c | |
| @@ -202,11 +202,11 @@ | |
| 202 | /* Otherwise, this is a first-tier command */ |
| 203 | aEntry[nUsed].eType |= CMDFLAG_1ST_TIER; |
| 204 | } |
| 205 | } |
| 206 | |
| 207 | /* Processing additional flags that might following the command name */ |
| 208 | while( zLine[i+j]!=0 ){ |
| 209 | i += j; |
| 210 | while( fossil_isspace(zLine[i]) ){ i++; } |
| 211 | if( zLine[i]==0 ) break; |
| 212 | for(j=0; zLine[i+j] && !fossil_isspace(zLine[i+j]); j++){} |
| 213 |
| --- src/mkindex.c | |
| +++ src/mkindex.c | |
| @@ -202,11 +202,11 @@ | |
| 202 | /* Otherwise, this is a first-tier command */ |
| 203 | aEntry[nUsed].eType |= CMDFLAG_1ST_TIER; |
| 204 | } |
| 205 | } |
| 206 | |
| 207 | /* Process additional flags that might follow the command name */ |
| 208 | while( zLine[i+j]!=0 ){ |
| 209 | i += j; |
| 210 | while( fossil_isspace(zLine[i]) ){ i++; } |
| 211 | if( zLine[i]==0 ) break; |
| 212 | for(j=0; zLine[i+j] && !fossil_isspace(zLine[i+j]); j++){} |
| 213 |
+1
-1
| --- src/rss.c | ||
| +++ src/rss.c | ||
| @@ -216,11 +216,11 @@ | ||
| 216 | 216 | free( zFreeProjectName ); |
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | /* |
| 221 | -** COMMAND: rss | |
| 221 | +** COMMAND: rss* | |
| 222 | 222 | ** |
| 223 | 223 | ** Usage: %fossil rss ?OPTIONS? |
| 224 | 224 | ** |
| 225 | 225 | ** The CLI variant of the /timeline.rss page, this produces an RSS |
| 226 | 226 | ** feed of the timeline to stdout. Options: |
| 227 | 227 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -216,11 +216,11 @@ | |
| 216 | free( zFreeProjectName ); |
| 217 | } |
| 218 | } |
| 219 | |
| 220 | /* |
| 221 | ** COMMAND: rss |
| 222 | ** |
| 223 | ** Usage: %fossil rss ?OPTIONS? |
| 224 | ** |
| 225 | ** The CLI variant of the /timeline.rss page, this produces an RSS |
| 226 | ** feed of the timeline to stdout. Options: |
| 227 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -216,11 +216,11 @@ | |
| 216 | free( zFreeProjectName ); |
| 217 | } |
| 218 | } |
| 219 | |
| 220 | /* |
| 221 | ** COMMAND: rss* |
| 222 | ** |
| 223 | ** Usage: %fossil rss ?OPTIONS? |
| 224 | ** |
| 225 | ** The CLI variant of the /timeline.rss page, this produces an RSS |
| 226 | ** feed of the timeline to stdout. Options: |
| 227 |
+2
-6
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -1589,16 +1589,12 @@ | ||
| 1589 | 1589 | login_needed(0); |
| 1590 | 1590 | return; |
| 1591 | 1591 | } |
| 1592 | 1592 | for(i=0; i<count(azCgiVars); i++) (void)P(azCgiVars[i]); |
| 1593 | 1593 | style_header("Environment Test"); |
| 1594 | - showAll = atoi(PD("showall","0")); | |
| 1595 | - if( !showAll ){ | |
| 1596 | - style_submenu_element("Show Cookies", "%R/test_env?showall=1"); | |
| 1597 | - }else{ | |
| 1598 | - style_submenu_element("Hide Cookies", "%R/test_env"); | |
| 1599 | - } | |
| 1594 | + showAll = PB("showall"); | |
| 1595 | + style_submenu_checkbox("showall", "Cookies", 0); | |
| 1600 | 1596 | style_submenu_element("Stats", "%R/stat"); |
| 1601 | 1597 | |
| 1602 | 1598 | #if !defined(_WIN32) |
| 1603 | 1599 | @ uid=%d(getuid()), gid=%d(getgid())<br /> |
| 1604 | 1600 | #endif |
| 1605 | 1601 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1589,16 +1589,12 @@ | |
| 1589 | login_needed(0); |
| 1590 | return; |
| 1591 | } |
| 1592 | for(i=0; i<count(azCgiVars); i++) (void)P(azCgiVars[i]); |
| 1593 | style_header("Environment Test"); |
| 1594 | showAll = atoi(PD("showall","0")); |
| 1595 | if( !showAll ){ |
| 1596 | style_submenu_element("Show Cookies", "%R/test_env?showall=1"); |
| 1597 | }else{ |
| 1598 | style_submenu_element("Hide Cookies", "%R/test_env"); |
| 1599 | } |
| 1600 | style_submenu_element("Stats", "%R/stat"); |
| 1601 | |
| 1602 | #if !defined(_WIN32) |
| 1603 | @ uid=%d(getuid()), gid=%d(getgid())<br /> |
| 1604 | #endif |
| 1605 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1589,16 +1589,12 @@ | |
| 1589 | login_needed(0); |
| 1590 | return; |
| 1591 | } |
| 1592 | for(i=0; i<count(azCgiVars); i++) (void)P(azCgiVars[i]); |
| 1593 | style_header("Environment Test"); |
| 1594 | showAll = PB("showall"); |
| 1595 | style_submenu_checkbox("showall", "Cookies", 0); |
| 1596 | style_submenu_element("Stats", "%R/stat"); |
| 1597 | |
| 1598 | #if !defined(_WIN32) |
| 1599 | @ uid=%d(getuid()), gid=%d(getgid())<br /> |
| 1600 | #endif |
| 1601 |
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1463,16 +1463,16 @@ | ||
| 1463 | 1463 | ** from=CHECKIN Path from... |
| 1464 | 1464 | ** to=CHECKIN ... to this |
| 1465 | 1465 | ** shortest ... show only the shortest path |
| 1466 | 1466 | ** uf=FILE_SHA1 Show only check-ins that contain the given file version |
| 1467 | 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | -** name matches one of the comma-separate GLOBLIST. | |
| 1468 | +** name matches one of the comma-separate GLOBLIST | |
| 1469 | 1469 | ** brbg Background color from branch name |
| 1470 | 1470 | ** ubg Background color from user |
| 1471 | 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 | 1472 | ** forks Show only forks and their children |
| 1473 | -** ym=YYYY-MM Show only events for the given year/month. | |
| 1473 | +** ym=YYYY-MM Show only events for the given year/month | |
| 1474 | 1474 | ** yw=YYYY-WW Show only events for the given week of the given year |
| 1475 | 1475 | ** ymd=YYYY-MM-DD Show only events on the given day |
| 1476 | 1476 | ** datefmt=N Override the date format |
| 1477 | 1477 | ** bisect Show the check-ins that are in the current bisect |
| 1478 | 1478 | ** showid Show RIDs |
| 1479 | 1479 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1463,16 +1463,16 @@ | |
| 1463 | ** from=CHECKIN Path from... |
| 1464 | ** to=CHECKIN ... to this |
| 1465 | ** shortest ... show only the shortest path |
| 1466 | ** uf=FILE_SHA1 Show only check-ins that contain the given file version |
| 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | ** name matches one of the comma-separate GLOBLIST. |
| 1469 | ** brbg Background color from branch name |
| 1470 | ** ubg Background color from user |
| 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 | ** forks Show only forks and their children |
| 1473 | ** ym=YYYY-MM Show only events for the given year/month. |
| 1474 | ** yw=YYYY-WW Show only events for the given week of the given year |
| 1475 | ** ymd=YYYY-MM-DD Show only events on the given day |
| 1476 | ** datefmt=N Override the date format |
| 1477 | ** bisect Show the check-ins that are in the current bisect |
| 1478 | ** showid Show RIDs |
| 1479 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1463,16 +1463,16 @@ | |
| 1463 | ** from=CHECKIN Path from... |
| 1464 | ** to=CHECKIN ... to this |
| 1465 | ** shortest ... show only the shortest path |
| 1466 | ** uf=FILE_SHA1 Show only check-ins that contain the given file version |
| 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | ** name matches one of the comma-separate GLOBLIST |
| 1469 | ** brbg Background color from branch name |
| 1470 | ** ubg Background color from user |
| 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 | ** forks Show only forks and their children |
| 1473 | ** ym=YYYY-MM Show only events for the given year/month |
| 1474 | ** yw=YYYY-WW Show only events for the given week of the given year |
| 1475 | ** ymd=YYYY-MM-DD Show only events on the given day |
| 1476 | ** datefmt=N Override the date format |
| 1477 | ** bisect Show the check-ins that are in the current bisect |
| 1478 | ** showid Show RIDs |
| 1479 |
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1463,16 +1463,16 @@ | ||
| 1463 | 1463 | ** from=CHECKIN Path from... |
| 1464 | 1464 | ** to=CHECKIN ... to this |
| 1465 | 1465 | ** shortest ... show only the shortest path |
| 1466 | 1466 | ** uf=FILE_SHA1 Show only check-ins that contain the given file version |
| 1467 | 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | -** name matches one of the comma-separate GLOBLIST. | |
| 1468 | +** name matches one of the comma-separate GLOBLIST | |
| 1469 | 1469 | ** brbg Background color from branch name |
| 1470 | 1470 | ** ubg Background color from user |
| 1471 | 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 | 1472 | ** forks Show only forks and their children |
| 1473 | -** ym=YYYY-MM Show only events for the given year/month. | |
| 1473 | +** ym=YYYY-MM Show only events for the given year/month | |
| 1474 | 1474 | ** yw=YYYY-WW Show only events for the given week of the given year |
| 1475 | 1475 | ** ymd=YYYY-MM-DD Show only events on the given day |
| 1476 | 1476 | ** datefmt=N Override the date format |
| 1477 | 1477 | ** bisect Show the check-ins that are in the current bisect |
| 1478 | 1478 | ** showid Show RIDs |
| 1479 | 1479 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1463,16 +1463,16 @@ | |
| 1463 | ** from=CHECKIN Path from... |
| 1464 | ** to=CHECKIN ... to this |
| 1465 | ** shortest ... show only the shortest path |
| 1466 | ** uf=FILE_SHA1 Show only check-ins that contain the given file version |
| 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | ** name matches one of the comma-separate GLOBLIST. |
| 1469 | ** brbg Background color from branch name |
| 1470 | ** ubg Background color from user |
| 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 | ** forks Show only forks and their children |
| 1473 | ** ym=YYYY-MM Show only events for the given year/month. |
| 1474 | ** yw=YYYY-WW Show only events for the given week of the given year |
| 1475 | ** ymd=YYYY-MM-DD Show only events on the given day |
| 1476 | ** datefmt=N Override the date format |
| 1477 | ** bisect Show the check-ins that are in the current bisect |
| 1478 | ** showid Show RIDs |
| 1479 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1463,16 +1463,16 @@ | |
| 1463 | ** from=CHECKIN Path from... |
| 1464 | ** to=CHECKIN ... to this |
| 1465 | ** shortest ... show only the shortest path |
| 1466 | ** uf=FILE_SHA1 Show only check-ins that contain the given file version |
| 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | ** name matches one of the comma-separate GLOBLIST |
| 1469 | ** brbg Background color from branch name |
| 1470 | ** ubg Background color from user |
| 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 | ** forks Show only forks and their children |
| 1473 | ** ym=YYYY-MM Show only events for the given year/month |
| 1474 | ** yw=YYYY-WW Show only events for the given week of the given year |
| 1475 | ** ymd=YYYY-MM-DD Show only events on the given day |
| 1476 | ** datefmt=N Override the date format |
| 1477 | ** bisect Show the check-ins that are in the current bisect |
| 1478 | ** showid Show RIDs |
| 1479 |