Fossil SCM

Added /json/report/list and /json/query.

stephan 2011-10-08 08:46 json-multitag-test
Commit 20978b27a2a6c702c5675934bcc6b46f69d2366a
Parent 42f569238e53dd2…
9 files changed +4 +60 -16 +30 +1 +22 -2 +8 -2 +18 -4 +22 -2 +19 -3
~ ajax/index.html ~ src/json.c + src/json_query.c + src/json_report.c ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc
M ajax/index.html
+4
--- ajax/index.html
+++ ajax/index.html
@@ -246,10 +246,14 @@
246246
 onclick='TheApp.cgi.sendCommand("/json/tag/find",{name:"json",type:"*",raw:false,limit:5})' />
247247
 <input type='button' value='diff'
248248
 onclick='TheApp.cgi.sendCommand("/json/diff",{v1:"b0e9b45baed6f885",v2:"5f225e261d836287",context:2})' />
249249
 <input type='button' value='diff/A/B'
250250
 onclick='TheApp.cgi.sendCommand("/json/diff/b0e9b45baed6f885/5f225e261d836287?context=2")' />
251
+<input type='button' value='report/list'
252
+onclick='TheApp.cgi.sendCommand("/json/report/list")' />
253
+<input type='button' value='query'
254
+onclick='TheApp.cgi.sendCommand("/json/query?format=o","SELECT * from user")' />
251255
252256
 <!-- not yet ready...
253257
 <input type='button' value='artifact/XYZ' onclick='TheApp.cgi.sendCommand("/json/artifact?uuid=json")' />
254258
 -->
255259
256260
--- ajax/index.html
+++ ajax/index.html
@@ -246,10 +246,14 @@
246 onclick='TheApp.cgi.sendCommand("/json/tag/find",{name:"json",type:"*",raw:false,limit:5})' />
247 <input type='button' value='diff'
248 onclick='TheApp.cgi.sendCommand("/json/diff",{v1:"b0e9b45baed6f885",v2:"5f225e261d836287",context:2})' />
249 <input type='button' value='diff/A/B'
250 onclick='TheApp.cgi.sendCommand("/json/diff/b0e9b45baed6f885/5f225e261d836287?context=2")' />
 
 
 
 
251
252 <!-- not yet ready...
253 <input type='button' value='artifact/XYZ' onclick='TheApp.cgi.sendCommand("/json/artifact?uuid=json")' />
254 -->
255
256
--- ajax/index.html
+++ ajax/index.html
@@ -246,10 +246,14 @@
246 onclick='TheApp.cgi.sendCommand("/json/tag/find",{name:"json",type:"*",raw:false,limit:5})' />
247 <input type='button' value='diff'
248 onclick='TheApp.cgi.sendCommand("/json/diff",{v1:"b0e9b45baed6f885",v2:"5f225e261d836287",context:2})' />
249 <input type='button' value='diff/A/B'
250 onclick='TheApp.cgi.sendCommand("/json/diff/b0e9b45baed6f885/5f225e261d836287?context=2")' />
251 <input type='button' value='report/list'
252 onclick='TheApp.cgi.sendCommand("/json/report/list")' />
253 <input type='button' value='query'
254 onclick='TheApp.cgi.sendCommand("/json/query?format=o","SELECT * from user")' />
255
256 <!-- not yet ready...
257 <input type='button' value='artifact/XYZ' onclick='TheApp.cgi.sendCommand("/json/artifact?uuid=json")' />
258 -->
259
260
M src/json.c
+60 -16
--- src/json.c
+++ src/json.c
@@ -538,30 +538,43 @@
538538
 ** GET/POST/CLI argument.
539539
 **
540540
 ** zKey must be the GET/POST parameter key. zCLILong must be the "long
541541
 ** form" CLI flag (NULL means to use zKey). zCLIShort may be NUL or
542542
 ** the "short form" CLI flag.
543
+**
544
+** If argPos is >=0 and no other match is found,
545
+** json_command_arg(argPos) is also checked.
543546
 **
544547
 ** On error (no match found) NULL is returned.
545548
 **
546549
 ** This ONLY works for String JSON/GET/CLI values, not JSON
547550
 ** booleans and whatnot.
548551
 */
