Fossil SCM
Split off the automatic background color chooser into a separate source file "color.c". Add a separate routine "user_color()" to choose background colors based on user name. Abandon the "color-hash-seed" setting. Instead, provide the "user-color-map" setting for overriding the automatic color choices for a few users, which color collisions occur between key project members.
Commit
da0d7f7460d5cb472a7bec448457632f8dbe38662c5eb0d841c3862ef69ef0a4
Parent
eb1415d8c5ba4a3…
11 files changed
+1
-1
+24
+1
-1
+1
-1
+12
+1
+1
-1
+1
-109
+10
-4
+12
+10
+1
-1
| --- src/chat.c | ||
| +++ src/chat.c | ||
| @@ -598,11 +598,11 @@ | ||
| 598 | 598 | blob_appendf(&json, "\"mtime\":\"%.10sT%sZ\",", zDate, zDate+11); |
| 599 | 599 | if( zLMtime && zLMtime[0] ){ |
| 600 | 600 | blob_appendf(&json, "\"lmtime\":%!j,", zLMtime); |
| 601 | 601 | } |
| 602 | 602 | blob_appendf(&json, "\"xfrom\":%!j,", zFrom); |
| 603 | - blob_appendf(&json, "\"uclr\":%!j,", hash_color(zFrom)); | |
| 603 | + blob_appendf(&json, "\"uclr\":%!j,", user_color(zFrom)); | |
| 604 | 604 | |
| 605 | 605 | zMsg = chat_format_to_html(zRawMsg ? zRawMsg : ""); |
| 606 | 606 | blob_appendf(&json, "\"xmsg\":%!j,", zMsg); |
| 607 | 607 | fossil_free(zMsg); |
| 608 | 608 | |
| 609 | 609 | |
| 610 | 610 | ADDED src/color.c |
| --- src/chat.c | |
| +++ src/chat.c | |
| @@ -598,11 +598,11 @@ | |
| 598 | blob_appendf(&json, "\"mtime\":\"%.10sT%sZ\",", zDate, zDate+11); |
| 599 | if( zLMtime && zLMtime[0] ){ |
| 600 | blob_appendf(&json, "\"lmtime\":%!j,", zLMtime); |
| 601 | } |
| 602 | blob_appendf(&json, "\"xfrom\":%!j,", zFrom); |
| 603 | blob_appendf(&json, "\"uclr\":%!j,", hash_color(zFrom)); |
| 604 | |
| 605 | zMsg = chat_format_to_html(zRawMsg ? zRawMsg : ""); |
| 606 | blob_appendf(&json, "\"xmsg\":%!j,", zMsg); |
| 607 | fossil_free(zMsg); |
| 608 | |
| 609 | |
| 610 | DDED src/color.c |
| --- src/chat.c | |
| +++ src/chat.c | |
| @@ -598,11 +598,11 @@ | |
| 598 | blob_appendf(&json, "\"mtime\":\"%.10sT%sZ\",", zDate, zDate+11); |
| 599 | if( zLMtime && zLMtime[0] ){ |
| 600 | blob_appendf(&json, "\"lmtime\":%!j,", zLMtime); |
| 601 | } |
| 602 | blob_appendf(&json, "\"xfrom\":%!j,", zFrom); |
| 603 | blob_appendf(&json, "\"uclr\":%!j,", user_color(zFrom)); |
| 604 | |
| 605 | zMsg = chat_format_to_html(zRawMsg ? zRawMsg : ""); |
| 606 | blob_appendf(&json, "\"xmsg\":%!j,", zMsg); |
| 607 | fossil_free(zMsg); |
| 608 | |
| 609 | |
| 610 | DDED src/color.c |
+24
| --- a/src/color.c | ||
| +++ b/src/color.c | ||
| @@ -0,0 +1,24 @@ | ||
| 1 | +/* | |
| 2 | +** Copyright (c) 2007 D. Richard Hipp | |
| 3 | +** | |
| 4 | +** This program is free software; you can redistribute it and/or | |
| 5 | +** modify it under the terms of the Simplified BSD License (also | |
| 6 | +** known as the "2-Clause License" or "FreeBSD License".) | |
| 7 | + | |
| 8 | +** This program is distributed in the hope that it will be useful, | |
| 9 | +** but without any warranty; without even the implied warranty of | |
| 10 | +** merchantability or fitness for a particular purpose. | |
| 11 | +** | |
| 12 | +** Author contact information: | |
| 13 | +** [email protected] | |
| 14 | +** http://www.hwaci.com/drh/ | |
| 15 | +** | |
| 16 | +******************************************************************************* | |
| 17 | +** | |
| 18 | +** This file contains code used to select colors based on branch and | |
| 19 | +** user names. | |
| 20 | +** | |
| 21 | +*/ | |
| 22 | +#include "config.h" | |
| 23 | +#include <string.h>int i; /* Loop counter */ /label>Branch %s(zNm): | |
| 24 | + @ </label><br /test-hash-color |
| --- a/src/color.c | |
| +++ b/src/color.c | |
| @@ -0,0 +1,24 @@ | |
| --- a/src/color.c | |
| +++ b/src/color.c | |
| @@ -0,0 +1,24 @@ | |
| 1 | /* |
| 2 | ** Copyright (c) 2007 D. Richard Hipp |
| 3 | ** |
| 4 | ** This program is free software; you can redistribute it and/or |
| 5 | ** modify it under the terms of the Simplified BSD License (also |
| 6 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 7 | |
| 8 | ** This program is distributed in the hope that it will be useful, |
| 9 | ** but without any warranty; without even the implied warranty of |
| 10 | ** merchantability or fitness for a particular purpose. |
| 11 | ** |
| 12 | ** Author contact information: |
| 13 | ** [email protected] |
| 14 | ** http://www.hwaci.com/drh/ |
| 15 | ** |
| 16 | ******************************************************************************* |
| 17 | ** |
| 18 | ** This file contains code used to select colors based on branch and |
| 19 | ** user names. |
| 20 | ** |
| 21 | */ |
| 22 | #include "config.h" |
| 23 | #include <string.h>int i; /* Loop counter */ /label>Branch %s(zNm): |
| 24 | @ </label><br /test-hash-color |
+1
-1
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -114,11 +114,10 @@ | ||
| 114 | 114 | { "adunit", CONFIGSET_SKIN }, |
| 115 | 115 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 116 | 116 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 117 | 117 | { "default-csp", CONFIGSET_SKIN }, |
| 118 | 118 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 119 | - { "color-hash-seed", CONFIGSET_SKIN }, | |
| 120 | 119 | { "safe-html", CONFIGSET_SKIN }, |
| 121 | 120 | |
| 122 | 121 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 123 | 122 | { "th1-docs", CONFIGSET_TH1 }, |
| 124 | 123 | #endif |
| @@ -166,10 +165,11 @@ | ||
| 166 | 165 | { "ticket-title-expr", CONFIGSET_TKT }, |
| 167 | 166 | { "ticket-closed-expr", CONFIGSET_TKT }, |
| 168 | 167 | { "@reportfmt", CONFIGSET_TKT }, |
| 169 | 168 | |
| 170 | 169 | { "@user", CONFIGSET_USER }, |
| 170 | + { "user-color-map", CONFIGSET_USER }, | |
| 171 | 171 | |
| 172 | 172 | { "@concealed", CONFIGSET_ADDR }, |
| 173 | 173 | |
| 174 | 174 | { "@shun", CONFIGSET_SHUN }, |
| 175 | 175 | |
| 176 | 176 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -114,11 +114,10 @@ | |
| 114 | { "adunit", CONFIGSET_SKIN }, |
| 115 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 116 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 117 | { "default-csp", CONFIGSET_SKIN }, |
| 118 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 119 | { "color-hash-seed", CONFIGSET_SKIN }, |
| 120 | { "safe-html", CONFIGSET_SKIN }, |
| 121 | |
| 122 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 123 | { "th1-docs", CONFIGSET_TH1 }, |
| 124 | #endif |
| @@ -166,10 +165,11 @@ | |
| 166 | { "ticket-title-expr", CONFIGSET_TKT }, |
| 167 | { "ticket-closed-expr", CONFIGSET_TKT }, |
| 168 | { "@reportfmt", CONFIGSET_TKT }, |
| 169 | |
| 170 | { "@user", CONFIGSET_USER }, |
| 171 | |
| 172 | { "@concealed", CONFIGSET_ADDR }, |
| 173 | |
| 174 | { "@shun", CONFIGSET_SHUN }, |
| 175 | |
| 176 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -114,11 +114,10 @@ | |
| 114 | { "adunit", CONFIGSET_SKIN }, |
| 115 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 116 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 117 | { "default-csp", CONFIGSET_SKIN }, |
| 118 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 119 | { "safe-html", CONFIGSET_SKIN }, |
| 120 | |
| 121 | #ifdef FOSSIL_ENABLE_TH1_DOCS |
| 122 | { "th1-docs", CONFIGSET_TH1 }, |
| 123 | #endif |
| @@ -166,10 +165,11 @@ | |
| 165 | { "ticket-title-expr", CONFIGSET_TKT }, |
| 166 | { "ticket-closed-expr", CONFIGSET_TKT }, |
| 167 | { "@reportfmt", CONFIGSET_TKT }, |
| 168 | |
| 169 | { "@user", CONFIGSET_USER }, |
| 170 | { "user-color-map", CONFIGSET_USER }, |
| 171 | |
| 172 | { "@concealed", CONFIGSET_ADDR }, |
| 173 | |
| 174 | { "@shun", CONFIGSET_SHUN }, |
| 175 | |
| 176 |
+1
-1
| --- src/finfo.c | ||
| +++ src/finfo.c | ||
| @@ -590,11 +590,11 @@ | ||
| 590 | 590 | nParent++; |
| 591 | 591 | } |
| 592 | 592 | db_reset(&qparent); |
| 593 | 593 | if( zBr==0 ) zBr = "trunk"; |
| 594 | 594 | if( uBg ){ |
| 595 | - zBgClr = hash_color(zUser); | |
| 595 | + zBgClr = user_color(zUser); | |
| 596 | 596 | }else if( brBg || zBgClr==0 || zBgClr[0]==0 ){ |
| 597 | 597 | zBgClr = strcmp(zBr,"trunk")==0 ? "" : hash_color(zBr); |
| 598 | 598 | } |
| 599 | 599 | gidx = graph_add_row(pGraph, |
| 600 | 600 | frid>0 ? (GraphRowId)frid*(mxfnid+1)+fnid : fpid+1000000000, |
| 601 | 601 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -590,11 +590,11 @@ | |
| 590 | nParent++; |
| 591 | } |
| 592 | db_reset(&qparent); |
| 593 | if( zBr==0 ) zBr = "trunk"; |
| 594 | if( uBg ){ |
| 595 | zBgClr = hash_color(zUser); |
| 596 | }else if( brBg || zBgClr==0 || zBgClr[0]==0 ){ |
| 597 | zBgClr = strcmp(zBr,"trunk")==0 ? "" : hash_color(zBr); |
| 598 | } |
| 599 | gidx = graph_add_row(pGraph, |
| 600 | frid>0 ? (GraphRowId)frid*(mxfnid+1)+fnid : fpid+1000000000, |
| 601 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -590,11 +590,11 @@ | |
| 590 | nParent++; |
| 591 | } |
| 592 | db_reset(&qparent); |
| 593 | if( zBr==0 ) zBr = "trunk"; |
| 594 | if( uBg ){ |
| 595 | zBgClr = user_color(zUser); |
| 596 | }else if( brBg || zBgClr==0 || zBgClr[0]==0 ){ |
| 597 | zBgClr = strcmp(zBr,"trunk")==0 ? "" : hash_color(zBr); |
| 598 | } |
| 599 | gidx = graph_add_row(pGraph, |
| 600 | frid>0 ? (GraphRowId)frid*(mxfnid+1)+fnid : fpid+1000000000, |
| 601 |
+12
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -37,10 +37,11 @@ | ||
| 37 | 37 | $(SRCDIR)/chat.c \ |
| 38 | 38 | $(SRCDIR)/checkin.c \ |
| 39 | 39 | $(SRCDIR)/checkout.c \ |
| 40 | 40 | $(SRCDIR)/clearsign.c \ |
| 41 | 41 | $(SRCDIR)/clone.c \ |
| 42 | + $(SRCDIR)/color.c \ | |
| 42 | 43 | $(SRCDIR)/comformat.c \ |
| 43 | 44 | $(SRCDIR)/configure.c \ |
| 44 | 45 | $(SRCDIR)/content.c \ |
| 45 | 46 | $(SRCDIR)/cookies.c \ |
| 46 | 47 | $(SRCDIR)/db.c \ |
| @@ -301,10 +302,11 @@ | ||
| 301 | 302 | $(OBJDIR)/chat_.c \ |
| 302 | 303 | $(OBJDIR)/checkin_.c \ |
| 303 | 304 | $(OBJDIR)/checkout_.c \ |
| 304 | 305 | $(OBJDIR)/clearsign_.c \ |
| 305 | 306 | $(OBJDIR)/clone_.c \ |
| 307 | + $(OBJDIR)/color_.c \ | |
| 306 | 308 | $(OBJDIR)/comformat_.c \ |
| 307 | 309 | $(OBJDIR)/configure_.c \ |
| 308 | 310 | $(OBJDIR)/content_.c \ |
| 309 | 311 | $(OBJDIR)/cookies_.c \ |
| 310 | 312 | $(OBJDIR)/db_.c \ |
| @@ -450,10 +452,11 @@ | ||
| 450 | 452 | $(OBJDIR)/chat.o \ |
| 451 | 453 | $(OBJDIR)/checkin.o \ |
| 452 | 454 | $(OBJDIR)/checkout.o \ |
| 453 | 455 | $(OBJDIR)/clearsign.o \ |
| 454 | 456 | $(OBJDIR)/clone.o \ |
| 457 | + $(OBJDIR)/color.o \ | |
| 455 | 458 | $(OBJDIR)/comformat.o \ |
| 456 | 459 | $(OBJDIR)/configure.o \ |
| 457 | 460 | $(OBJDIR)/content.o \ |
| 458 | 461 | $(OBJDIR)/cookies.o \ |
| 459 | 462 | $(OBJDIR)/db.o \ |
| @@ -789,10 +792,11 @@ | ||
| 789 | 792 | $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \ |
| 790 | 793 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 791 | 794 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 792 | 795 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 793 | 796 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 797 | + $(OBJDIR)/color_.c:$(OBJDIR)/color.h \ | |
| 794 | 798 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 795 | 799 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 796 | 800 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 797 | 801 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 798 | 802 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1103,10 +1107,18 @@ | ||
| 1103 | 1107 | |
| 1104 | 1108 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1105 | 1109 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1106 | 1110 | |
| 1107 | 1111 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1112 | + | |
| 1113 | +$(OBJDIR)/color_.c: $(SRCDIR)/color.c $(OBJDIR)/translate | |
| 1114 | + $(OBJDIR)/translate $(SRCDIR)/color.c >$@ | |
| 1115 | + | |
| 1116 | +$(OBJDIR)/color.o: $(OBJDIR)/color_.c $(OBJDIR)/color.h $(SRCDIR)/config.h | |
| 1117 | + $(XTCC) -o $(OBJDIR)/color.o -c $(OBJDIR)/color_.c | |
| 1118 | + | |
| 1119 | +$(OBJDIR)/color.h: $(OBJDIR)/headers | |
| 1108 | 1120 | |
| 1109 | 1121 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(OBJDIR)/translate |
| 1110 | 1122 | $(OBJDIR)/translate $(SRCDIR)/comformat.c >$@ |
| 1111 | 1123 | |
| 1112 | 1124 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| 1113 | 1125 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -37,10 +37,11 @@ | |
| 37 | $(SRCDIR)/chat.c \ |
| 38 | $(SRCDIR)/checkin.c \ |
| 39 | $(SRCDIR)/checkout.c \ |
| 40 | $(SRCDIR)/clearsign.c \ |
| 41 | $(SRCDIR)/clone.c \ |
| 42 | $(SRCDIR)/comformat.c \ |
| 43 | $(SRCDIR)/configure.c \ |
| 44 | $(SRCDIR)/content.c \ |
| 45 | $(SRCDIR)/cookies.c \ |
| 46 | $(SRCDIR)/db.c \ |
| @@ -301,10 +302,11 @@ | |
| 301 | $(OBJDIR)/chat_.c \ |
| 302 | $(OBJDIR)/checkin_.c \ |
| 303 | $(OBJDIR)/checkout_.c \ |
| 304 | $(OBJDIR)/clearsign_.c \ |
| 305 | $(OBJDIR)/clone_.c \ |
| 306 | $(OBJDIR)/comformat_.c \ |
| 307 | $(OBJDIR)/configure_.c \ |
| 308 | $(OBJDIR)/content_.c \ |
| 309 | $(OBJDIR)/cookies_.c \ |
| 310 | $(OBJDIR)/db_.c \ |
| @@ -450,10 +452,11 @@ | |
| 450 | $(OBJDIR)/chat.o \ |
| 451 | $(OBJDIR)/checkin.o \ |
| 452 | $(OBJDIR)/checkout.o \ |
| 453 | $(OBJDIR)/clearsign.o \ |
| 454 | $(OBJDIR)/clone.o \ |
| 455 | $(OBJDIR)/comformat.o \ |
| 456 | $(OBJDIR)/configure.o \ |
| 457 | $(OBJDIR)/content.o \ |
| 458 | $(OBJDIR)/cookies.o \ |
| 459 | $(OBJDIR)/db.o \ |
| @@ -789,10 +792,11 @@ | |
| 789 | $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \ |
| 790 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 791 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 792 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 793 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 794 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 795 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 796 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 797 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 798 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1103,10 +1107,18 @@ | |
| 1103 | |
| 1104 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1105 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1106 | |
| 1107 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1108 | |
| 1109 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(OBJDIR)/translate |
| 1110 | $(OBJDIR)/translate $(SRCDIR)/comformat.c >$@ |
| 1111 | |
| 1112 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| 1113 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -37,10 +37,11 @@ | |
| 37 | $(SRCDIR)/chat.c \ |
| 38 | $(SRCDIR)/checkin.c \ |
| 39 | $(SRCDIR)/checkout.c \ |
| 40 | $(SRCDIR)/clearsign.c \ |
| 41 | $(SRCDIR)/clone.c \ |
| 42 | $(SRCDIR)/color.c \ |
| 43 | $(SRCDIR)/comformat.c \ |
| 44 | $(SRCDIR)/configure.c \ |
| 45 | $(SRCDIR)/content.c \ |
| 46 | $(SRCDIR)/cookies.c \ |
| 47 | $(SRCDIR)/db.c \ |
| @@ -301,10 +302,11 @@ | |
| 302 | $(OBJDIR)/chat_.c \ |
| 303 | $(OBJDIR)/checkin_.c \ |
| 304 | $(OBJDIR)/checkout_.c \ |
| 305 | $(OBJDIR)/clearsign_.c \ |
| 306 | $(OBJDIR)/clone_.c \ |
| 307 | $(OBJDIR)/color_.c \ |
| 308 | $(OBJDIR)/comformat_.c \ |
| 309 | $(OBJDIR)/configure_.c \ |
| 310 | $(OBJDIR)/content_.c \ |
| 311 | $(OBJDIR)/cookies_.c \ |
| 312 | $(OBJDIR)/db_.c \ |
| @@ -450,10 +452,11 @@ | |
| 452 | $(OBJDIR)/chat.o \ |
| 453 | $(OBJDIR)/checkin.o \ |
| 454 | $(OBJDIR)/checkout.o \ |
| 455 | $(OBJDIR)/clearsign.o \ |
| 456 | $(OBJDIR)/clone.o \ |
| 457 | $(OBJDIR)/color.o \ |
| 458 | $(OBJDIR)/comformat.o \ |
| 459 | $(OBJDIR)/configure.o \ |
| 460 | $(OBJDIR)/content.o \ |
| 461 | $(OBJDIR)/cookies.o \ |
| 462 | $(OBJDIR)/db.o \ |
| @@ -789,10 +792,11 @@ | |
| 792 | $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \ |
| 793 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 794 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 795 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 796 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 797 | $(OBJDIR)/color_.c:$(OBJDIR)/color.h \ |
| 798 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 799 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 800 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 801 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 802 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1103,10 +1107,18 @@ | |
| 1107 | |
| 1108 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1109 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1110 | |
| 1111 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1112 | |
| 1113 | $(OBJDIR)/color_.c: $(SRCDIR)/color.c $(OBJDIR)/translate |
| 1114 | $(OBJDIR)/translate $(SRCDIR)/color.c >$@ |
| 1115 | |
| 1116 | $(OBJDIR)/color.o: $(OBJDIR)/color_.c $(OBJDIR)/color.h $(SRCDIR)/config.h |
| 1117 | $(XTCC) -o $(OBJDIR)/color.o -c $(OBJDIR)/color_.c |
| 1118 | |
| 1119 | $(OBJDIR)/color.h: $(OBJDIR)/headers |
| 1120 | |
| 1121 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(OBJDIR)/translate |
| 1122 | $(OBJDIR)/translate $(SRCDIR)/comformat.c >$@ |
| 1123 | |
| 1124 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| 1125 |
+1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -48,10 +48,11 @@ | ||
| 48 | 48 | chat |
| 49 | 49 | checkin |
| 50 | 50 | checkout |
| 51 | 51 | clearsign |
| 52 | 52 | clone |
| 53 | + color | |
| 53 | 54 | comformat |
| 54 | 55 | configure |
| 55 | 56 | content |
| 56 | 57 | cookies |
| 57 | 58 | db |
| 58 | 59 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -48,10 +48,11 @@ | |
| 48 | chat |
| 49 | checkin |
| 50 | checkout |
| 51 | clearsign |
| 52 | clone |
| 53 | comformat |
| 54 | configure |
| 55 | content |
| 56 | cookies |
| 57 | db |
| 58 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -48,10 +48,11 @@ | |
| 48 | chat |
| 49 | checkin |
| 50 | checkout |
| 51 | clearsign |
| 52 | clone |
| 53 | color |
| 54 | comformat |
| 55 | configure |
| 56 | content |
| 57 | cookies |
| 58 | db |
| 59 |
+1
-1
| --- src/setupuser.c | ||
| +++ src/setupuser.c | ||
| @@ -184,11 +184,11 @@ | ||
| 184 | 184 | int sid = db_column_int(&s,9); |
| 185 | 185 | if( rATime>0.0 ){ |
| 186 | 186 | zAge = human_readable_age(rNow - rATime); |
| 187 | 187 | } |
| 188 | 188 | if( bUbg ){ |
| 189 | - @ <tr style='background-color: %h(hash_color(zLogin));'> | |
| 189 | + @ <tr style='background-color: %h(user_color(zLogin));'> | |
| 190 | 190 | }else{ |
| 191 | 191 | @ <tr> |
| 192 | 192 | } |
| 193 | 193 | @ <td data-sortkey='%h(zSortKey)'>\ |
| 194 | 194 | @ <a href='setup_uedit?id=%d(uid)'>%h(zLogin)</a> |
| 195 | 195 |
| --- src/setupuser.c | |
| +++ src/setupuser.c | |
| @@ -184,11 +184,11 @@ | |
| 184 | int sid = db_column_int(&s,9); |
| 185 | if( rATime>0.0 ){ |
| 186 | zAge = human_readable_age(rNow - rATime); |
| 187 | } |
| 188 | if( bUbg ){ |
| 189 | @ <tr style='background-color: %h(hash_color(zLogin));'> |
| 190 | }else{ |
| 191 | @ <tr> |
| 192 | } |
| 193 | @ <td data-sortkey='%h(zSortKey)'>\ |
| 194 | @ <a href='setup_uedit?id=%d(uid)'>%h(zLogin)</a> |
| 195 |
| --- src/setupuser.c | |
| +++ src/setupuser.c | |
| @@ -184,11 +184,11 @@ | |
| 184 | int sid = db_column_int(&s,9); |
| 185 | if( rATime>0.0 ){ |
| 186 | zAge = human_readable_age(rNow - rATime); |
| 187 | } |
| 188 | if( bUbg ){ |
| 189 | @ <tr style='background-color: %h(user_color(zLogin));'> |
| 190 | }else{ |
| 191 | @ <tr> |
| 192 | } |
| 193 | @ <td data-sortkey='%h(zSortKey)'>\ |
| 194 | @ <a href='setup_uedit?id=%d(uid)'>%h(zLogin)</a> |
| 195 |
+1
-109
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -120,118 +120,10 @@ | ||
| 120 | 120 | #define TIMELINE_FORUMTXT 0x4000000 /* Render all forum messages */ |
| 121 | 121 | #define TIMELINE_REFS 0x8000000 /* Output intended for References tab */ |
| 122 | 122 | #define TIMELINE_DELTA 0x10000000 /* Background color shows delta manifests */ |
| 123 | 123 | #endif |
| 124 | 124 | |
| 125 | -/* | |
| 126 | -** Hash a string and use the hash to determine a background color. | |
| 127 | -** | |
| 128 | -** This value returned is in static space and is overwritten with | |
| 129 | -** each subsequent call. | |
| 130 | -** | |
| 131 | -** SETTING: color-hash-seed width=16 default=0 | |
| 132 | -** | |
| 133 | -** This is a seed value used for the hash that determines automatically | |
| 134 | -** selected colors for branches and users. | |
| 135 | -*/ | |
| 136 | -char *hash_color(const char *z){ | |
| 137 | - int i; /* Loop counter */ | |
| 138 | - unsigned int h = 0; /* Hash on the branch name */ | |
| 139 | - int r, g, b; /* Values for red, green, and blue */ | |
| 140 | - int h1, h2, h3, h4; /* Elements of the hash value */ | |
| 141 | - int mx, mn; /* Components of HSV */ | |
| 142 | - static char zColor[10]; /* The resulting color */ | |
| 143 | - static int ix[3] = {0,0,0}; /* Color chooser parameters */ | |
| 144 | - | |
| 145 | - if( ix[0]==0 ){ | |
| 146 | - if( skin_detail_boolean("white-foreground") ){ | |
| 147 | - ix[0] = 0x50; | |
| 148 | - ix[1] = 0x20; | |
| 149 | - }else{ | |
| 150 | - ix[0] = 0xf8; | |
| 151 | - ix[1] = 0x20; | |
| 152 | - } | |
| 153 | - ix[2] = db_get_int("color-hash-seed",0); | |
| 154 | - } | |
| 155 | - h = ix[2]; | |
| 156 | - for(i=0; z[i]; i++ ){ | |
| 157 | - h = (h<<11) ^ (h<<1) ^ (h>>3) ^ z[i]; | |
| 158 | - } | |
| 159 | - h1 = h % 6; h /= 6; | |
| 160 | - h3 = h % 10; h /= 10; | |
| 161 | - h4 = h % 10; h /= 10; | |
| 162 | - mx = ix[0] - h3; | |
| 163 | - mn = mx - h4 - ix[1]; | |
| 164 | - h2 = (h%(mx - mn)) + mn; | |
| 165 | - switch( h1 ){ | |
| 166 | - case 0: r = mx; g = h2, b = mn; break; | |
| 167 | - case 1: r = h2; g = mx, b = mn; break; | |
| 168 | - case 2: r = mn; g = mx, b = h2; break; | |
| 169 | - case 3: r = mn; g = h2, b = mx; break; | |
| 170 | - case 4: r = h2; g = mn, b = mx; break; | |
| 171 | - default: r = mx; g = mn, b = h2; break; | |
| 172 | - } | |
| 173 | - sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b); | |
| 174 | - return zColor; | |
| 175 | -} | |
| 176 | - | |
| 177 | -/* | |
| 178 | -** COMMAND: test-hash-color | |
| 179 | -** | |
| 180 | -** Usage: %fossil test-hash-color TAG ... | |
| 181 | -** | |
| 182 | -** Print out the color names associated with each tag. Used for | |
| 183 | -** testing the hash_color() function. | |
| 184 | -*/ | |
| 185 | -void test_hash_color(void){ | |
| 186 | - int i; | |
| 187 | - for(i=2; i<g.argc; i++){ | |
| 188 | - fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i])); | |
| 189 | - } | |
| 190 | -} | |
| 191 | - | |
| 192 | -/* | |
| 193 | -** WEBPAGE: hash-color-test | |
| 194 | -** | |
| 195 | -** Print out the color names associated with each tag. Used for | |
| 196 | -** testing the hash_color() function. | |
| 197 | -*/ | |
| 198 | -void test_hash_color_page(void){ | |
| 199 | - const char *zBr; | |
| 200 | - char zNm[10]; | |
| 201 | - int i, cnt; | |
| 202 | - login_check_credentials(); | |
| 203 | - | |
| 204 | - style_set_current_feature("test"); | |
| 205 | - style_header("Hash Color Test"); | |
| 206 | - for(i=cnt=0; i<10; i++){ | |
| 207 | - sqlite3_snprintf(sizeof(zNm),zNm,"b%d",i); | |
| 208 | - zBr = P(zNm); | |
| 209 | - if( zBr && zBr[0] ){ | |
| 210 | - @ <p style='border:1px solid;background-color:%s(hash_color(zBr));'> | |
| 211 | - @ %h(zBr) - %s(hash_color(zBr)) - | |
| 212 | - @ Omnes nos quasi oves erravimus unusquisque in viam | |
| 213 | - @ suam declinavit.</p> | |
| 214 | - cnt++; | |
| 215 | - } | |
| 216 | - } | |
| 217 | - if( cnt ){ | |
| 218 | - @ <hr /> | |
| 219 | - } | |
| 220 | - @ <form method="post" action="%R/hash-color-test"> | |
| 221 | - @ <p>Enter candidate branch names below and see them displayed in their | |
| 222 | - @ default background colors above.</p> | |
| 223 | - for(i=0; i<10; i++){ | |
| 224 | - sqlite3_snprintf(sizeof(zNm),zNm,"b%d",i); | |
| 225 | - zBr = P(zNm); | |
| 226 | - @ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br /> | |
| 227 | - } | |
| 228 | - @ <input type="submit"> | |
| 229 | - @ </form> | |
| 230 | - style_finish_page(); | |
| 231 | -} | |
| 232 | - | |
| 233 | 125 | /* |
| 234 | 126 | ** Return a new timelineTable id. |
| 235 | 127 | */ |
| 236 | 128 | int timeline_tableid(void){ |
| 237 | 129 | static int id = 0; |
| @@ -473,11 +365,11 @@ | ||
| 473 | 365 | } |
| 474 | 366 | @ <td class="timelineTime">%z(zDateLink)%s(zTime)</a></td> |
| 475 | 367 | @ <td class="timelineGraph"> |
| 476 | 368 | if( tmFlags & (TIMELINE_UCOLOR|TIMELINE_DELTA) ){ |
| 477 | 369 | if( tmFlags & TIMELINE_UCOLOR ){ |
| 478 | - zBgClr = zUser ? hash_color(zUser) : 0; | |
| 370 | + zBgClr = zUser ? user_color(zUser) : 0; | |
| 479 | 371 | }else if( zType[0]=='c' ){ |
| 480 | 372 | static Stmt qdelta; |
| 481 | 373 | db_static_prepare(&qdelta, "SELECT baseid IS NULL FROM plink" |
| 482 | 374 | " WHERE cid=:rid"); |
| 483 | 375 | db_bind_int(&qdelta, ":rid", rid); |
| 484 | 376 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -120,118 +120,10 @@ | |
| 120 | #define TIMELINE_FORUMTXT 0x4000000 /* Render all forum messages */ |
| 121 | #define TIMELINE_REFS 0x8000000 /* Output intended for References tab */ |
| 122 | #define TIMELINE_DELTA 0x10000000 /* Background color shows delta manifests */ |
| 123 | #endif |
| 124 | |
| 125 | /* |
| 126 | ** Hash a string and use the hash to determine a background color. |
| 127 | ** |
| 128 | ** This value returned is in static space and is overwritten with |
| 129 | ** each subsequent call. |
| 130 | ** |
| 131 | ** SETTING: color-hash-seed width=16 default=0 |
| 132 | ** |
| 133 | ** This is a seed value used for the hash that determines automatically |
| 134 | ** selected colors for branches and users. |
| 135 | */ |
| 136 | char *hash_color(const char *z){ |
| 137 | int i; /* Loop counter */ |
| 138 | unsigned int h = 0; /* Hash on the branch name */ |
| 139 | int r, g, b; /* Values for red, green, and blue */ |
| 140 | int h1, h2, h3, h4; /* Elements of the hash value */ |
| 141 | int mx, mn; /* Components of HSV */ |
| 142 | static char zColor[10]; /* The resulting color */ |
| 143 | static int ix[3] = {0,0,0}; /* Color chooser parameters */ |
| 144 | |
| 145 | if( ix[0]==0 ){ |
| 146 | if( skin_detail_boolean("white-foreground") ){ |
| 147 | ix[0] = 0x50; |
| 148 | ix[1] = 0x20; |
| 149 | }else{ |
| 150 | ix[0] = 0xf8; |
| 151 | ix[1] = 0x20; |
| 152 | } |
| 153 | ix[2] = db_get_int("color-hash-seed",0); |
| 154 | } |
| 155 | h = ix[2]; |
| 156 | for(i=0; z[i]; i++ ){ |
| 157 | h = (h<<11) ^ (h<<1) ^ (h>>3) ^ z[i]; |
| 158 | } |
| 159 | h1 = h % 6; h /= 6; |
| 160 | h3 = h % 10; h /= 10; |
| 161 | h4 = h % 10; h /= 10; |
| 162 | mx = ix[0] - h3; |
| 163 | mn = mx - h4 - ix[1]; |
| 164 | h2 = (h%(mx - mn)) + mn; |
| 165 | switch( h1 ){ |
| 166 | case 0: r = mx; g = h2, b = mn; break; |
| 167 | case 1: r = h2; g = mx, b = mn; break; |
| 168 | case 2: r = mn; g = mx, b = h2; break; |
| 169 | case 3: r = mn; g = h2, b = mx; break; |
| 170 | case 4: r = h2; g = mn, b = mx; break; |
| 171 | default: r = mx; g = mn, b = h2; break; |
| 172 | } |
| 173 | sqlite3_snprintf(8, zColor, "#%02x%02x%02x", r,g,b); |
| 174 | return zColor; |
| 175 | } |
| 176 | |
| 177 | /* |
| 178 | ** COMMAND: test-hash-color |
| 179 | ** |
| 180 | ** Usage: %fossil test-hash-color TAG ... |
| 181 | ** |
| 182 | ** Print out the color names associated with each tag. Used for |
| 183 | ** testing the hash_color() function. |
| 184 | */ |
| 185 | void test_hash_color(void){ |
| 186 | int i; |
| 187 | for(i=2; i<g.argc; i++){ |
| 188 | fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i])); |
| 189 | } |
| 190 | } |
| 191 | |
| 192 | /* |
| 193 | ** WEBPAGE: hash-color-test |
| 194 | ** |
| 195 | ** Print out the color names associated with each tag. Used for |
| 196 | ** testing the hash_color() function. |
| 197 | */ |
| 198 | void test_hash_color_page(void){ |
| 199 | const char *zBr; |
| 200 | char zNm[10]; |
| 201 | int i, cnt; |
| 202 | login_check_credentials(); |
| 203 | |
| 204 | style_set_current_feature("test"); |
| 205 | style_header("Hash Color Test"); |
| 206 | for(i=cnt=0; i<10; i++){ |
| 207 | sqlite3_snprintf(sizeof(zNm),zNm,"b%d",i); |
| 208 | zBr = P(zNm); |
| 209 | if( zBr && zBr[0] ){ |
| 210 | @ <p style='border:1px solid;background-color:%s(hash_color(zBr));'> |
| 211 | @ %h(zBr) - %s(hash_color(zBr)) - |
| 212 | @ Omnes nos quasi oves erravimus unusquisque in viam |
| 213 | @ suam declinavit.</p> |
| 214 | cnt++; |
| 215 | } |
| 216 | } |
| 217 | if( cnt ){ |
| 218 | @ <hr /> |
| 219 | } |
| 220 | @ <form method="post" action="%R/hash-color-test"> |
| 221 | @ <p>Enter candidate branch names below and see them displayed in their |
| 222 | @ default background colors above.</p> |
| 223 | for(i=0; i<10; i++){ |
| 224 | sqlite3_snprintf(sizeof(zNm),zNm,"b%d",i); |
| 225 | zBr = P(zNm); |
| 226 | @ <input type="text" size="30" name='%s(zNm)' value='%h(PD(zNm,""))'><br /> |
| 227 | } |
| 228 | @ <input type="submit"> |
| 229 | @ </form> |
| 230 | style_finish_page(); |
| 231 | } |
| 232 | |
| 233 | /* |
| 234 | ** Return a new timelineTable id. |
| 235 | */ |
| 236 | int timeline_tableid(void){ |
| 237 | static int id = 0; |
| @@ -473,11 +365,11 @@ | |
| 473 | } |
| 474 | @ <td class="timelineTime">%z(zDateLink)%s(zTime)</a></td> |
| 475 | @ <td class="timelineGraph"> |
| 476 | if( tmFlags & (TIMELINE_UCOLOR|TIMELINE_DELTA) ){ |
| 477 | if( tmFlags & TIMELINE_UCOLOR ){ |
| 478 | zBgClr = zUser ? hash_color(zUser) : 0; |
| 479 | }else if( zType[0]=='c' ){ |
| 480 | static Stmt qdelta; |
| 481 | db_static_prepare(&qdelta, "SELECT baseid IS NULL FROM plink" |
| 482 | " WHERE cid=:rid"); |
| 483 | db_bind_int(&qdelta, ":rid", rid); |
| 484 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -120,118 +120,10 @@ | |
| 120 | #define TIMELINE_FORUMTXT 0x4000000 /* Render all forum messages */ |
| 121 | #define TIMELINE_REFS 0x8000000 /* Output intended for References tab */ |
| 122 | #define TIMELINE_DELTA 0x10000000 /* Background color shows delta manifests */ |
| 123 | #endif |
| 124 | |
| 125 | /* |
| 126 | ** Return a new timelineTable id. |
| 127 | */ |
| 128 | int timeline_tableid(void){ |
| 129 | static int id = 0; |
| @@ -473,11 +365,11 @@ | |
| 365 | } |
| 366 | @ <td class="timelineTime">%z(zDateLink)%s(zTime)</a></td> |
| 367 | @ <td class="timelineGraph"> |
| 368 | if( tmFlags & (TIMELINE_UCOLOR|TIMELINE_DELTA) ){ |
| 369 | if( tmFlags & TIMELINE_UCOLOR ){ |
| 370 | zBgClr = zUser ? user_color(zUser) : 0; |
| 371 | }else if( zType[0]=='c' ){ |
| 372 | static Stmt qdelta; |
| 373 | db_static_prepare(&qdelta, "SELECT baseid IS NULL FROM plink" |
| 374 | " WHERE cid=:rid"); |
| 375 | db_bind_int(&qdelta, ":rid", rid); |
| 376 |
+10
-4
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -28,13 +28,13 @@ | ||
| 28 | 28 | |
| 29 | 29 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 |
| 30 | 30 | |
| 31 | 31 | SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | 32 | |
| 33 | -SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 piechart_.c pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c | |
| 33 | +SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 piechart_.c pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c | |
| 34 | 34 | |
| 35 | -OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$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)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pikchrshow$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)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$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)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$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)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pikchrshow$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)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$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 ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi chat checkin checkout clearsign clone comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki 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 piechart pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@ | |
| 54 | + +echo add ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi chat checkin checkout clearsign clone color comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki 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 piechart pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp 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 >> $@ |
| @@ -259,10 +259,16 @@ | ||
| 259 | 259 | $(OBJDIR)\clone$O : clone_.c clone.h |
| 260 | 260 | $(TCC) -o$@ -c clone_.c |
| 261 | 261 | |
| 262 | 262 | clone_.c : $(SRCDIR)\clone.c |
| 263 | 263 | +translate$E $** > $@ |
| 264 | + | |
| 265 | +$(OBJDIR)\color$O : color_.c color.h | |
| 266 | + $(TCC) -o$@ -c color_.c | |
| 267 | + | |
| 268 | +color_.c : $(SRCDIR)\color.c | |
| 269 | + +translate$E $** > $@ | |
| 264 | 270 | |
| 265 | 271 | $(OBJDIR)\comformat$O : comformat_.c comformat.h |
| 266 | 272 | $(TCC) -o$@ -c comformat_.c |
| 267 | 273 | |
| 268 | 274 | comformat_.c : $(SRCDIR)\comformat.c |
| @@ -1005,7 +1011,7 @@ | ||
| 1005 | 1011 | |
| 1006 | 1012 | zip_.c : $(SRCDIR)\zip.c |
| 1007 | 1013 | +translate$E $** > $@ |
| 1008 | 1014 | |
| 1009 | 1015 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 1010 | - +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.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 capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.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 cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.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 interwiki_.c:interwiki.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 piechart_.c:piechart.h pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.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 repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.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 unversioned_.c:unversioned.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 webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.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 | |
| 1016 | + +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.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 capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.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 interwiki_.c:interwiki.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 piechart_.c:piechart.h pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.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 repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.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 unversioned_.c:unversioned.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 webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.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 | |
| 1011 | 1017 | @copy /Y nul: headers |
| 1012 | 1018 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -28,13 +28,13 @@ | |
| 28 | |
| 29 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 |
| 30 | |
| 31 | SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | |
| 33 | SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 piechart_.c pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c |
| 34 | |
| 35 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$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)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pikchrshow$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)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$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 ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi chat checkin checkout clearsign clone comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki 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 piechart pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@ |
| 55 | +echo fossil >> $@ |
| 56 | +echo fossil >> $@ |
| 57 | +echo $(LIBS) >> $@ |
| 58 | +echo. >> $@ |
| 59 | +echo fossil >> $@ |
| @@ -259,10 +259,16 @@ | |
| 259 | $(OBJDIR)\clone$O : clone_.c clone.h |
| 260 | $(TCC) -o$@ -c clone_.c |
| 261 | |
| 262 | clone_.c : $(SRCDIR)\clone.c |
| 263 | +translate$E $** > $@ |
| 264 | |
| 265 | $(OBJDIR)\comformat$O : comformat_.c comformat.h |
| 266 | $(TCC) -o$@ -c comformat_.c |
| 267 | |
| 268 | comformat_.c : $(SRCDIR)\comformat.c |
| @@ -1005,7 +1011,7 @@ | |
| 1005 | |
| 1006 | zip_.c : $(SRCDIR)\zip.c |
| 1007 | +translate$E $** > $@ |
| 1008 | |
| 1009 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 1010 | +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.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 capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.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 cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.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 interwiki_.c:interwiki.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 piechart_.c:piechart.h pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.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 repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.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 unversioned_.c:unversioned.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 webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.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 |
| 1011 | @copy /Y nul: headers |
| 1012 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -28,13 +28,13 @@ | |
| 28 | |
| 29 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 |
| 30 | |
| 31 | SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 32 | |
| 33 | SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.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 piechart_.c pikchr_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c webmail_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c |
| 34 | |
| 35 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$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)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$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)\piechart$O $(OBJDIR)\pikchr$O $(OBJDIR)\pikchrshow$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)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\webmail$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$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 ajax alerts allrepo attach backlink backoffice bag bisect blob branch browse builtin bundle cache capabilities captcha cgi chat checkin checkout clearsign clone color comformat configure content cookies db delta deltacmd deltafunc descendants diff diffcmd dispatch doc encode etag event export extcgi file fileedit finfo foci forum fshell fusefs fuzz glob graph gzip hname hook http http_socket http_ssl http_transport import info interwiki 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 piechart pikchr pikchrshow pivot popen pqueue printf publish purge rebuild regexp repolist report rss schema search security_audit setup setupuser sha1 sha1hard sha3 shun sitemap skins smtp sqlcmd stash stat statrep style sync tag tar terminal th_main timeline tkt tktsetup undo unicode unversioned update url user utf8 util verify vfile webmail wiki wikiformat winfile winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@ |
| 55 | +echo fossil >> $@ |
| 56 | +echo fossil >> $@ |
| 57 | +echo $(LIBS) >> $@ |
| 58 | +echo. >> $@ |
| 59 | +echo fossil >> $@ |
| @@ -259,10 +259,16 @@ | |
| 259 | $(OBJDIR)\clone$O : clone_.c clone.h |
| 260 | $(TCC) -o$@ -c clone_.c |
| 261 | |
| 262 | clone_.c : $(SRCDIR)\clone.c |
| 263 | +translate$E $** > $@ |
| 264 | |
| 265 | $(OBJDIR)\color$O : color_.c color.h |
| 266 | $(TCC) -o$@ -c color_.c |
| 267 | |
| 268 | color_.c : $(SRCDIR)\color.c |
| 269 | +translate$E $** > $@ |
| 270 | |
| 271 | $(OBJDIR)\comformat$O : comformat_.c comformat.h |
| 272 | $(TCC) -o$@ -c comformat_.c |
| 273 | |
| 274 | comformat_.c : $(SRCDIR)\comformat.c |
| @@ -1005,7 +1011,7 @@ | |
| 1011 | |
| 1012 | zip_.c : $(SRCDIR)\zip.c |
| 1013 | +translate$E $** > $@ |
| 1014 | |
| 1015 | headers: makeheaders$E page_index.h builtin_data.h VERSION.h |
| 1016 | +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.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 capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.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 interwiki_.c:interwiki.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 piechart_.c:piechart.h pikchr_.c:pikchr.h pikchrshow_.c:pikchrshow.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 repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.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 unversioned_.c:unversioned.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 webmail_.c:webmail.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.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 |
| 1017 | @copy /Y nul: headers |
| 1018 |
+12
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -449,10 +449,11 @@ | ||
| 449 | 449 | $(SRCDIR)/chat.c \ |
| 450 | 450 | $(SRCDIR)/checkin.c \ |
| 451 | 451 | $(SRCDIR)/checkout.c \ |
| 452 | 452 | $(SRCDIR)/clearsign.c \ |
| 453 | 453 | $(SRCDIR)/clone.c \ |
| 454 | + $(SRCDIR)/color.c \ | |
| 454 | 455 | $(SRCDIR)/comformat.c \ |
| 455 | 456 | $(SRCDIR)/configure.c \ |
| 456 | 457 | $(SRCDIR)/content.c \ |
| 457 | 458 | $(SRCDIR)/cookies.c \ |
| 458 | 459 | $(SRCDIR)/db.c \ |
| @@ -713,10 +714,11 @@ | ||
| 713 | 714 | $(OBJDIR)/chat_.c \ |
| 714 | 715 | $(OBJDIR)/checkin_.c \ |
| 715 | 716 | $(OBJDIR)/checkout_.c \ |
| 716 | 717 | $(OBJDIR)/clearsign_.c \ |
| 717 | 718 | $(OBJDIR)/clone_.c \ |
| 719 | + $(OBJDIR)/color_.c \ | |
| 718 | 720 | $(OBJDIR)/comformat_.c \ |
| 719 | 721 | $(OBJDIR)/configure_.c \ |
| 720 | 722 | $(OBJDIR)/content_.c \ |
| 721 | 723 | $(OBJDIR)/cookies_.c \ |
| 722 | 724 | $(OBJDIR)/db_.c \ |
| @@ -862,10 +864,11 @@ | ||
| 862 | 864 | $(OBJDIR)/chat.o \ |
| 863 | 865 | $(OBJDIR)/checkin.o \ |
| 864 | 866 | $(OBJDIR)/checkout.o \ |
| 865 | 867 | $(OBJDIR)/clearsign.o \ |
| 866 | 868 | $(OBJDIR)/clone.o \ |
| 869 | + $(OBJDIR)/color.o \ | |
| 867 | 870 | $(OBJDIR)/comformat.o \ |
| 868 | 871 | $(OBJDIR)/configure.o \ |
| 869 | 872 | $(OBJDIR)/content.o \ |
| 870 | 873 | $(OBJDIR)/cookies.o \ |
| 871 | 874 | $(OBJDIR)/db.o \ |
| @@ -1226,10 +1229,11 @@ | ||
| 1226 | 1229 | $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \ |
| 1227 | 1230 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 1228 | 1231 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 1229 | 1232 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1230 | 1233 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1234 | + $(OBJDIR)/color_.c:$(OBJDIR)/color.h \ | |
| 1231 | 1235 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1232 | 1236 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1233 | 1237 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1234 | 1238 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 1235 | 1239 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1542,10 +1546,18 @@ | ||
| 1542 | 1546 | |
| 1543 | 1547 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1544 | 1548 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1545 | 1549 | |
| 1546 | 1550 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1551 | + | |
| 1552 | +$(OBJDIR)/color_.c: $(SRCDIR)/color.c $(TRANSLATE) | |
| 1553 | + $(TRANSLATE) $(SRCDIR)/color.c >$@ | |
| 1554 | + | |
| 1555 | +$(OBJDIR)/color.o: $(OBJDIR)/color_.c $(OBJDIR)/color.h $(SRCDIR)/config.h | |
| 1556 | + $(XTCC) -o $(OBJDIR)/color.o -c $(OBJDIR)/color_.c | |
| 1557 | + | |
| 1558 | +$(OBJDIR)/color.h: $(OBJDIR)/headers | |
| 1547 | 1559 | |
| 1548 | 1560 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(TRANSLATE) |
| 1549 | 1561 | $(TRANSLATE) $(SRCDIR)/comformat.c >$@ |
| 1550 | 1562 | |
| 1551 | 1563 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| 1552 | 1564 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -449,10 +449,11 @@ | |
| 449 | $(SRCDIR)/chat.c \ |
| 450 | $(SRCDIR)/checkin.c \ |
| 451 | $(SRCDIR)/checkout.c \ |
| 452 | $(SRCDIR)/clearsign.c \ |
| 453 | $(SRCDIR)/clone.c \ |
| 454 | $(SRCDIR)/comformat.c \ |
| 455 | $(SRCDIR)/configure.c \ |
| 456 | $(SRCDIR)/content.c \ |
| 457 | $(SRCDIR)/cookies.c \ |
| 458 | $(SRCDIR)/db.c \ |
| @@ -713,10 +714,11 @@ | |
| 713 | $(OBJDIR)/chat_.c \ |
| 714 | $(OBJDIR)/checkin_.c \ |
| 715 | $(OBJDIR)/checkout_.c \ |
| 716 | $(OBJDIR)/clearsign_.c \ |
| 717 | $(OBJDIR)/clone_.c \ |
| 718 | $(OBJDIR)/comformat_.c \ |
| 719 | $(OBJDIR)/configure_.c \ |
| 720 | $(OBJDIR)/content_.c \ |
| 721 | $(OBJDIR)/cookies_.c \ |
| 722 | $(OBJDIR)/db_.c \ |
| @@ -862,10 +864,11 @@ | |
| 862 | $(OBJDIR)/chat.o \ |
| 863 | $(OBJDIR)/checkin.o \ |
| 864 | $(OBJDIR)/checkout.o \ |
| 865 | $(OBJDIR)/clearsign.o \ |
| 866 | $(OBJDIR)/clone.o \ |
| 867 | $(OBJDIR)/comformat.o \ |
| 868 | $(OBJDIR)/configure.o \ |
| 869 | $(OBJDIR)/content.o \ |
| 870 | $(OBJDIR)/cookies.o \ |
| 871 | $(OBJDIR)/db.o \ |
| @@ -1226,10 +1229,11 @@ | |
| 1226 | $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \ |
| 1227 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 1228 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 1229 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1230 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1231 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1232 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1233 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1234 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 1235 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1542,10 +1546,18 @@ | |
| 1542 | |
| 1543 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1544 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1545 | |
| 1546 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1547 | |
| 1548 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(TRANSLATE) |
| 1549 | $(TRANSLATE) $(SRCDIR)/comformat.c >$@ |
| 1550 | |
| 1551 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| 1552 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -449,10 +449,11 @@ | |
| 449 | $(SRCDIR)/chat.c \ |
| 450 | $(SRCDIR)/checkin.c \ |
| 451 | $(SRCDIR)/checkout.c \ |
| 452 | $(SRCDIR)/clearsign.c \ |
| 453 | $(SRCDIR)/clone.c \ |
| 454 | $(SRCDIR)/color.c \ |
| 455 | $(SRCDIR)/comformat.c \ |
| 456 | $(SRCDIR)/configure.c \ |
| 457 | $(SRCDIR)/content.c \ |
| 458 | $(SRCDIR)/cookies.c \ |
| 459 | $(SRCDIR)/db.c \ |
| @@ -713,10 +714,11 @@ | |
| 714 | $(OBJDIR)/chat_.c \ |
| 715 | $(OBJDIR)/checkin_.c \ |
| 716 | $(OBJDIR)/checkout_.c \ |
| 717 | $(OBJDIR)/clearsign_.c \ |
| 718 | $(OBJDIR)/clone_.c \ |
| 719 | $(OBJDIR)/color_.c \ |
| 720 | $(OBJDIR)/comformat_.c \ |
| 721 | $(OBJDIR)/configure_.c \ |
| 722 | $(OBJDIR)/content_.c \ |
| 723 | $(OBJDIR)/cookies_.c \ |
| 724 | $(OBJDIR)/db_.c \ |
| @@ -862,10 +864,11 @@ | |
| 864 | $(OBJDIR)/chat.o \ |
| 865 | $(OBJDIR)/checkin.o \ |
| 866 | $(OBJDIR)/checkout.o \ |
| 867 | $(OBJDIR)/clearsign.o \ |
| 868 | $(OBJDIR)/clone.o \ |
| 869 | $(OBJDIR)/color.o \ |
| 870 | $(OBJDIR)/comformat.o \ |
| 871 | $(OBJDIR)/configure.o \ |
| 872 | $(OBJDIR)/content.o \ |
| 873 | $(OBJDIR)/cookies.o \ |
| 874 | $(OBJDIR)/db.o \ |
| @@ -1226,10 +1229,11 @@ | |
| 1229 | $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \ |
| 1230 | $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \ |
| 1231 | $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \ |
| 1232 | $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \ |
| 1233 | $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \ |
| 1234 | $(OBJDIR)/color_.c:$(OBJDIR)/color.h \ |
| 1235 | $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \ |
| 1236 | $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \ |
| 1237 | $(OBJDIR)/content_.c:$(OBJDIR)/content.h \ |
| 1238 | $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \ |
| 1239 | $(OBJDIR)/db_.c:$(OBJDIR)/db.h \ |
| @@ -1542,10 +1546,18 @@ | |
| 1546 | |
| 1547 | $(OBJDIR)/clone.o: $(OBJDIR)/clone_.c $(OBJDIR)/clone.h $(SRCDIR)/config.h |
| 1548 | $(XTCC) -o $(OBJDIR)/clone.o -c $(OBJDIR)/clone_.c |
| 1549 | |
| 1550 | $(OBJDIR)/clone.h: $(OBJDIR)/headers |
| 1551 | |
| 1552 | $(OBJDIR)/color_.c: $(SRCDIR)/color.c $(TRANSLATE) |
| 1553 | $(TRANSLATE) $(SRCDIR)/color.c >$@ |
| 1554 | |
| 1555 | $(OBJDIR)/color.o: $(OBJDIR)/color_.c $(OBJDIR)/color.h $(SRCDIR)/config.h |
| 1556 | $(XTCC) -o $(OBJDIR)/color.o -c $(OBJDIR)/color_.c |
| 1557 | |
| 1558 | $(OBJDIR)/color.h: $(OBJDIR)/headers |
| 1559 | |
| 1560 | $(OBJDIR)/comformat_.c: $(SRCDIR)/comformat.c $(TRANSLATE) |
| 1561 | $(TRANSLATE) $(SRCDIR)/comformat.c >$@ |
| 1562 | |
| 1563 | $(OBJDIR)/comformat.o: $(OBJDIR)/comformat_.c $(OBJDIR)/comformat.h $(SRCDIR)/config.h |
| 1564 |
+10
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -371,10 +371,11 @@ | ||
| 371 | 371 | "$(OX)\chat_.c" \ |
| 372 | 372 | "$(OX)\checkin_.c" \ |
| 373 | 373 | "$(OX)\checkout_.c" \ |
| 374 | 374 | "$(OX)\clearsign_.c" \ |
| 375 | 375 | "$(OX)\clone_.c" \ |
| 376 | + "$(OX)\color_.c" \ | |
| 376 | 377 | "$(OX)\comformat_.c" \ |
| 377 | 378 | "$(OX)\configure_.c" \ |
| 378 | 379 | "$(OX)\content_.c" \ |
| 379 | 380 | "$(OX)\cookies_.c" \ |
| 380 | 381 | "$(OX)\db_.c" \ |
| @@ -633,10 +634,11 @@ | ||
| 633 | 634 | "$(OX)\chat$O" \ |
| 634 | 635 | "$(OX)\checkin$O" \ |
| 635 | 636 | "$(OX)\checkout$O" \ |
| 636 | 637 | "$(OX)\clearsign$O" \ |
| 637 | 638 | "$(OX)\clone$O" \ |
| 639 | + "$(OX)\color$O" \ | |
| 638 | 640 | "$(OX)\comformat$O" \ |
| 639 | 641 | "$(OX)\configure$O" \ |
| 640 | 642 | "$(OX)\content$O" \ |
| 641 | 643 | "$(OX)\cookies$O" \ |
| 642 | 644 | "$(OX)\cson_amalgamation$O" \ |
| @@ -863,10 +865,11 @@ | ||
| 863 | 865 | echo "$(OX)\chat.obj" >> $@ |
| 864 | 866 | echo "$(OX)\checkin.obj" >> $@ |
| 865 | 867 | echo "$(OX)\checkout.obj" >> $@ |
| 866 | 868 | echo "$(OX)\clearsign.obj" >> $@ |
| 867 | 869 | echo "$(OX)\clone.obj" >> $@ |
| 870 | + echo "$(OX)\color.obj" >> $@ | |
| 868 | 871 | echo "$(OX)\comformat.obj" >> $@ |
| 869 | 872 | echo "$(OX)\configure.obj" >> $@ |
| 870 | 873 | echo "$(OX)\content.obj" >> $@ |
| 871 | 874 | echo "$(OX)\cookies.obj" >> $@ |
| 872 | 875 | echo "$(OX)\cson_amalgamation.obj" >> $@ |
| @@ -1360,10 +1363,16 @@ | ||
| 1360 | 1363 | "$(OX)\clone$O" : "$(OX)\clone_.c" "$(OX)\clone.h" |
| 1361 | 1364 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone_.c" |
| 1362 | 1365 | |
| 1363 | 1366 | "$(OX)\clone_.c" : "$(SRCDIR)\clone.c" |
| 1364 | 1367 | "$(OBJDIR)\translate$E" $** > $@ |
| 1368 | + | |
| 1369 | +"$(OX)\color$O" : "$(OX)\color_.c" "$(OX)\color.h" | |
| 1370 | + $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color_.c" | |
| 1371 | + | |
| 1372 | +"$(OX)\color_.c" : "$(SRCDIR)\color.c" | |
| 1373 | + "$(OBJDIR)\translate$E" $** > $@ | |
| 1365 | 1374 | |
| 1366 | 1375 | "$(OX)\comformat$O" : "$(OX)\comformat_.c" "$(OX)\comformat.h" |
| 1367 | 1376 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat_.c" |
| 1368 | 1377 | |
| 1369 | 1378 | "$(OX)\comformat_.c" : "$(SRCDIR)\comformat.c" |
| @@ -2132,10 +2141,11 @@ | ||
| 2132 | 2141 | "$(OX)\chat_.c":"$(OX)\chat.h" \ |
| 2133 | 2142 | "$(OX)\checkin_.c":"$(OX)\checkin.h" \ |
| 2134 | 2143 | "$(OX)\checkout_.c":"$(OX)\checkout.h" \ |
| 2135 | 2144 | "$(OX)\clearsign_.c":"$(OX)\clearsign.h" \ |
| 2136 | 2145 | "$(OX)\clone_.c":"$(OX)\clone.h" \ |
| 2146 | + "$(OX)\color_.c":"$(OX)\color.h" \ | |
| 2137 | 2147 | "$(OX)\comformat_.c":"$(OX)\comformat.h" \ |
| 2138 | 2148 | "$(OX)\configure_.c":"$(OX)\configure.h" \ |
| 2139 | 2149 | "$(OX)\content_.c":"$(OX)\content.h" \ |
| 2140 | 2150 | "$(OX)\cookies_.c":"$(OX)\cookies.h" \ |
| 2141 | 2151 | "$(OX)\db_.c":"$(OX)\db.h" \ |
| 2142 | 2152 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -371,10 +371,11 @@ | |
| 371 | "$(OX)\chat_.c" \ |
| 372 | "$(OX)\checkin_.c" \ |
| 373 | "$(OX)\checkout_.c" \ |
| 374 | "$(OX)\clearsign_.c" \ |
| 375 | "$(OX)\clone_.c" \ |
| 376 | "$(OX)\comformat_.c" \ |
| 377 | "$(OX)\configure_.c" \ |
| 378 | "$(OX)\content_.c" \ |
| 379 | "$(OX)\cookies_.c" \ |
| 380 | "$(OX)\db_.c" \ |
| @@ -633,10 +634,11 @@ | |
| 633 | "$(OX)\chat$O" \ |
| 634 | "$(OX)\checkin$O" \ |
| 635 | "$(OX)\checkout$O" \ |
| 636 | "$(OX)\clearsign$O" \ |
| 637 | "$(OX)\clone$O" \ |
| 638 | "$(OX)\comformat$O" \ |
| 639 | "$(OX)\configure$O" \ |
| 640 | "$(OX)\content$O" \ |
| 641 | "$(OX)\cookies$O" \ |
| 642 | "$(OX)\cson_amalgamation$O" \ |
| @@ -863,10 +865,11 @@ | |
| 863 | echo "$(OX)\chat.obj" >> $@ |
| 864 | echo "$(OX)\checkin.obj" >> $@ |
| 865 | echo "$(OX)\checkout.obj" >> $@ |
| 866 | echo "$(OX)\clearsign.obj" >> $@ |
| 867 | echo "$(OX)\clone.obj" >> $@ |
| 868 | echo "$(OX)\comformat.obj" >> $@ |
| 869 | echo "$(OX)\configure.obj" >> $@ |
| 870 | echo "$(OX)\content.obj" >> $@ |
| 871 | echo "$(OX)\cookies.obj" >> $@ |
| 872 | echo "$(OX)\cson_amalgamation.obj" >> $@ |
| @@ -1360,10 +1363,16 @@ | |
| 1360 | "$(OX)\clone$O" : "$(OX)\clone_.c" "$(OX)\clone.h" |
| 1361 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone_.c" |
| 1362 | |
| 1363 | "$(OX)\clone_.c" : "$(SRCDIR)\clone.c" |
| 1364 | "$(OBJDIR)\translate$E" $** > $@ |
| 1365 | |
| 1366 | "$(OX)\comformat$O" : "$(OX)\comformat_.c" "$(OX)\comformat.h" |
| 1367 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat_.c" |
| 1368 | |
| 1369 | "$(OX)\comformat_.c" : "$(SRCDIR)\comformat.c" |
| @@ -2132,10 +2141,11 @@ | |
| 2132 | "$(OX)\chat_.c":"$(OX)\chat.h" \ |
| 2133 | "$(OX)\checkin_.c":"$(OX)\checkin.h" \ |
| 2134 | "$(OX)\checkout_.c":"$(OX)\checkout.h" \ |
| 2135 | "$(OX)\clearsign_.c":"$(OX)\clearsign.h" \ |
| 2136 | "$(OX)\clone_.c":"$(OX)\clone.h" \ |
| 2137 | "$(OX)\comformat_.c":"$(OX)\comformat.h" \ |
| 2138 | "$(OX)\configure_.c":"$(OX)\configure.h" \ |
| 2139 | "$(OX)\content_.c":"$(OX)\content.h" \ |
| 2140 | "$(OX)\cookies_.c":"$(OX)\cookies.h" \ |
| 2141 | "$(OX)\db_.c":"$(OX)\db.h" \ |
| 2142 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -371,10 +371,11 @@ | |
| 371 | "$(OX)\chat_.c" \ |
| 372 | "$(OX)\checkin_.c" \ |
| 373 | "$(OX)\checkout_.c" \ |
| 374 | "$(OX)\clearsign_.c" \ |
| 375 | "$(OX)\clone_.c" \ |
| 376 | "$(OX)\color_.c" \ |
| 377 | "$(OX)\comformat_.c" \ |
| 378 | "$(OX)\configure_.c" \ |
| 379 | "$(OX)\content_.c" \ |
| 380 | "$(OX)\cookies_.c" \ |
| 381 | "$(OX)\db_.c" \ |
| @@ -633,10 +634,11 @@ | |
| 634 | "$(OX)\chat$O" \ |
| 635 | "$(OX)\checkin$O" \ |
| 636 | "$(OX)\checkout$O" \ |
| 637 | "$(OX)\clearsign$O" \ |
| 638 | "$(OX)\clone$O" \ |
| 639 | "$(OX)\color$O" \ |
| 640 | "$(OX)\comformat$O" \ |
| 641 | "$(OX)\configure$O" \ |
| 642 | "$(OX)\content$O" \ |
| 643 | "$(OX)\cookies$O" \ |
| 644 | "$(OX)\cson_amalgamation$O" \ |
| @@ -863,10 +865,11 @@ | |
| 865 | echo "$(OX)\chat.obj" >> $@ |
| 866 | echo "$(OX)\checkin.obj" >> $@ |
| 867 | echo "$(OX)\checkout.obj" >> $@ |
| 868 | echo "$(OX)\clearsign.obj" >> $@ |
| 869 | echo "$(OX)\clone.obj" >> $@ |
| 870 | echo "$(OX)\color.obj" >> $@ |
| 871 | echo "$(OX)\comformat.obj" >> $@ |
| 872 | echo "$(OX)\configure.obj" >> $@ |
| 873 | echo "$(OX)\content.obj" >> $@ |
| 874 | echo "$(OX)\cookies.obj" >> $@ |
| 875 | echo "$(OX)\cson_amalgamation.obj" >> $@ |
| @@ -1360,10 +1363,16 @@ | |
| 1363 | "$(OX)\clone$O" : "$(OX)\clone_.c" "$(OX)\clone.h" |
| 1364 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone_.c" |
| 1365 | |
| 1366 | "$(OX)\clone_.c" : "$(SRCDIR)\clone.c" |
| 1367 | "$(OBJDIR)\translate$E" $** > $@ |
| 1368 | |
| 1369 | "$(OX)\color$O" : "$(OX)\color_.c" "$(OX)\color.h" |
| 1370 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color_.c" |
| 1371 | |
| 1372 | "$(OX)\color_.c" : "$(SRCDIR)\color.c" |
| 1373 | "$(OBJDIR)\translate$E" $** > $@ |
| 1374 | |
| 1375 | "$(OX)\comformat$O" : "$(OX)\comformat_.c" "$(OX)\comformat.h" |
| 1376 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat_.c" |
| 1377 | |
| 1378 | "$(OX)\comformat_.c" : "$(SRCDIR)\comformat.c" |
| @@ -2132,10 +2141,11 @@ | |
| 2141 | "$(OX)\chat_.c":"$(OX)\chat.h" \ |
| 2142 | "$(OX)\checkin_.c":"$(OX)\checkin.h" \ |
| 2143 | "$(OX)\checkout_.c":"$(OX)\checkout.h" \ |
| 2144 | "$(OX)\clearsign_.c":"$(OX)\clearsign.h" \ |
| 2145 | "$(OX)\clone_.c":"$(OX)\clone.h" \ |
| 2146 | "$(OX)\color_.c":"$(OX)\color.h" \ |
| 2147 | "$(OX)\comformat_.c":"$(OX)\comformat.h" \ |
| 2148 | "$(OX)\configure_.c":"$(OX)\configure.h" \ |
| 2149 | "$(OX)\content_.c":"$(OX)\content.h" \ |
| 2150 | "$(OX)\cookies_.c":"$(OX)\cookies.h" \ |
| 2151 | "$(OX)\db_.c":"$(OX)\db.h" \ |
| 2152 |