549
-char const * json_find_option_cstr(char const * zKey,
550
- char const * zCLILong,
551
- char const * zCLIShort){
552
+char const * json_find_option_cstr2(char const * zKey,
553
+ char const * zCLILong,
554
+ char const * zCLIShort,
555
+ int argPos){
552556
 char const * rc = NULL;
553557
 assert(NULL != zKey);
554558
 if(!g.isHTTP){
555559
 rc = find_option(zCLILong ? zCLILong : zKey,
556560
 zCLIShort, 1);
557561
 }
558562
 if(!rc && fossil_is_json()){
559563
 rc = json_getenv_cstr(zKey);
560564
 }
565
+ if(!rc && (argPos>=0)){
566
+ rc = json_command_arg((unsigned char)argPos);
567
+ }
561568
 return rc;
562569
 }
570
+
571
+char const * json_find_option_cstr(char const * zKey,
572
+ char const * zCLILong,
573
+ char const * zCLIShort){
574
+ return json_find_option_cstr2(zKey, zCLIShort, zCLIShort, -1);
575
+}
563576
564577
 /*
565578
 ** The boolean equivalent of json_find_option_cstr().
566579
 ** If the option is not found, dftl is returned.
567580
 */
@@ -825,11 +838,10 @@
825838
 ** FIXME: if msg is NULL then use a standard string for
826839
 ** the given code. If !*msg then elide the "text" property,
827840
 ** for consistency with how json_err() works.
828841
 */
829842
 void json_warn( int code, char const * fmt, ... ){
830
- cson_value * objV = NULL;
831843
 cson_object * obj = NULL;
832844
 assert( (code>FSL_JSON_W_START)
833845
 && (code<FSL_JSON_W_END)
834846
 && "Invalid warning code.");
835847
 if(!g.json.warnings.v){
@@ -836,14 +848,12 @@
836848
 g.json.warnings.v = cson_value_new_array();
837849
 assert((NULL != g.json.warnings.v) && "Alloc error.");
838850
 g.json.warnings.a = cson_value_get_array(g.json.warnings.v);
839851
 json_gc_add("$WARNINGS",g.json.warnings.v,0);
840852
 }
841
- objV = cson_value_new_object();
842
- assert((NULL != objV) && "Alloc error.");
843
- cson_array_append(g.json.warnings.a, objV);
844
- obj = cson_value_get_object(objV);
853
+ obj = cson_new_object();
854
+ cson_array_append(g.json.warnings.a, cson_object_value(obj));
845855
 cson_object_set(obj,"code",cson_value_new_integer(code));
846856
 if(fmt && *fmt){
847857
 /* FIXME: treat NULL fmt as standard warning message for
848858
 the code, but we don't have those yet.
849859
 */
@@ -1542,23 +1552,29 @@
15421552
 cson_value * json_stmt_to_array_of_obj(Stmt *pStmt,
15431553
 cson_value * pTgt){
15441554
 cson_value * v = pTgt;
15451555
 cson_array * a = NULL;
15461556
 char const * warnMsg = NULL;
1557
+ cson_value * colNamesV = NULL;
1558
+ cson_array * colNames = NULL;
15471559
 if(v && !cson_value_is_array(v)){
15481560
 return NULL;
15491561
 }
15501562
 while( (SQLITE_ROW==db_step(pStmt)) ){
15511563
 cson_value * row = NULL;
15521564
 if(!a){
15531565
 if(!v){
15541566
 v = cson_value_new_array();
1567
+ colNamesV = cson_sqlite3_column_names(pStmt->pStmt);
1568
+ assert(NULL != colNamesV);
1569
+ colNames = cson_value_get_array(colNamesV);
1570
+ assert(NULL != colNames);
15551571
 }
15561572
 a = cson_value_get_array(v);
15571573
 assert(NULL!=a);
15581574
 }
1559
- row = cson_sqlite3_row_to_object(pStmt->pStmt);
1575
+ row = cson_sqlite3_row_to_object2(pStmt->pStmt, colNames);
15601576
 if(!row && !warnMsg){
15611577
 warnMsg = "Could not convert at least one result row to JSON.";
15621578
 continue;
15631579
 }
15641580
 if( 0 != cson_array_append(a, row) ){
@@ -1568,16 +1584,38 @@
15681584
 cson_value_free(v);
15691585
 }
15701586
 return NULL;
15711587
 }
15721588
 }
1589
+ if( colNamesV ){
1590
+ cson_value_free(colNamesV);
1591
+ }
15731592
 if(warnMsg){
15741593
 json_warn( FSL_JSON_W_ROW_TO_JSON_FAILED, warnMsg );
15751594
 }
15761595
 return v;
15771596
 }
15781597
1598
+/*
1599
+** Executes the given SQL and runs it through
1600
+** json_stmt_to_array_of_obj(), returning the result of that
1601
+** function. If resetBlob is true then blob_reset(pSql) is called
1602
+** after preparing the query.
1603
+*/
1604
+cson_value * json_sql_to_array_of_obj(Blob * pSql, char resetBlob){
1605
+ Stmt q = empty_Stmt;
1606
+ cson_value * pay = NULL;
1607
+ assert( blob_size(pSql) > 0 );
1608
+ db_prepare(&q, "%s", blob_str(pSql));
1609
+ if(resetBlob){
1610
+ blob_reset(pSql);
1611
+ }
1612
+ pay = json_stmt_to_array_of_obj(&q, NULL);
1613
+ db_finalize(&q);
1614
+ return pay;
1615
+
1616
+}
15791617
15801618
 /*
15811619
 ** If the given rid has any tags associated with it, this function
15821620
 ** returns a JSON Array containing the tag names, else it returns
15831621
 ** NULL.
@@ -2002,39 +2040,45 @@
20022040
 return payV;
20032041
 }
20042042
20052043
 /* Impl in json_login.c. */
20062044
 cson_value * json_page_anon_password();
2007
-/* Impl in json_login.c. */
2008
-cson_value * json_page_login();
2009
-/* Impl in json_login.c. */
2010
-cson_value * json_page_logout();
20112045
 /* Impl in json_artifact.c. */
20122046
 cson_value * json_page_artifact();
20132047
 /* Impl in json_branch.c. */
20142048
 cson_value * json_page_branch();
2015
-/* Impl in json_tag.c. */
2016
-cson_value * json_page_tag();
20172049
 /* Impl in json_diff.c. */
20182050
 cson_value * json_page_diff();
2051
+/* Impl in json_login.c. */
2052
+cson_value * json_page_login();
2053
+/* Impl in json_login.c. */
2054
+cson_value * json_page_logout();
2055
+/* Impl in json_query.c. */
2056
+cson_value * json_page_query();
2057
+/* Impl in json_report.c. */
2058
+cson_value * json_page_report();
2059
+/* Impl in json_tag.c. */
2060
+cson_value * json_page_tag();
20192061
20202062
 /*
20212063
 ** Mapping of names to JSON pages/commands. Each name is a subpath of
20222064
 ** /json (in CGI mode) or a subcommand of the json command in CLI mode
20232065
 */
20242066
 static const JsonPageDef JsonPageDefs[] = {
20252067
 /* please keep alphabetically sorted (case-insensitive) for maintenance reasons. */
2026
-{"anonymousPassword",json_page_anon_password, 1},
2068
+{"anonymousPassword", json_page_anon_password, 1},
20272069
 {"artifact", json_page_artifact, 0},
20282070
 {"branch", json_page_branch,0},
20292071
 {"cap", json_page_cap, 0},
20302072
 {"diff", json_page_diff, 0},
20312073
 {"dir", json_page_nyi, 0},
20322074
 {"HAI",json_page_version,0},
20332075
 {"login",json_page_login,1},
20342076
 {"logout",json_page_logout,1},
2077
+{"query",json_page_query,0},
20352078
 {"rebuild",json_page_rebuild,0},
2079
+{"report", json_page_report, 0},
20362080
 {"resultCodes", json_page_resultCodes,0},
20372081
 {"stat",json_page_stat,0},
20382082
 {"tag", json_page_tag,0},
20392083
 {"ticket", json_page_nyi,0},
20402084
 {"timeline", json_page_timeline,0},
20412085
20422086
ADDED src/json_query.c
20432087
ADDED src/json_report.c
--- src/json.c
+++ src/json.c
@@ -538,30 +538,43 @@
538 ** GET/POST/CLI argument.
539 **
540 ** zKey must be the GET/POST parameter key. zCLILong must be the "long
541 ** form" CLI flag (NULL means to use zKey). zCLIShort may be NUL or
542 ** the "short form" CLI flag.
 
 
 
543 **
544 ** On error (no match found) NULL is returned.
545 **
546 ** This ONLY works for String JSON/GET/CLI values, not JSON
547 ** booleans and whatnot.
548 */
549 char const * json_find_option_cstr(char const * zKey,
550 char const * zCLILong,
551 char const * zCLIShort){
 
552 char const * rc = NULL;
553 assert(NULL != zKey);
554 if(!g.isHTTP){
555 rc = find_option(zCLILong ? zCLILong : zKey,
556 zCLIShort, 1);
557 }
558 if(!rc && fossil_is_json()){
559 rc = json_getenv_cstr(zKey);
560 }
 
 
 
561 return rc;
562 }
 
 
 
 
 
 
563
564 /*
565 ** The boolean equivalent of json_find_option_cstr().
566 ** If the option is not found, dftl is returned.
567 */
@@ -825,11 +838,10 @@
825 ** FIXME: if msg is NULL then use a standard string for
826 ** the given code. If !*msg then elide the "text" property,
827 ** for consistency with how json_err() works.
828 */
829 void json_warn( int code, char const * fmt, ... ){
830 cson_value * objV = NULL;
831 cson_object * obj = NULL;
832 assert( (code>FSL_JSON_W_START)
833 && (code<FSL_JSON_W_END)
834 && "Invalid warning code.");
835 if(!g.json.warnings.v){
@@ -836,14 +848,12 @@
836 g.json.warnings.v = cson_value_new_array();
837 assert((NULL != g.json.warnings.v) && "Alloc error.");
838 g.json.warnings.a = cson_value_get_array(g.json.warnings.v);
839 json_gc_add("$WARNINGS",g.json.warnings.v,0);
840 }
841 objV = cson_value_new_object();
842 assert((NULL != objV) && "Alloc error.");
843 cson_array_append(g.json.warnings.a, objV);
844 obj = cson_value_get_object(objV);
845 cson_object_set(obj,"code",cson_value_new_integer(code));
846 if(fmt && *fmt){
847 /* FIXME: treat NULL fmt as standard warning message for
848 the code, but we don't have those yet.
849 */
@@ -1542,23 +1552,29 @@
1542 cson_value * json_stmt_to_array_of_obj(Stmt *pStmt,
1543 cson_value * pTgt){
1544 cson_value * v = pTgt;
1545 cson_array * a = NULL;
1546 char const * warnMsg = NULL;
 
 
1547 if(v && !cson_value_is_array(v)){
1548 return NULL;
1549 }
1550 while( (SQLITE_ROW==db_step(pStmt)) ){
1551 cson_value * row = NULL;
1552 if(!a){
1553 if(!v){
1554 v = cson_value_new_array();
 
 
 
 
1555 }
1556 a = cson_value_get_array(v);
1557 assert(NULL!=a);
1558 }
1559 row = cson_sqlite3_row_to_object(pStmt->pStmt);
1560 if(!row && !warnMsg){
1561 warnMsg = "Could not convert at least one result row to JSON.";
1562 continue;
1563 }
1564 if( 0 != cson_array_append(a, row) ){
@@ -1568,16 +1584,38 @@
1568 cson_value_free(v);
1569 }
1570 return NULL;
1571 }
1572 }
 
 
 
1573 if(warnMsg){
1574 json_warn( FSL_JSON_W_ROW_TO_JSON_FAILED, warnMsg );
1575 }
1576 return v;
1577 }
1578
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1579
1580 /*
1581 ** If the given rid has any tags associated with it, this function
1582 ** returns a JSON Array containing the tag names, else it returns
1583 ** NULL.
@@ -2002,39 +2040,45 @@
2002 return payV;
2003 }
2004
2005 /* Impl in json_login.c. */
2006 cson_value * json_page_anon_password();
2007 /* Impl in json_login.c. */
2008 cson_value * json_page_login();
2009 /* Impl in json_login.c. */
2010 cson_value * json_page_logout();
2011 /* Impl in json_artifact.c. */
2012 cson_value * json_page_artifact();
2013 /* Impl in json_branch.c. */
2014 cson_value * json_page_branch();
2015 /* Impl in json_tag.c. */
2016 cson_value * json_page_tag();
2017 /* Impl in json_diff.c. */
2018 cson_value * json_page_diff();
 
 
 
 
 
 
 
 
 
 
2019
2020 /*
2021 ** Mapping of names to JSON pages/commands. Each name is a subpath of
2022 ** /json (in CGI mode) or a subcommand of the json command in CLI mode
2023 */
2024 static const JsonPageDef JsonPageDefs[] = {
2025 /* please keep alphabetically sorted (case-insensitive) for maintenance reasons. */
2026 {"anonymousPassword",json_page_anon_password, 1},
2027 {"artifact", json_page_artifact, 0},
2028 {"branch", json_page_branch,0},
2029 {"cap", json_page_cap, 0},
2030 {"diff", json_page_diff, 0},
2031 {"dir", json_page_nyi, 0},
2032 {"HAI",json_page_version,0},
2033 {"login",json_page_login,1},
2034 {"logout",json_page_logout,1},
 
2035 {"rebuild",json_page_rebuild,0},
 
2036 {"resultCodes", json_page_resultCodes,0},
2037 {"stat",json_page_stat,0},
2038 {"tag", json_page_tag,0},
2039 {"ticket", json_page_nyi,0},
2040 {"timeline", json_page_timeline,0},
2041
2042 DDED src/json_query.c
2043 DDED src/json_report.c
--- src/json.c
+++ src/json.c
@@ -538,30 +538,43 @@
538 ** GET/POST/CLI argument.
539 **
540 ** zKey must be the GET/POST parameter key. zCLILong must be the "long
541 ** form" CLI flag (NULL means to use zKey). zCLIShort may be NUL or
542 ** the "short form" CLI flag.
543 **
544 ** If argPos is >=0 and no other match is found,
545 ** json_command_arg(argPos) is also checked.
546 **
547 ** On error (no match found) NULL is returned.
548 **
549 ** This ONLY works for String JSON/GET/CLI values, not JSON
550 ** booleans and whatnot.
551 */
552 char const * json_find_option_cstr2(char const * zKey,
553 char const * zCLILong,
554 char const * zCLIShort,
555 int argPos){
556 char const * rc = NULL;
557 assert(NULL != zKey);
558 if(!g.isHTTP){
559 rc = find_option(zCLILong ? zCLILong : zKey,
560 zCLIShort, 1);
561 }
562 if(!rc && fossil_is_json()){
563 rc = json_getenv_cstr(zKey);
564 }
565 if(!rc && (argPos>=0)){
566 rc = json_command_arg((unsigned char)argPos);
567 }
568 return rc;
569 }
570
571 char const * json_find_option_cstr(char const * zKey,
572 char const * zCLILong,
573 char const * zCLIShort){
574 return json_find_option_cstr2(zKey, zCLIShort, zCLIShort, -1);
575 }
576
577 /*
578 ** The boolean equivalent of json_find_option_cstr().
579 ** If the option is not found, dftl is returned.
580 */
@@ -825,11 +838,10 @@
838 ** FIXME: if msg is NULL then use a standard string for
839 ** the given code. If !*msg then elide the "text" property,
840 ** for consistency with how json_err() works.
841 */
842 void json_warn( int code, char const * fmt, ... ){
 
843 cson_object * obj = NULL;
844 assert( (code>FSL_JSON_W_START)
845 && (code<FSL_JSON_W_END)
846 && "Invalid warning code.");
847 if(!g.json.warnings.v){
@@ -836,14 +848,12 @@
848 g.json.warnings.v = cson_value_new_array();
849 assert((NULL != g.json.warnings.v) && "Alloc error.");
850 g.json.warnings.a = cson_value_get_array(g.json.warnings.v);
851 json_gc_add("$WARNINGS",g.json.warnings.v,0);
852 }
853 obj = cson_new_object();
854 cson_array_append(g.json.warnings.a, cson_object_value(obj));
 
 
855 cson_object_set(obj,"code",cson_value_new_integer(code));
856 if(fmt && *fmt){
857 /* FIXME: treat NULL fmt as standard warning message for
858 the code, but we don't have those yet.
859 */
@@ -1542,23 +1552,29 @@
1552 cson_value * json_stmt_to_array_of_obj(Stmt *pStmt,
1553 cson_value * pTgt){
1554 cson_value * v = pTgt;
1555 cson_array * a = NULL;
1556 char const * warnMsg = NULL;
1557 cson_value * colNamesV = NULL;
1558 cson_array * colNames = NULL;
1559 if(v && !cson_value_is_array(v)){
1560 return NULL;
1561 }
1562 while( (SQLITE_ROW==db_step(pStmt)) ){
1563 cson_value * row = NULL;
1564 if(!a){
1565 if(!v){
1566 v = cson_value_new_array();
1567 colNamesV = cson_sqlite3_column_names(pStmt->pStmt);
1568 assert(NULL != colNamesV);
1569 colNames = cson_value_get_array(colNamesV);
1570 assert(NULL != colNames);
1571 }
1572 a = cson_value_get_array(v);
1573 assert(NULL!=a);
1574 }
1575 row = cson_sqlite3_row_to_object2(pStmt->pStmt, colNames);
1576 if(!row && !warnMsg){
1577 warnMsg = "Could not convert at least one result row to JSON.";
1578 continue;
1579 }
1580 if( 0 != cson_array_append(a, row) ){
@@ -1568,16 +1584,38 @@
1584 cson_value_free(v);
1585 }
1586 return NULL;
1587 }
1588 }
1589 if( colNamesV ){
1590 cson_value_free(colNamesV);
1591 }
1592 if(warnMsg){
1593 json_warn( FSL_JSON_W_ROW_TO_JSON_FAILED, warnMsg );
1594 }
1595 return v;
1596 }
1597
1598 /*
1599 ** Executes the given SQL and runs it through
1600 ** json_stmt_to_array_of_obj(), returning the result of that
1601 ** function. If resetBlob is true then blob_reset(pSql) is called
1602 ** after preparing the query.
1603 */
1604 cson_value * json_sql_to_array_of_obj(Blob * pSql, char resetBlob){
1605 Stmt q = empty_Stmt;
1606 cson_value * pay = NULL;
1607 assert( blob_size(pSql) > 0 );
1608 db_prepare(&q, "%s", blob_str(pSql));
1609 if(resetBlob){
1610 blob_reset(pSql);
1611 }
1612 pay = json_stmt_to_array_of_obj(&q, NULL);
1613 db_finalize(&q);
1614 return pay;
1615
1616 }
1617
1618 /*
1619 ** If the given rid has any tags associated with it, this function
1620 ** returns a JSON Array containing the tag names, else it returns
1621 ** NULL.
@@ -2002,39 +2040,45 @@
2040 return payV;
2041 }
2042
2043 /* Impl in json_login.c. */
2044 cson_value * json_page_anon_password();
 
 
 
 
2045 /* Impl in json_artifact.c. */
2046 cson_value * json_page_artifact();
2047 /* Impl in json_branch.c. */
2048 cson_value * json_page_branch();
 
 
2049 /* Impl in json_diff.c. */
2050 cson_value * json_page_diff();
2051 /* Impl in json_login.c. */
2052 cson_value * json_page_login();
2053 /* Impl in json_login.c. */
2054 cson_value * json_page_logout();
2055 /* Impl in json_query.c. */
2056 cson_value * json_page_query();
2057 /* Impl in json_report.c. */
2058 cson_value * json_page_report();
2059 /* Impl in json_tag.c. */
2060 cson_value * json_page_tag();
2061
2062 /*
2063 ** Mapping of names to JSON pages/commands. Each name is a subpath of
2064 ** /json (in CGI mode) or a subcommand of the json command in CLI mode
2065 */
2066 static const JsonPageDef JsonPageDefs[] = {
2067 /* please keep alphabetically sorted (case-insensitive) for maintenance reasons. */
2068 {"anonymousPassword", json_page_anon_password, 1},
2069 {"artifact", json_page_artifact, 0},
2070 {"branch", json_page_branch,0},
2071 {"cap", json_page_cap, 0},
2072 {"diff", json_page_diff, 0},
2073 {"dir", json_page_nyi, 0},
2074 {"HAI",json_page_version,0},
2075 {"login",json_page_login,1},
2076 {"logout",json_page_logout,1},
2077 {"query",json_page_query,0},
2078 {"rebuild",json_page_rebuild,0},
2079 {"report", json_page_report, 0},
2080 {"resultCodes", json_page_resultCodes,0},
2081 {"stat",json_page_stat,0},
2082 {"tag", json_page_tag,0},
2083 {"ticket", json_page_nyi,0},
2084 {"timeline", json_page_timeline,0},
2085
2086 DDED src/json_query.c
2087 DDED src/json_report.c
A src/json_query.c
+30
--- a/src/json_query.c
+++ b/src/json_query.c
@@ -0,0 +1,30 @@
1
+/*
2
+** Copyright (c) 2011 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
+#include "config.h"
19
+#include "json_query.h"
20
+
21
+#if INTERFACE
22
+#include "json_detail.h"
23
+#endif
24
+
25
+
26
+/*
27
+** Implementation of the /json/query page.
28
+**
29
+** Requires admin privileges. Intended primarily to assist me in
30
+** coming up with JSON output str4433
--- a/src/json_query.c
+++ b/src/json_query.c
@@ -0,0 +1,30 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/src/json_query.c
+++ b/src/json_query.c
@@ -0,0 +1,30 @@
1 /*
2 ** Copyright (c) 2011 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 #include "config.h"
19 #include "json_query.h"
20
21 #if INTERFACE
22 #include "json_detail.h"
23 #endif
24
25
26 /*
27 ** Implementation of the /json/query page.
28 **
29 ** Requires admin privileges. Intended primarily to assist me in
30 ** coming up with JSON output str4433
A src/json_report.c
+1
--- a/src/json_report.c
+++ b/src/json_report.c
@@ -0,0 +1 @@
1
+mtimnreturn NULLlist(){mtimnreturn NULL1number, -1);run
--- a/src/json_report.c
+++ b/src/json_report.c
@@ -0,0 +1 @@
 
--- a/src/json_report.c
+++ b/src/json_report.c
@@ -0,0 +1 @@
1 mtimnreturn NULLlist(){mtimnreturn NULL1number, -1);run
M src/main.mk
+22 -2
--- src/main.mk
+++ src/main.mk
@@ -52,10 +52,12 @@
5252
 $(SRCDIR)/json.c \
5353
 $(SRCDIR)/json_artifact.c \
5454
 $(SRCDIR)/json_branch.c \
5555
 $(SRCDIR)/json_diff.c \
5656
 $(SRCDIR)/json_login.c \
57
+ $(SRCDIR)/json_query.c \
58
+ $(SRCDIR)/json_report.c \
5759
 $(SRCDIR)/json_tag.c \
5860
 $(SRCDIR)/json_timeline.c \
5961
 $(SRCDIR)/json_wiki.c \
6062
 $(SRCDIR)/leaf.c \
6163
 $(SRCDIR)/login.c \
@@ -144,10 +146,12 @@
144146
 $(OBJDIR)/json_.c \
145147
 $(OBJDIR)/json_artifact_.c \
146148
 $(OBJDIR)/json_branch_.c \
147149
 $(OBJDIR)/json_diff_.c \
148150
 $(OBJDIR)/json_login_.c \
151
+ $(OBJDIR)/json_query_.c \
152
+ $(OBJDIR)/json_report_.c \
149153
 $(OBJDIR)/json_tag_.c \
150154
 $(OBJDIR)/json_timeline_.c \
151155
 $(OBJDIR)/json_wiki_.c \
152156
 $(OBJDIR)/leaf_.c \
153157
 $(OBJDIR)/login_.c \
@@ -236,10 +240,12 @@
236240
 $(OBJDIR)/json.o \
237241
 $(OBJDIR)/json_artifact.o \
238242
 $(OBJDIR)/json_branch.o \
239243
 $(OBJDIR)/json_diff.o \
240244
 $(OBJDIR)/json_login.o \
245
+ $(OBJDIR)/json_query.o \
246
+ $(OBJDIR)/json_report.o \
241247
 $(OBJDIR)/json_tag.o \
242248
 $(OBJDIR)/json_timeline.o \
243249
 $(OBJDIR)/json_wiki.o \
244250
 $(OBJDIR)/leaf.o \
245251
 $(OBJDIR)/login.o \
@@ -345,14 +351,14 @@
345351
346352
347353
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
348354
 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
349355
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
350
- $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
356
+ $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
351357
 touch $(OBJDIR)/headers
352358
 $(OBJDIR)/headers: Makefile
353
-$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
359
+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
354360
 Makefile:
355361
 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
356362
 $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c
357363
358364
 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
@@ -651,10 +657,24 @@
651657
652658
 $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
653659
 $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
654660
655661
 $(OBJDIR)/json_login.h: $(OBJDIR)/headers
662
+$(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
663
+ $(OBJDIR)/translate $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
664
+
665
+$(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
666
+ $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
667
+
668
+$(OBJDIR)/json_query.h: $(OBJDIR)/headers
669
+$(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
670
+ $(OBJDIR)/translate $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
671
+
672
+$(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
673
+ $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
674
+
675
+$(OBJDIR)/json_report.h: $(OBJDIR)/headers
656676
 $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
657677
 $(OBJDIR)/translate $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
658678
659679
 $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
660680
 $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
661681
--- src/main.mk
+++ src/main.mk
@@ -52,10 +52,12 @@
52 $(SRCDIR)/json.c \
53 $(SRCDIR)/json_artifact.c \
54 $(SRCDIR)/json_branch.c \
55 $(SRCDIR)/json_diff.c \
56 $(SRCDIR)/json_login.c \
 
 
57 $(SRCDIR)/json_tag.c \
58 $(SRCDIR)/json_timeline.c \
59 $(SRCDIR)/json_wiki.c \
60 $(SRCDIR)/leaf.c \
61 $(SRCDIR)/login.c \
@@ -144,10 +146,12 @@
144 $(OBJDIR)/json_.c \
145 $(OBJDIR)/json_artifact_.c \
146 $(OBJDIR)/json_branch_.c \
147 $(OBJDIR)/json_diff_.c \
148 $(OBJDIR)/json_login_.c \
 
 
149 $(OBJDIR)/json_tag_.c \
150 $(OBJDIR)/json_timeline_.c \
151 $(OBJDIR)/json_wiki_.c \
152 $(OBJDIR)/leaf_.c \
153 $(OBJDIR)/login_.c \
@@ -236,10 +240,12 @@
236 $(OBJDIR)/json.o \
237 $(OBJDIR)/json_artifact.o \
238 $(OBJDIR)/json_branch.o \
239 $(OBJDIR)/json_diff.o \
240 $(OBJDIR)/json_login.o \
 
 
241 $(OBJDIR)/json_tag.o \
242 $(OBJDIR)/json_timeline.o \
243 $(OBJDIR)/json_wiki.o \
244 $(OBJDIR)/leaf.o \
245 $(OBJDIR)/login.o \
@@ -345,14 +351,14 @@
345
346
347 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
348 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
349 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
350 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
351 touch $(OBJDIR)/headers
352 $(OBJDIR)/headers: Makefile
353 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
354 Makefile:
355 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
356 $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c
357
358 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
@@ -651,10 +657,24 @@
651
652 $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
653 $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
654
655 $(OBJDIR)/json_login.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
 
 
 
 
 
 
656 $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
657 $(OBJDIR)/translate $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
658
659 $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
660 $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
661
--- src/main.mk
+++ src/main.mk
@@ -52,10 +52,12 @@
52 $(SRCDIR)/json.c \
53 $(SRCDIR)/json_artifact.c \
54 $(SRCDIR)/json_branch.c \
55 $(SRCDIR)/json_diff.c \
56 $(SRCDIR)/json_login.c \
57 $(SRCDIR)/json_query.c \
58 $(SRCDIR)/json_report.c \
59 $(SRCDIR)/json_tag.c \
60 $(SRCDIR)/json_timeline.c \
61 $(SRCDIR)/json_wiki.c \
62 $(SRCDIR)/leaf.c \
63 $(SRCDIR)/login.c \
@@ -144,10 +146,12 @@
146 $(OBJDIR)/json_.c \
147 $(OBJDIR)/json_artifact_.c \
148 $(OBJDIR)/json_branch_.c \
149 $(OBJDIR)/json_diff_.c \
150 $(OBJDIR)/json_login_.c \
151 $(OBJDIR)/json_query_.c \
152 $(OBJDIR)/json_report_.c \
153 $(OBJDIR)/json_tag_.c \
154 $(OBJDIR)/json_timeline_.c \
155 $(OBJDIR)/json_wiki_.c \
156 $(OBJDIR)/leaf_.c \
157 $(OBJDIR)/login_.c \
@@ -236,10 +240,12 @@
240 $(OBJDIR)/json.o \
241 $(OBJDIR)/json_artifact.o \
242 $(OBJDIR)/json_branch.o \
243 $(OBJDIR)/json_diff.o \
244 $(OBJDIR)/json_login.o \
245 $(OBJDIR)/json_query.o \
246 $(OBJDIR)/json_report.o \
247 $(OBJDIR)/json_tag.o \
248 $(OBJDIR)/json_timeline.o \
249 $(OBJDIR)/json_wiki.o \
250 $(OBJDIR)/leaf.o \
251 $(OBJDIR)/login.o \
@@ -345,14 +351,14 @@
351
352
353 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
354 $(OBJDIR)/mkindex $(TRANS_SRC) >$@
355 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
356 $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
357 touch $(OBJDIR)/headers
358 $(OBJDIR)/headers: Makefile
359 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
360 Makefile:
361 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
362 $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c
363
364 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
@@ -651,10 +657,24 @@
657
658 $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
659 $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
660
661 $(OBJDIR)/json_login.h: $(OBJDIR)/headers
662 $(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
663 $(OBJDIR)/translate $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
664
665 $(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
666 $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
667
668 $(OBJDIR)/json_query.h: $(OBJDIR)/headers
669 $(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
670 $(OBJDIR)/translate $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
671
672 $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
673 $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
674
675 $(OBJDIR)/json_report.h: $(OBJDIR)/headers
676 $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
677 $(OBJDIR)/translate $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
678
679 $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
680 $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
681
M src/makemake.tcl
+8 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -58,10 +58,12 @@
5858
 json
5959
 json_artifact
6060
 json_branch
6161
 json_diff
6262
 json_login
63
+ json_query
64
+ json_report
6365
 json_tag
6466
 json_timeline
6567
 json_wiki
6668
 leaf
6769
 login
@@ -244,11 +246,11 @@
244246
 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@"
245247
 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
246248
 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
247249
 writeln "\ttouch \$(OBJDIR)/headers"
248250
 writeln "\$(OBJDIR)/headers: Makefile"
249
-writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
251
+writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
250252
 writeln "Makefile:"
251253
 set extra_h(main) \$(OBJDIR)/page_index.h
252254
253255
 foreach s [lsort $src] {
254256
 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
@@ -490,11 +492,11 @@
490492
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
491493
492494
 set opt {}
493495
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
494496
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
495
-writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
497
+writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
496498
497499
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
498500
 set opt {-Dmain=sqlite3_shell}
499501
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
500502
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
@@ -625,10 +627,12 @@
625627
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
626628
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
627629
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
628630
 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
629631
 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
632
+$(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
633
+$(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
630634
 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
631635
 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
632636
 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
633637
634638
@@ -775,10 +779,12 @@
775779
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
776780
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
777781
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
778782
 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
779783
 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
784
+$(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
785
+$(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
780786
 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
781787
 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
782788
 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
783789
784790
 }
785791
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -58,10 +58,12 @@
58 json
59 json_artifact
60 json_branch
61 json_diff
62 json_login
 
 
63 json_tag
64 json_timeline
65 json_wiki
66 leaf
67 login
@@ -244,11 +246,11 @@
244 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@"
245 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
246 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
247 writeln "\ttouch \$(OBJDIR)/headers"
248 writeln "\$(OBJDIR)/headers: Makefile"
249 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
250 writeln "Makefile:"
251 set extra_h(main) \$(OBJDIR)/page_index.h
252
253 foreach s [lsort $src] {
254 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
@@ -490,11 +492,11 @@
490 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
491
492 set opt {}
493 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
494 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
495 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
496
497 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
498 set opt {-Dmain=sqlite3_shell}
499 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
500 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
@@ -625,10 +627,12 @@
625 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
626 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
627 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
628 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
629 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
 
 
630 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
631 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
632 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
633
634
@@ -775,10 +779,12 @@
775 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
776 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
777 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
778 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
779 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
 
 
780 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
781 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
782 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
783
784 }
785
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -58,10 +58,12 @@
58 json
59 json_artifact
60 json_branch
61 json_diff
62 json_login
63 json_query
64 json_report
65 json_tag
66 json_timeline
67 json_wiki
68 leaf
69 login
@@ -244,11 +246,11 @@
246 writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@"
247 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"
248 writeln "\t\$(OBJDIR)/makeheaders $mhargs"
249 writeln "\ttouch \$(OBJDIR)/headers"
250 writeln "\$(OBJDIR)/headers: Makefile"
251 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
252 writeln "Makefile:"
253 set extra_h(main) \$(OBJDIR)/page_index.h
254
255 foreach s [lsort $src] {
256 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate"
@@ -490,11 +492,11 @@
492 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
493
494 set opt {}
495 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
496 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
497 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
498
499 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
500 set opt {-Dmain=sqlite3_shell}
501 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
502 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
@@ -625,10 +627,12 @@
627 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
628 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
629 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
630 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
631 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
632 $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
633 $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
634 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
635 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
636 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
637
638
@@ -775,10 +779,12 @@
779 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
780 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
781 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
782 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
783 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
784 $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
785 $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
786 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
787 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
788 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
789
790 }
791
M win/Makefile.dmc
+18 -4
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -22,13 +22,13 @@
2222
 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
2323
 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
2424
2525
 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
2626
27
-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
27
+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
2828
29
-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
29
+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
3030
3131
3232
 RC=$(DMDIR)\bin\rcc
3333
 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
3434
@@ -42,11 +42,11 @@
4242
4343
 $(OBJDIR)\fossil.res: $B\win\fossil.rc
4444
 $(RC) $(RCFLAGS) -o$@ $**
4545
4646
 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
47
- +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_tag json_timeline json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
47
+ +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
4848
 +echo fossil >> $@
4949
 +echo fossil >> $@
5050
 +echo $(LIBS) >> $@
5151
 +echo. >> $@
5252
 +echo fossil >> $@
@@ -94,10 +94,12 @@
9494
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
9595
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
9696
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
9797
 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
9898
 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
99
+$(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
100
+$(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
99101
 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
100102
 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
101103
 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
102104
103105
@@ -357,10 +359,22 @@
357359
 $(OBJDIR)\json_login$O : json_login_.c json_login.h
358360
 $(TCC) -o$@ -c json_login_.c
359361
360362
 json_login_.c : $(SRCDIR)\json_login.c
361363
 +translate$E $** > $@
364
+
365
+$(OBJDIR)\json_query$O : json_query_.c json_query.h
366
+ $(TCC) -o$@ -c json_query_.c
367
+
368
+json_query_.c : $(SRCDIR)\json_query.c
369
+ +translate$E $** > $@
370
+
371
+$(OBJDIR)\json_report$O : json_report_.c json_report.h
372
+ $(TCC) -o$@ -c json_report_.c
373
+
374
+json_report_.c : $(SRCDIR)\json_report.c
375
+ +translate$E $** > $@
362376
363377
 $(OBJDIR)\json_tag$O : json_tag_.c json_tag.h
364378
 $(TCC) -o$@ -c json_tag_.c
365379
366380
 json_tag_.c : $(SRCDIR)\json_tag.c
@@ -641,7 +655,7 @@
641655
642656
 zip_.c : $(SRCDIR)\zip.c
643657
 +translate$E $** > $@
644658
645659
 headers: makeheaders$E page_index.h VERSION.h
646
- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
660
+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
647661
 @copy /Y nul: headers
648662
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -22,13 +22,13 @@
22 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
23 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
24
25 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
26
27 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
28
29 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
30
31
32 RC=$(DMDIR)\bin\rcc
33 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
34
@@ -42,11 +42,11 @@
42
43 $(OBJDIR)\fossil.res: $B\win\fossil.rc
44 $(RC) $(RCFLAGS) -o$@ $**
45
46 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
47 +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_tag json_timeline json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
48 +echo fossil >> $@
49 +echo fossil >> $@
50 +echo $(LIBS) >> $@
51 +echo. >> $@
52 +echo fossil >> $@
@@ -94,10 +94,12 @@
94 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
95 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
96 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
97 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
98 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
 
 
99 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
100 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
101 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
102
103
@@ -357,10 +359,22 @@
357 $(OBJDIR)\json_login$O : json_login_.c json_login.h
358 $(TCC) -o$@ -c json_login_.c
359
360 json_login_.c : $(SRCDIR)\json_login.c
361 +translate$E $** > $@
 
 
 
 
 
 
 
 
 
 
 
 
362
363 $(OBJDIR)\json_tag$O : json_tag_.c json_tag.h
364 $(TCC) -o$@ -c json_tag_.c
365
366 json_tag_.c : $(SRCDIR)\json_tag.c
@@ -641,7 +655,7 @@
641
642 zip_.c : $(SRCDIR)\zip.c
643 +translate$E $** > $@
644
645 headers: makeheaders$E page_index.h VERSION.h
646 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
647 @copy /Y nul: headers
648
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -22,13 +22,13 @@
22 TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
23 LIBS = $(DMDIR)\extra\lib\ zlib wsock32
24
25 SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
26
27 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
28
29 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
30
31
32 RC=$(DMDIR)\bin\rcc
33 RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
34
@@ -42,11 +42,11 @@
42
43 $(OBJDIR)\fossil.res: $B\win\fossil.rc
44 $(RC) $(RCFLAGS) -o$@ $**
45
46 $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
47 +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_diff json_login json_query json_report json_tag json_timeline json_wiki leaf login main manifest md5 merge merge3 name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip shell sqlite3 th th_lang > $@
48 +echo fossil >> $@
49 +echo fossil >> $@
50 +echo $(LIBS) >> $@
51 +echo. >> $@
52 +echo fossil >> $@
@@ -94,10 +94,12 @@
94 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
95 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
96 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
97 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
98 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
99 $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
100 $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
101 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
102 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
103 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
104
105
@@ -357,10 +359,22 @@
359 $(OBJDIR)\json_login$O : json_login_.c json_login.h
360 $(TCC) -o$@ -c json_login_.c
361
362 json_login_.c : $(SRCDIR)\json_login.c
363 +translate$E $** > $@
364
365 $(OBJDIR)\json_query$O : json_query_.c json_query.h
366 $(TCC) -o$@ -c json_query_.c
367
368 json_query_.c : $(SRCDIR)\json_query.c
369 +translate$E $** > $@
370
371 $(OBJDIR)\json_report$O : json_report_.c json_report.h
372 $(TCC) -o$@ -c json_report_.c
373
374 json_report_.c : $(SRCDIR)\json_report.c
375 +translate$E $** > $@
376
377 $(OBJDIR)\json_tag$O : json_tag_.c json_tag.h
378 $(TCC) -o$@ -c json_tag_.c
379
380 json_tag_.c : $(SRCDIR)\json_tag.c
@@ -641,7 +655,7 @@
655
656 zip_.c : $(SRCDIR)\zip.c
657 +translate$E $** > $@
658
659 headers: makeheaders$E page_index.h VERSION.h
660 +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
661 @copy /Y nul: headers
662
M win/Makefile.mingw
+22 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -115,10 +115,12 @@
115115
 $(SRCDIR)/json.c \
116116
 $(SRCDIR)/json_artifact.c \
117117
 $(SRCDIR)/json_branch.c \
118118
 $(SRCDIR)/json_diff.c \
119119
 $(SRCDIR)/json_login.c \
120
+ $(SRCDIR)/json_query.c \
121
+ $(SRCDIR)/json_report.c \
120122
 $(SRCDIR)/json_tag.c \
121123
 $(SRCDIR)/json_timeline.c \
122124
 $(SRCDIR)/json_wiki.c \
123125
 $(SRCDIR)/leaf.c \
124126
 $(SRCDIR)/login.c \
@@ -207,10 +209,12 @@
207209
 $(OBJDIR)/json_.c \
208210
 $(OBJDIR)/json_artifact_.c \
209211
 $(OBJDIR)/json_branch_.c \
210212
 $(OBJDIR)/json_diff_.c \
211213
 $(OBJDIR)/json_login_.c \
214
+ $(OBJDIR)/json_query_.c \
215
+ $(OBJDIR)/json_report_.c \
212216
 $(OBJDIR)/json_tag_.c \
213217
 $(OBJDIR)/json_timeline_.c \
214218
 $(OBJDIR)/json_wiki_.c \
215219
 $(OBJDIR)/leaf_.c \
216220
 $(OBJDIR)/login_.c \
@@ -299,10 +303,12 @@
299303
 $(OBJDIR)/json.o \
300304
 $(OBJDIR)/json_artifact.o \
301305
 $(OBJDIR)/json_branch.o \
302306
 $(OBJDIR)/json_diff.o \
303307
 $(OBJDIR)/json_login.o \
308
+ $(OBJDIR)/json_query.o \
309
+ $(OBJDIR)/json_report.o \
304310
 $(OBJDIR)/json_tag.o \
305311
 $(OBJDIR)/json_timeline.o \
306312
 $(OBJDIR)/json_wiki.o \
307313
 $(OBJDIR)/leaf.o \
308314
 $(OBJDIR)/login.o \
@@ -412,11 +418,11 @@
412418
413419
414420
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
415421
 $(MKINDEX) $(TRANS_SRC) >$@
416422
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
417
- $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
423
+ $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
418424
 echo Done >$(OBJDIR)/headers
419425
420426
 $(OBJDIR)/headers: Makefile
421427
 Makefile:
422428
 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -718,10 +724,24 @@
718724
719725
 $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
720726
 $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
721727
722728
 json_login.h: $(OBJDIR)/headers
729
+$(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
730
+ $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
731
+
732
+$(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
733
+ $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
734
+
735
+json_query.h: $(OBJDIR)/headers
736
+$(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
737
+ $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
738
+
739
+$(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
740
+ $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
741
+
742
+json_report.h: $(OBJDIR)/headers
723743
 $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
724744
 $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
725745
726746
 $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
727747
 $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
@@ -1053,15 +1073,15 @@
10531073
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
10541074
10551075
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
10561076
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
10571077
1058
-$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1078
+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
10591079
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
10601080
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
10611081
10621082
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
10631083
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
10641084
10651085
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
10661086
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
10671087
10681088
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -115,10 +115,12 @@
115 $(SRCDIR)/json.c \
116 $(SRCDIR)/json_artifact.c \
117 $(SRCDIR)/json_branch.c \
118 $(SRCDIR)/json_diff.c \
119 $(SRCDIR)/json_login.c \
 
 
120 $(SRCDIR)/json_tag.c \
121 $(SRCDIR)/json_timeline.c \
122 $(SRCDIR)/json_wiki.c \
123 $(SRCDIR)/leaf.c \
124 $(SRCDIR)/login.c \
@@ -207,10 +209,12 @@
207 $(OBJDIR)/json_.c \
208 $(OBJDIR)/json_artifact_.c \
209 $(OBJDIR)/json_branch_.c \
210 $(OBJDIR)/json_diff_.c \
211 $(OBJDIR)/json_login_.c \
 
 
212 $(OBJDIR)/json_tag_.c \
213 $(OBJDIR)/json_timeline_.c \
214 $(OBJDIR)/json_wiki_.c \
215 $(OBJDIR)/leaf_.c \
216 $(OBJDIR)/login_.c \
@@ -299,10 +303,12 @@
299 $(OBJDIR)/json.o \
300 $(OBJDIR)/json_artifact.o \
301 $(OBJDIR)/json_branch.o \
302 $(OBJDIR)/json_diff.o \
303 $(OBJDIR)/json_login.o \
 
 
304 $(OBJDIR)/json_tag.o \
305 $(OBJDIR)/json_timeline.o \
306 $(OBJDIR)/json_wiki.o \
307 $(OBJDIR)/leaf.o \
308 $(OBJDIR)/login.o \
@@ -412,11 +418,11 @@
412
413
414 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
415 $(MKINDEX) $(TRANS_SRC) >$@
416 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
417 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
418 echo Done >$(OBJDIR)/headers
419
420 $(OBJDIR)/headers: Makefile
421 Makefile:
422 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -718,10 +724,24 @@
718
719 $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
720 $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
721
722 json_login.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
 
 
 
 
 
 
723 $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
724 $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
725
726 $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
727 $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
@@ -1053,15 +1073,15 @@
1053 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1054
1055 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1056 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1057
1058 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1059 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1060 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1061
1062 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1063 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1064
1065 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1066 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1067
1068
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -115,10 +115,12 @@
115 $(SRCDIR)/json.c \
116 $(SRCDIR)/json_artifact.c \
117 $(SRCDIR)/json_branch.c \
118 $(SRCDIR)/json_diff.c \
119 $(SRCDIR)/json_login.c \
120 $(SRCDIR)/json_query.c \
121 $(SRCDIR)/json_report.c \
122 $(SRCDIR)/json_tag.c \
123 $(SRCDIR)/json_timeline.c \
124 $(SRCDIR)/json_wiki.c \
125 $(SRCDIR)/leaf.c \
126 $(SRCDIR)/login.c \
@@ -207,10 +209,12 @@
209 $(OBJDIR)/json_.c \
210 $(OBJDIR)/json_artifact_.c \
211 $(OBJDIR)/json_branch_.c \
212 $(OBJDIR)/json_diff_.c \
213 $(OBJDIR)/json_login_.c \
214 $(OBJDIR)/json_query_.c \
215 $(OBJDIR)/json_report_.c \
216 $(OBJDIR)/json_tag_.c \
217 $(OBJDIR)/json_timeline_.c \
218 $(OBJDIR)/json_wiki_.c \
219 $(OBJDIR)/leaf_.c \
220 $(OBJDIR)/login_.c \
@@ -299,10 +303,12 @@
303 $(OBJDIR)/json.o \
304 $(OBJDIR)/json_artifact.o \
305 $(OBJDIR)/json_branch.o \
306 $(OBJDIR)/json_diff.o \
307 $(OBJDIR)/json_login.o \
308 $(OBJDIR)/json_query.o \
309 $(OBJDIR)/json_report.o \
310 $(OBJDIR)/json_tag.o \
311 $(OBJDIR)/json_timeline.o \
312 $(OBJDIR)/json_wiki.o \
313 $(OBJDIR)/leaf.o \
314 $(OBJDIR)/login.o \
@@ -412,11 +418,11 @@
418
419
420 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
421 $(MKINDEX) $(TRANS_SRC) >$@
422 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
423 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
424 echo Done >$(OBJDIR)/headers
425
426 $(OBJDIR)/headers: Makefile
427 Makefile:
428 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -718,10 +724,24 @@
724
725 $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
726 $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
727
728 json_login.h: $(OBJDIR)/headers
729 $(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
730 $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
731
732 $(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
733 $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
734
735 json_query.h: $(OBJDIR)/headers
736 $(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
737 $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
738
739 $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
740 $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
741
742 json_report.h: $(OBJDIR)/headers
743 $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
744 $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
745
746 $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
747 $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
@@ -1053,15 +1073,15 @@
1073 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1074
1075 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1076 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1077
1078 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1079 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1080 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1081
1082 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1083 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1084
1085 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1086 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1087
1088
M win/Makefile.msc
+19 -3
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -36,13 +36,13 @@
3636
 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
3737
 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
3838
3939
 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
4040
41
-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
41
+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
4242
43
-OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
43
+OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
4444
4545
4646
 APPNAME = $(OX)\fossil$(E)
4747
4848
 all: $(OX) $(APPNAME)
@@ -93,10 +93,12 @@
9393
 echo $(OX)\json.obj >> $@
9494
 echo $(OX)\json_artifact.obj >> $@
9595
 echo $(OX)\json_branch.obj >> $@
9696
 echo $(OX)\json_diff.obj >> $@
9797
 echo $(OX)\json_login.obj >> $@
98
+ echo $(OX)\json_query.obj >> $@
99
+ echo $(OX)\json_report.obj >> $@
98100
 echo $(OX)\json_tag.obj >> $@
99101
 echo $(OX)\json_timeline.obj >> $@
100102
 echo $(OX)\json_wiki.obj >> $@
101103
 echo $(OX)\leaf.obj >> $@
102104
 echo $(OX)\login.obj >> $@
@@ -197,10 +199,12 @@
197199
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
198200
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
199201
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
200202
 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
201203
 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
204
+$(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
205
+$(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
202206
 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
203207
 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
204208
 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
205209
206210
@@ -459,10 +463,22 @@
459463
 $(OX)\json_login$O : json_login_.c json_login.h
460464
 $(TCC) /Fo$@ -c json_login_.c
461465
462466
 json_login_.c : $(SRCDIR)\json_login.c
463467
 translate$E $** > $@
468
+
469
+$(OX)\json_query$O : json_query_.c json_query.h
470
+ $(TCC) /Fo$@ -c json_query_.c
471
+
472
+json_query_.c : $(SRCDIR)\json_query.c
473
+ translate$E $** > $@
474
+
475
+$(OX)\json_report$O : json_report_.c json_report.h
476
+ $(TCC) /Fo$@ -c json_report_.c
477
+
478
+json_report_.c : $(SRCDIR)\json_report.c
479
+ translate$E $** > $@
464480
465481
 $(OX)\json_tag$O : json_tag_.c json_tag.h
466482
 $(TCC) /Fo$@ -c json_tag_.c
467483
468484
 json_tag_.c : $(SRCDIR)\json_tag.c
@@ -743,7 +759,7 @@
743759
744760
 zip_.c : $(SRCDIR)\zip.c
745761
 translate$E $** > $@
746762
747763
 headers: makeheaders$E page_index.h VERSION.h
748
- makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
764
+ makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
749765
 @copy /Y nul: headers
750766
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -36,13 +36,13 @@
36 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
37 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
38
39 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40
41 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
42
43 OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
44
45
46 APPNAME = $(OX)\fossil$(E)
47
48 all: $(OX) $(APPNAME)
@@ -93,10 +93,12 @@
93 echo $(OX)\json.obj >> $@
94 echo $(OX)\json_artifact.obj >> $@
95 echo $(OX)\json_branch.obj >> $@
96 echo $(OX)\json_diff.obj >> $@
97 echo $(OX)\json_login.obj >> $@
 
 
98 echo $(OX)\json_tag.obj >> $@
99 echo $(OX)\json_timeline.obj >> $@
100 echo $(OX)\json_wiki.obj >> $@
101 echo $(OX)\leaf.obj >> $@
102 echo $(OX)\login.obj >> $@
@@ -197,10 +199,12 @@
197 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
198 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
199 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
200 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
201 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
 
 
202 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
203 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
204 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
205
206
@@ -459,10 +463,22 @@
459 $(OX)\json_login$O : json_login_.c json_login.h
460 $(TCC) /Fo$@ -c json_login_.c
461
462 json_login_.c : $(SRCDIR)\json_login.c
463 translate$E $** > $@
 
 
 
 
 
 
 
 
 
 
 
 
464
465 $(OX)\json_tag$O : json_tag_.c json_tag.h
466 $(TCC) /Fo$@ -c json_tag_.c
467
468 json_tag_.c : $(SRCDIR)\json_tag.c
@@ -743,7 +759,7 @@
743
744 zip_.c : $(SRCDIR)\zip.c
745 translate$E $** > $@
746
747 headers: makeheaders$E page_index.h VERSION.h
748 makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
749 @copy /Y nul: headers
750
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -36,13 +36,13 @@
36 LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
37 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
38
39 SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40
41 SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
42
43 OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
44
45
46 APPNAME = $(OX)\fossil$(E)
47
48 all: $(OX) $(APPNAME)
@@ -93,10 +93,12 @@
93 echo $(OX)\json.obj >> $@
94 echo $(OX)\json_artifact.obj >> $@
95 echo $(OX)\json_branch.obj >> $@
96 echo $(OX)\json_diff.obj >> $@
97 echo $(OX)\json_login.obj >> $@
98 echo $(OX)\json_query.obj >> $@
99 echo $(OX)\json_report.obj >> $@
100 echo $(OX)\json_tag.obj >> $@
101 echo $(OX)\json_timeline.obj >> $@
102 echo $(OX)\json_wiki.obj >> $@
103 echo $(OX)\leaf.obj >> $@
104 echo $(OX)\login.obj >> $@
@@ -197,10 +199,12 @@
199 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
200 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
201 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
202 $(OBJDIR)\json_diff$O : $(SRCDIR)\json_detail.h
203 $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h
204 $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h
205 $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h
206 $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h
207 $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h
208 $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h
209
210
@@ -459,10 +463,22 @@
463 $(OX)\json_login$O : json_login_.c json_login.h
464 $(TCC) /Fo$@ -c json_login_.c
465
466 json_login_.c : $(SRCDIR)\json_login.c
467 translate$E $** > $@
468
469 $(OX)\json_query$O : json_query_.c json_query.h
470 $(TCC) /Fo$@ -c json_query_.c
471
472 json_query_.c : $(SRCDIR)\json_query.c
473 translate$E $** > $@
474
475 $(OX)\json_report$O : json_report_.c json_report.h
476 $(TCC) /Fo$@ -c json_report_.c
477
478 json_report_.c : $(SRCDIR)\json_report.c
479 translate$E $** > $@
480
481 $(OX)\json_tag$O : json_tag_.c json_tag.h
482 $(TCC) /Fo$@ -c json_tag_.c
483
484 json_tag_.c : $(SRCDIR)\json_tag.c
@@ -743,7 +759,7 @@
759
760 zip_.c : $(SRCDIR)\zip.c
761 translate$E $** > $@
762
763 headers: makeheaders$E page_index.h VERSION.h
764 makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_diff_.c:json_diff.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
765 @copy /Y nul: headers
766

Keyboard Shortcuts

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