Fossil SCM
Added /json/status command.
Commit
d1e4d100ad1f4255494fdce795bd9cbd4d21d3fd
Parent
b38bb4f9bd27d03…
9 files changed
+1
+13
-5
+8
-5
+195
+12
-2
+5
-2
+11
-4
+13
-1
+11
+1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -174,10 +174,11 @@ | ||
| 174 | 174 | if( showHdr && blob_size(&report)>0 ){ |
| 175 | 175 | fossil_print("Changes for %s at %s:\n", db_get("project-name","???"), |
| 176 | 176 | g.zLocalRoot); |
| 177 | 177 | } |
| 178 | 178 | blob_write_to_file(&report, "-"); |
| 179 | + blob_reset(&report); | |
| 179 | 180 | } |
| 180 | 181 | |
| 181 | 182 | /* |
| 182 | 183 | ** COMMAND: status |
| 183 | 184 | ** |
| 184 | 185 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -174,10 +174,11 @@ | |
| 174 | if( showHdr && blob_size(&report)>0 ){ |
| 175 | fossil_print("Changes for %s at %s:\n", db_get("project-name","???"), |
| 176 | g.zLocalRoot); |
| 177 | } |
| 178 | blob_write_to_file(&report, "-"); |
| 179 | } |
| 180 | |
| 181 | /* |
| 182 | ** COMMAND: status |
| 183 | ** |
| 184 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -174,10 +174,11 @@ | |
| 174 | if( showHdr && blob_size(&report)>0 ){ |
| 175 | fossil_print("Changes for %s at %s:\n", db_get("project-name","???"), |
| 176 | g.zLocalRoot); |
| 177 | } |
| 178 | blob_write_to_file(&report, "-"); |
| 179 | blob_reset(&report); |
| 180 | } |
| 181 | |
| 182 | /* |
| 183 | ** COMMAND: status |
| 184 | ** |
| 185 |
+13
-5
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -239,10 +239,11 @@ | ||
| 239 | 239 | C(STMT_EXEC,"Statement execution/stepping failed"); |
| 240 | 240 | C(DB_LOCKED,"Database is locked"); |
| 241 | 241 | C(DB_NEEDS_REBUILD,"Fossil repository needs to be rebuilt"); |
| 242 | 242 | C(DB_NOT_FOUND,"Fossil repository db file could not be found."); |
| 243 | 243 | C(DB_NOT_VALID, "Fossil repository db file is not valid."); |
| 244 | + C(DB_NEEDS_CHECKOUT, "Command requires a local checkout."); | |
| 244 | 245 | #undef C |
| 245 | 246 | default: |
| 246 | 247 | return "Unknown Error"; |
| 247 | 248 | } |
| 248 | 249 | } |
| @@ -2117,18 +2118,22 @@ | ||
| 2117 | 2118 | ** taken from zPages. zPages must be an array of objects |
| 2118 | 2119 | ** whose final entry MUST have a NULL name value or results |
| 2119 | 2120 | ** are undefined. |
| 2120 | 2121 | ** |
| 2121 | 2122 | ** The list is appended to pOut. The number of items (not bytes) |
| 2122 | -** appended are returned. | |
| 2123 | +** appended are returned. If filterByMode is non-0 then the result | |
| 2124 | +** list will contain only commands which are able to run in the the | |
| 2125 | +** current run mode (CLI vs. HTTP). | |
| 2123 | 2126 | */ |
| 2124 | 2127 | static int json_pagedefs_to_string(JsonPageDef const * zPages, |
| 2125 | - Blob * pOut){ | |
| 2128 | + Blob * pOut, int filterByMode){ | |
| 2126 | 2129 | int i = 0; |
| 2127 | 2130 | for( ; zPages->name; ++zPages, ++i ){ |
| 2128 | - if(g.isHTTP && zPages->runMode < 0) continue; | |
| 2129 | - else if(zPages->runMode > 0) continue; | |
| 2131 | + if(filterByMode){ | |
| 2132 | + if(g.isHTTP && zPages->runMode < 0) continue; | |
| 2133 | + else if(zPages->runMode > 0) continue; | |
| 2134 | + } | |
| 2130 | 2135 | blob_appendf(pOut, zPages->name, -1); |
| 2131 | 2136 | if((zPages+1)->name){ |
| 2132 | 2137 | blob_append(pOut, ", ",2); |
| 2133 | 2138 | } |
| 2134 | 2139 | } |
| @@ -2152,11 +2157,11 @@ | ||
| 2152 | 2157 | blob_init(&cmdNames,NULL,0); |
| 2153 | 2158 | if( !zErrPrefix ) { |
| 2154 | 2159 | zErrPrefix = "Try one of: "; |
| 2155 | 2160 | } |
| 2156 | 2161 | blob_append( &cmdNames, zErrPrefix, strlen(zErrPrefix) ); |
| 2157 | - json_pagedefs_to_string(pCommands, &cmdNames); | |
| 2162 | + json_pagedefs_to_string(pCommands, &cmdNames, 1); | |
| 2158 | 2163 | json_set_err(FSL_JSON_E_MISSING_ARGS, "%s", |
| 2159 | 2164 | blob_str(&cmdNames)); |
| 2160 | 2165 | blob_reset(&cmdNames); |
| 2161 | 2166 | } |
| 2162 | 2167 | |
| @@ -2245,10 +2250,12 @@ | ||
| 2245 | 2250 | cson_value * json_page_user(); |
| 2246 | 2251 | /* Impl in json_config.c. */ |
| 2247 | 2252 | cson_value * json_page_config(); |
| 2248 | 2253 | /* Impl in json_finfo.c. */ |
| 2249 | 2254 | cson_value * json_page_finfo(); |
| 2255 | +/* Impl in json_status.c. */ | |
| 2256 | +cson_value * json_page_status(); | |
| 2250 | 2257 | |
| 2251 | 2258 | /* |
| 2252 | 2259 | ** Mapping of names to JSON pages/commands. Each name is a subpath of |
| 2253 | 2260 | ** /json (in CGI mode) or a subcommand of the json command in CLI mode |
| 2254 | 2261 | */ |
| @@ -2269,10 +2276,11 @@ | ||
| 2269 | 2276 | {"query",json_page_query,0}, |
| 2270 | 2277 | {"rebuild",json_page_rebuild,0}, |
| 2271 | 2278 | {"report", json_page_report, 0}, |
| 2272 | 2279 | {"resultCodes", json_page_resultCodes,0}, |
| 2273 | 2280 | {"stat",json_page_stat,0}, |
| 2281 | +{"status", json_page_status, 0}, | |
| 2274 | 2282 | {"tag", json_page_tag,0}, |
| 2275 | 2283 | /*{"ticket", json_page_nyi,0},*/ |
| 2276 | 2284 | {"timeline", json_page_timeline,0}, |
| 2277 | 2285 | {"user",json_page_user,0}, |
| 2278 | 2286 | {"version",json_page_version,0}, |
| 2279 | 2287 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -239,10 +239,11 @@ | |
| 239 | C(STMT_EXEC,"Statement execution/stepping failed"); |
| 240 | C(DB_LOCKED,"Database is locked"); |
| 241 | C(DB_NEEDS_REBUILD,"Fossil repository needs to be rebuilt"); |
| 242 | C(DB_NOT_FOUND,"Fossil repository db file could not be found."); |
| 243 | C(DB_NOT_VALID, "Fossil repository db file is not valid."); |
| 244 | #undef C |
| 245 | default: |
| 246 | return "Unknown Error"; |
| 247 | } |
| 248 | } |
| @@ -2117,18 +2118,22 @@ | |
| 2117 | ** taken from zPages. zPages must be an array of objects |
| 2118 | ** whose final entry MUST have a NULL name value or results |
| 2119 | ** are undefined. |
| 2120 | ** |
| 2121 | ** The list is appended to pOut. The number of items (not bytes) |
| 2122 | ** appended are returned. |
| 2123 | */ |
| 2124 | static int json_pagedefs_to_string(JsonPageDef const * zPages, |
| 2125 | Blob * pOut){ |
| 2126 | int i = 0; |
| 2127 | for( ; zPages->name; ++zPages, ++i ){ |
| 2128 | if(g.isHTTP && zPages->runMode < 0) continue; |
| 2129 | else if(zPages->runMode > 0) continue; |
| 2130 | blob_appendf(pOut, zPages->name, -1); |
| 2131 | if((zPages+1)->name){ |
| 2132 | blob_append(pOut, ", ",2); |
| 2133 | } |
| 2134 | } |
| @@ -2152,11 +2157,11 @@ | |
| 2152 | blob_init(&cmdNames,NULL,0); |
| 2153 | if( !zErrPrefix ) { |
| 2154 | zErrPrefix = "Try one of: "; |
| 2155 | } |
| 2156 | blob_append( &cmdNames, zErrPrefix, strlen(zErrPrefix) ); |
| 2157 | json_pagedefs_to_string(pCommands, &cmdNames); |
| 2158 | json_set_err(FSL_JSON_E_MISSING_ARGS, "%s", |
| 2159 | blob_str(&cmdNames)); |
| 2160 | blob_reset(&cmdNames); |
| 2161 | } |
| 2162 | |
| @@ -2245,10 +2250,12 @@ | |
| 2245 | cson_value * json_page_user(); |
| 2246 | /* Impl in json_config.c. */ |
| 2247 | cson_value * json_page_config(); |
| 2248 | /* Impl in json_finfo.c. */ |
| 2249 | cson_value * json_page_finfo(); |
| 2250 | |
| 2251 | /* |
| 2252 | ** Mapping of names to JSON pages/commands. Each name is a subpath of |
| 2253 | ** /json (in CGI mode) or a subcommand of the json command in CLI mode |
| 2254 | */ |
| @@ -2269,10 +2276,11 @@ | |
| 2269 | {"query",json_page_query,0}, |
| 2270 | {"rebuild",json_page_rebuild,0}, |
| 2271 | {"report", json_page_report, 0}, |
| 2272 | {"resultCodes", json_page_resultCodes,0}, |
| 2273 | {"stat",json_page_stat,0}, |
| 2274 | {"tag", json_page_tag,0}, |
| 2275 | /*{"ticket", json_page_nyi,0},*/ |
| 2276 | {"timeline", json_page_timeline,0}, |
| 2277 | {"user",json_page_user,0}, |
| 2278 | {"version",json_page_version,0}, |
| 2279 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -239,10 +239,11 @@ | |
| 239 | C(STMT_EXEC,"Statement execution/stepping failed"); |
| 240 | C(DB_LOCKED,"Database is locked"); |
| 241 | C(DB_NEEDS_REBUILD,"Fossil repository needs to be rebuilt"); |
| 242 | C(DB_NOT_FOUND,"Fossil repository db file could not be found."); |
| 243 | C(DB_NOT_VALID, "Fossil repository db file is not valid."); |
| 244 | C(DB_NEEDS_CHECKOUT, "Command requires a local checkout."); |
| 245 | #undef C |
| 246 | default: |
| 247 | return "Unknown Error"; |
| 248 | } |
| 249 | } |
| @@ -2117,18 +2118,22 @@ | |
| 2118 | ** taken from zPages. zPages must be an array of objects |
| 2119 | ** whose final entry MUST have a NULL name value or results |
| 2120 | ** are undefined. |
| 2121 | ** |
| 2122 | ** The list is appended to pOut. The number of items (not bytes) |
| 2123 | ** appended are returned. If filterByMode is non-0 then the result |
| 2124 | ** list will contain only commands which are able to run in the the |
| 2125 | ** current run mode (CLI vs. HTTP). |
| 2126 | */ |
| 2127 | static int json_pagedefs_to_string(JsonPageDef const * zPages, |
| 2128 | Blob * pOut, int filterByMode){ |
| 2129 | int i = 0; |
| 2130 | for( ; zPages->name; ++zPages, ++i ){ |
| 2131 | if(filterByMode){ |
| 2132 | if(g.isHTTP && zPages->runMode < 0) continue; |
| 2133 | else if(zPages->runMode > 0) continue; |
| 2134 | } |
| 2135 | blob_appendf(pOut, zPages->name, -1); |
| 2136 | if((zPages+1)->name){ |
| 2137 | blob_append(pOut, ", ",2); |
| 2138 | } |
| 2139 | } |
| @@ -2152,11 +2157,11 @@ | |
| 2157 | blob_init(&cmdNames,NULL,0); |
| 2158 | if( !zErrPrefix ) { |
| 2159 | zErrPrefix = "Try one of: "; |
| 2160 | } |
| 2161 | blob_append( &cmdNames, zErrPrefix, strlen(zErrPrefix) ); |
| 2162 | json_pagedefs_to_string(pCommands, &cmdNames, 1); |
| 2163 | json_set_err(FSL_JSON_E_MISSING_ARGS, "%s", |
| 2164 | blob_str(&cmdNames)); |
| 2165 | blob_reset(&cmdNames); |
| 2166 | } |
| 2167 | |
| @@ -2245,10 +2250,12 @@ | |
| 2250 | cson_value * json_page_user(); |
| 2251 | /* Impl in json_config.c. */ |
| 2252 | cson_value * json_page_config(); |
| 2253 | /* Impl in json_finfo.c. */ |
| 2254 | cson_value * json_page_finfo(); |
| 2255 | /* Impl in json_status.c. */ |
| 2256 | cson_value * json_page_status(); |
| 2257 | |
| 2258 | /* |
| 2259 | ** Mapping of names to JSON pages/commands. Each name is a subpath of |
| 2260 | ** /json (in CGI mode) or a subcommand of the json command in CLI mode |
| 2261 | */ |
| @@ -2269,10 +2276,11 @@ | |
| 2276 | {"query",json_page_query,0}, |
| 2277 | {"rebuild",json_page_rebuild,0}, |
| 2278 | {"report", json_page_report, 0}, |
| 2279 | {"resultCodes", json_page_resultCodes,0}, |
| 2280 | {"stat",json_page_stat,0}, |
| 2281 | {"status", json_page_status, 0}, |
| 2282 | {"tag", json_page_tag,0}, |
| 2283 | /*{"ticket", json_page_nyi,0},*/ |
| 2284 | {"timeline", json_page_timeline,0}, |
| 2285 | {"user",json_page_user,0}, |
| 2286 | {"version",json_page_version,0}, |
| 2287 |
+8
-5
| --- src/json_detail.h | ||
| +++ src/json_detail.h | ||
| @@ -103,12 +103,18 @@ | ||
| 103 | 103 | FSL_JSON_E_STMT_EXEC /*+3*/, |
| 104 | 104 | FSL_JSON_E_DB_LOCKED /*+4*/, |
| 105 | 105 | |
| 106 | 106 | FSL_JSON_E_DB_NEEDS_REBUILD = FSL_JSON_E_DB + 101, |
| 107 | 107 | FSL_JSON_E_DB_NOT_FOUND = FSL_JSON_E_DB + 102, |
| 108 | -FSL_JSON_E_DB_NOT_VALID = FSL_JSON_E_DB + 103 | |
| 109 | - | |
| 108 | +FSL_JSON_E_DB_NOT_VALID = FSL_JSON_E_DB + 103, | |
| 109 | +/* | |
| 110 | +** Maintenance reminder: FSL_JSON_E_DB_NOT_FOUND gets triggered in the | |
| 111 | +** bootstrapping process before we know whether we need to check for | |
| 112 | +** FSL_JSON_E_DB_NEEDS_CHECKOUT. Thus the former error trumps the | |
| 113 | +** latter. | |
| 114 | +*/ | |
| 115 | +FSL_JSON_E_DB_NEEDS_CHECKOUT = FSL_JSON_E_DB + 104 | |
| 110 | 116 | }; |
| 111 | 117 | |
| 112 | 118 | |
| 113 | 119 | /* |
| 114 | 120 | ** Signature for JSON page/command callbacks. Each callback is |
| @@ -177,13 +183,10 @@ | ||
| 177 | 183 | ** <0 = CLI only, >0 = HTTP only, 0==both |
| 178 | 184 | ** |
| 179 | 185 | ** Now that we can simulate POST in CLI mode, the distinction |
| 180 | 186 | ** between them has disappeared in most (or all) cases, so 0 is |
| 181 | 187 | ** the standard value. |
| 182 | - ** | |
| 183 | - ** 201207: this is not needed any more. We can get rid of it. Or | |
| 184 | - ** keep it around in case it becomes useful again at some point. | |
| 185 | 188 | */ |
| 186 | 189 | char runMode; |
| 187 | 190 | } JsonPageDef; |
| 188 | 191 | |
| 189 | 192 | /* |
| 190 | 193 | |
| 191 | 194 | ADDED src/json_status.c |
| --- src/json_detail.h | |
| +++ src/json_detail.h | |
| @@ -103,12 +103,18 @@ | |
| 103 | FSL_JSON_E_STMT_EXEC /*+3*/, |
| 104 | FSL_JSON_E_DB_LOCKED /*+4*/, |
| 105 | |
| 106 | FSL_JSON_E_DB_NEEDS_REBUILD = FSL_JSON_E_DB + 101, |
| 107 | FSL_JSON_E_DB_NOT_FOUND = FSL_JSON_E_DB + 102, |
| 108 | FSL_JSON_E_DB_NOT_VALID = FSL_JSON_E_DB + 103 |
| 109 | |
| 110 | }; |
| 111 | |
| 112 | |
| 113 | /* |
| 114 | ** Signature for JSON page/command callbacks. Each callback is |
| @@ -177,13 +183,10 @@ | |
| 177 | ** <0 = CLI only, >0 = HTTP only, 0==both |
| 178 | ** |
| 179 | ** Now that we can simulate POST in CLI mode, the distinction |
| 180 | ** between them has disappeared in most (or all) cases, so 0 is |
| 181 | ** the standard value. |
| 182 | ** |
| 183 | ** 201207: this is not needed any more. We can get rid of it. Or |
| 184 | ** keep it around in case it becomes useful again at some point. |
| 185 | */ |
| 186 | char runMode; |
| 187 | } JsonPageDef; |
| 188 | |
| 189 | /* |
| 190 | |
| 191 | DDED src/json_status.c |
| --- src/json_detail.h | |
| +++ src/json_detail.h | |
| @@ -103,12 +103,18 @@ | |
| 103 | FSL_JSON_E_STMT_EXEC /*+3*/, |
| 104 | FSL_JSON_E_DB_LOCKED /*+4*/, |
| 105 | |
| 106 | FSL_JSON_E_DB_NEEDS_REBUILD = FSL_JSON_E_DB + 101, |
| 107 | FSL_JSON_E_DB_NOT_FOUND = FSL_JSON_E_DB + 102, |
| 108 | FSL_JSON_E_DB_NOT_VALID = FSL_JSON_E_DB + 103, |
| 109 | /* |
| 110 | ** Maintenance reminder: FSL_JSON_E_DB_NOT_FOUND gets triggered in the |
| 111 | ** bootstrapping process before we know whether we need to check for |
| 112 | ** FSL_JSON_E_DB_NEEDS_CHECKOUT. Thus the former error trumps the |
| 113 | ** latter. |
| 114 | */ |
| 115 | FSL_JSON_E_DB_NEEDS_CHECKOUT = FSL_JSON_E_DB + 104 |
| 116 | }; |
| 117 | |
| 118 | |
| 119 | /* |
| 120 | ** Signature for JSON page/command callbacks. Each callback is |
| @@ -177,13 +183,10 @@ | |
| 183 | ** <0 = CLI only, >0 = HTTP only, 0==both |
| 184 | ** |
| 185 | ** Now that we can simulate POST in CLI mode, the distinction |
| 186 | ** between them has disappeared in most (or all) cases, so 0 is |
| 187 | ** the standard value. |
| 188 | */ |
| 189 | char runMode; |
| 190 | } JsonPageDef; |
| 191 | |
| 192 | /* |
| 193 | |
| 194 | DDED src/json_status.c |
+195
| --- a/src/json_status.c | ||
| +++ b/src/json_status.c | ||
| @@ -0,0 +1,195 @@ | ||
| 1 | +#ifdef FOSSIL_ENABLE_JSON | |
| 2 | +/* | |
| 3 | +** Copyright (c) 2013 D. Richard Hipp | |
| 4 | +** | |
| 5 | +** This program is free software; you can redistribute it and/or | |
| 6 | +** modify it under the terms of the Simplified BSD License (also | |
| 7 | +** known as the "2-Clause License" or "FreeBSD License".) | |
| 8 | +** | |
| 9 | +** This program is distributed in the hope that it will be useful, | |
| 10 | +** but without any warranty; without even the implied warranty of | |
| 11 | +** merchantability or fitness for a particular purpose. | |
| 12 | +** | |
| 13 | +** Author contact information: | |
| 14 | +** [email protected] | |
| 15 | +** http://www.hwaci.com/drh/ | |
| 16 | +** | |
| 17 | +*/ | |
| 18 | + | |
| 19 | +#include "config.h" | |
| 20 | +#include "json_status.h" | |
| 21 | + | |
| 22 | +#if INTERFACE | |
| 23 | +#include "json_detail.h" | |
| 24 | +#endif | |
| 25 | + | |
| 26 | +/* | |
| 27 | +Reminder to check if a column exists: | |
| 28 | + | |
| 29 | +PRAGMA table_info(table_name) | |
| 30 | + | |
| 31 | +and search for a row where the 'name' field matches. | |
| 32 | + | |
| 33 | +That assumes, of course, that table_info()'s output format | |
| 34 | +is stable. | |
| 35 | +*/ | |
| 36 | + | |
| 37 | +/* | |
| 38 | +** Implementation of the /json/status page. | |
| 39 | +** | |
| 40 | +*/ | |
| 41 | +cson_value * json_page_status(){ | |
| 42 | + char const * zSql = NULL; | |
| 43 | + Stmt q = empty_Stmt; | |
| 44 | + cson_object * oPay; | |
| 45 | + /*cson_object * files;*/ | |
| 46 | + int vid, nErr = 0; | |
| 47 | + cson_object * tmpO; | |
| 48 | + char * zTmp; | |
| 49 | + i64 iMtime; | |
| 50 | + cson_array * aFles; | |
| 51 | + | |
| 52 | + if(!db_o open_local(0)){ | |
| 53 | + json_set_er,urn NULL; | |
| 54 | + } | |
| 55 | + oPay = cson_new_object(); | |
| 56 | + cson_object_set(oPay, "repository", | |
| 57 | + json_new_string(db_repository_filename())); | |
| 58 | + cson_object_set(oPay, "localRoot", | |
| 59 | + json_new_string(g.zLocalRoot)); | |
| 60 | + vid = db_lget_int("checkout", 0); | |
| 61 | + if(!vid){ | |
| 62 | + json_set_err( FSL_JSON_E_UNKNOWN, "Can this even happen?" ); | |
| 63 | + return 0; | |
| 64 | + } | |
| 65 | + vfile_check_signature(vid, 0); | |
| 66 | + /* TODO:show_common_info() state */ | |
| 67 | + tmpO = cson_new_object(); | |
| 68 | + cson_???object(); | |
| 69 | + cson_object_set(oPay, "checkout", cson_object_value(tmpO)); | |
| 70 | + | |
| 71 | + zTmp = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid); | |
| 72 | + cson_object_set(tmpO, "uuid", json_new_string(zTmp) ); | |
| 73 | + free(zTmp); | |
| 74 | + | |
| 75 | + cson_object_set( tmpO, "tags", json_tags_for_checkin_rid(vi,wd 0t(0, "Spen_local(0)){ | |
| 76 | + json_set_erct(); | |
| 77 | + cson_object_set(oPay, "repository", | |
| 78 | + json_new_string(db_repository_filename())); | |
| 79 | + cson_object_set(oPay, "localRoot", | |
| 80 | + et_int("checkout", 0); | |
| 81 | + if(!vid){ | |
| 82 | + json_set_err( FSL_JSON_E_UNKNOWN, "Can this even happen?" ); | |
| 83 | + return 0; | |
| 84 | + } | |
| 85 | + vfile_check_sig#ifdef FOSSIL_ENABLE_JSON | |
| 86 | +/* | |
| 87 | +** Copyright (c) 2013 D. Richard Hipp | |
| 88 | +** | |
| 89 | +** This program is free software; you can redistribute it and/or | |
| 90 | +** modify it under the terms of the Simplified BSD License (also | |
| 91 | +** known as the "2-Clause License" or "FreeBSD License".) | |
| 92 | +** | |
| 93 | +** This program is distributed in the hope that it will be useful, | |
| 94 | +** but without any warranty; without even the implied warranty of | |
| 95 | +** merchantability or fitness for a particular purpose. | |
| 96 | +** | |
| 97 | +** Author contact information: | |
| 98 | +** [email protected] | |
| 99 | +** http://www.hwaci.com/drh/ | |
| 100 | +** | |
| 101 | +*/ | |
| 102 | + | |
| 103 | +#include "config.h" | |
| 104 | +#include "json_status.h" | |
| 105 | + | |
| 106 | +#if INTERFACE | |
| 107 | +#include "json_detail.h" | |
| 108 | +#endif | |
| 109 | + | |
| 110 | +/* | |
| 111 | +Reminder to check if a column exists: | |
| 112 | + | |
| 113 | +PRAGMA table_info(table_name) | |
| 114 | + | |
| 115 | +and search for a row where the 'name' field matches. | |
| 116 | + | |
| 117 | +That assumes, of course, that table_info()'s output format | |
| 118 | +is stable. | |
| 119 | +*/ | |
| 120 | + | |
| 121 | +/* | |
| 122 | +** Implementation of thelRoot", | |
| 123 | + json_new_string(g.zLocalRoot)); | |
| 124 | + vid = db_lget_int("checkout", 0); | |
| 125 | + if(!vid){ | |
| 126 | + json_set_err( FSL_JSON_E_UNKNOWN, "Can this even happen?" ); | |
| 127 | + return 0; | |
| 128 | + } | |
| 129 | + vfile_check_signature(vid, 0); | |
| 130 | + /* TODO:show_common_info() state */ | |
| 131 | + tmpO = cson_new_object(); | |
| 132 | + cson_???object(); | |
| 133 | + cson_object_set(oPay, "checkout", cson_object_value(tmpO)); | |
| 134 | + | |
| 135 | + zTmp = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid); | |
| 136 | + cson_object_set(tmpO, "uuid", json_new_string(zTmp) ); | |
| 137 | + free(zTmp); | |
| 138 | + | |
| 139 | + cson_object_set( tmpO, "tags", json_tags_for_checkin_rid(vi,wd 0t(0, "Spen_local(0)){ | |
| 140 | + json_set_erct(); | |
| 141 | + cson_object_set(oPay, "repository", | |
| 142 | + json_new_string(db_repository_filename())); | |
| 143 | + cson_object_set(oPay, "localRoot", | |
| 144 | + et_int("checkout", 0); | |
| 145 | + if(!vid){ | |
| 146 | + json_set_err( FSL_JSON_E_UNKNOWN, "Can this even happen?" ); | |
| 147 | + return 0; | |
| 148 | + } | |
| 149 | + vfile_check_sig#ifdef FOSSIL_ENABLE_JSON | |
| 150 | +/* | |
| 151 | +** Copyright (c) 2013 D. Richard Hipp | |
| 152 | +** | |
| 153 | +** This program is free software; you can redistribute it and/or | |
| 154 | +** modify it under the terms of the Simplified BSD License (also | |
| 155 | +** known as the "2-Clause License" or "FreeBSD License".) | |
| 156 | +** | |
| 157 | +** This program is distributed in the hope that it will be useful, | |
| 158 | +** but without any warranty; without even the implied warranty of | |
| 159 | +** merchantability or fitness for a particular purpose. | |
| 160 | +** | |
| 161 | +** Author contact information: | |
| 162 | +** [email protected] | |
| 163 | +** http://www.hwaci.com/drh/ | |
| 164 | +** | |
| 165 | +*/ | |
| 166 | + | |
| 167 | +#include "config.h" | |
| 168 | +#include "json_status.h" | |
| 169 | + | |
| 170 | +#if INTERFACE | |
| 171 | +#include "json_detail.h" | |
| 172 | +#endif | |
| 173 | + | |
| 174 | +/* | |
| 175 | +Reminder to check if a column exists: | |
| 176 | + | |
| 177 | +PRAGMA table_info(table_name) | |
| 178 | + | |
| 179 | +and search for a row where the 'name' field matches. | |
| 180 | + | |
| 181 | +That assumes, of course, that table_info()'s output format | |
| 182 | +is stable. | |
| 183 | +*/ | |
| 184 | + | |
| 185 | +/* | |
| 186 | +** Implementation of the /json/status page. | |
| 187 | +** | |
| 188 | +*/ | |
| 189 | +cson_value * json_page_status(){ | |
| 190 | + Stmt q = empty_Stmt; | |
| 191 | + cson_object * oPay; | |
| 192 | + /*cson_object * files;*/ | |
| 193 | + int vid, nErr = 0; | |
| 194 | + cson_object * tmpO; | |
| 195 | + char * zTC |
| --- a/src/json_status.c | |
| +++ b/src/json_status.c | |
| @@ -0,0 +1,195 @@ | |
| --- a/src/json_status.c | |
| +++ b/src/json_status.c | |
| @@ -0,0 +1,195 @@ | |
| 1 | #ifdef FOSSIL_ENABLE_JSON |
| 2 | /* |
| 3 | ** Copyright (c) 2013 D. Richard Hipp |
| 4 | ** |
| 5 | ** This program is free software; you can redistribute it and/or |
| 6 | ** modify it under the terms of the Simplified BSD License (also |
| 7 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 8 | ** |
| 9 | ** This program is distributed in the hope that it will be useful, |
| 10 | ** but without any warranty; without even the implied warranty of |
| 11 | ** merchantability or fitness for a particular purpose. |
| 12 | ** |
| 13 | ** Author contact information: |
| 14 | ** [email protected] |
| 15 | ** http://www.hwaci.com/drh/ |
| 16 | ** |
| 17 | */ |
| 18 | |
| 19 | #include "config.h" |
| 20 | #include "json_status.h" |
| 21 | |
| 22 | #if INTERFACE |
| 23 | #include "json_detail.h" |
| 24 | #endif |
| 25 | |
| 26 | /* |
| 27 | Reminder to check if a column exists: |
| 28 | |
| 29 | PRAGMA table_info(table_name) |
| 30 | |
| 31 | and search for a row where the 'name' field matches. |
| 32 | |
| 33 | That assumes, of course, that table_info()'s output format |
| 34 | is stable. |
| 35 | */ |
| 36 | |
| 37 | /* |
| 38 | ** Implementation of the /json/status page. |
| 39 | ** |
| 40 | */ |
| 41 | cson_value * json_page_status(){ |
| 42 | char const * zSql = NULL; |
| 43 | Stmt q = empty_Stmt; |
| 44 | cson_object * oPay; |
| 45 | /*cson_object * files;*/ |
| 46 | int vid, nErr = 0; |
| 47 | cson_object * tmpO; |
| 48 | char * zTmp; |
| 49 | i64 iMtime; |
| 50 | cson_array * aFles; |
| 51 | |
| 52 | if(!db_o open_local(0)){ |
| 53 | json_set_er,urn NULL; |
| 54 | } |
| 55 | oPay = cson_new_object(); |
| 56 | cson_object_set(oPay, "repository", |
| 57 | json_new_string(db_repository_filename())); |
| 58 | cson_object_set(oPay, "localRoot", |
| 59 | json_new_string(g.zLocalRoot)); |
| 60 | vid = db_lget_int("checkout", 0); |
| 61 | if(!vid){ |
| 62 | json_set_err( FSL_JSON_E_UNKNOWN, "Can this even happen?" ); |
| 63 | return 0; |
| 64 | } |
| 65 | vfile_check_signature(vid, 0); |
| 66 | /* TODO:show_common_info() state */ |
| 67 | tmpO = cson_new_object(); |
| 68 | cson_???object(); |
| 69 | cson_object_set(oPay, "checkout", cson_object_value(tmpO)); |
| 70 | |
| 71 | zTmp = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid); |
| 72 | cson_object_set(tmpO, "uuid", json_new_string(zTmp) ); |
| 73 | free(zTmp); |
| 74 | |
| 75 | cson_object_set( tmpO, "tags", json_tags_for_checkin_rid(vi,wd 0t(0, "Spen_local(0)){ |
| 76 | json_set_erct(); |
| 77 | cson_object_set(oPay, "repository", |
| 78 | json_new_string(db_repository_filename())); |
| 79 | cson_object_set(oPay, "localRoot", |
| 80 | et_int("checkout", 0); |
| 81 | if(!vid){ |
| 82 | json_set_err( FSL_JSON_E_UNKNOWN, "Can this even happen?" ); |
| 83 | return 0; |
| 84 | } |
| 85 | vfile_check_sig#ifdef FOSSIL_ENABLE_JSON |
| 86 | /* |
| 87 | ** Copyright (c) 2013 D. Richard Hipp |
| 88 | ** |
| 89 | ** This program is free software; you can redistribute it and/or |
| 90 | ** modify it under the terms of the Simplified BSD License (also |
| 91 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 92 | ** |
| 93 | ** This program is distributed in the hope that it will be useful, |
| 94 | ** but without any warranty; without even the implied warranty of |
| 95 | ** merchantability or fitness for a particular purpose. |
| 96 | ** |
| 97 | ** Author contact information: |
| 98 | ** [email protected] |
| 99 | ** http://www.hwaci.com/drh/ |
| 100 | ** |
| 101 | */ |
| 102 | |
| 103 | #include "config.h" |
| 104 | #include "json_status.h" |
| 105 | |
| 106 | #if INTERFACE |
| 107 | #include "json_detail.h" |
| 108 | #endif |
| 109 | |
| 110 | /* |
| 111 | Reminder to check if a column exists: |
| 112 | |
| 113 | PRAGMA table_info(table_name) |
| 114 | |
| 115 | and search for a row where the 'name' field matches. |
| 116 | |
| 117 | That assumes, of course, that table_info()'s output format |
| 118 | is stable. |
| 119 | */ |
| 120 | |
| 121 | /* |
| 122 | ** Implementation of thelRoot", |
| 123 | json_new_string(g.zLocalRoot)); |
| 124 | vid = db_lget_int("checkout", 0); |
| 125 | if(!vid){ |
| 126 | json_set_err( FSL_JSON_E_UNKNOWN, "Can this even happen?" ); |
| 127 | return 0; |
| 128 | } |
| 129 | vfile_check_signature(vid, 0); |
| 130 | /* TODO:show_common_info() state */ |
| 131 | tmpO = cson_new_object(); |
| 132 | cson_???object(); |
| 133 | cson_object_set(oPay, "checkout", cson_object_value(tmpO)); |
| 134 | |
| 135 | zTmp = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid); |
| 136 | cson_object_set(tmpO, "uuid", json_new_string(zTmp) ); |
| 137 | free(zTmp); |
| 138 | |
| 139 | cson_object_set( tmpO, "tags", json_tags_for_checkin_rid(vi,wd 0t(0, "Spen_local(0)){ |
| 140 | json_set_erct(); |
| 141 | cson_object_set(oPay, "repository", |
| 142 | json_new_string(db_repository_filename())); |
| 143 | cson_object_set(oPay, "localRoot", |
| 144 | et_int("checkout", 0); |
| 145 | if(!vid){ |
| 146 | json_set_err( FSL_JSON_E_UNKNOWN, "Can this even happen?" ); |
| 147 | return 0; |
| 148 | } |
| 149 | vfile_check_sig#ifdef FOSSIL_ENABLE_JSON |
| 150 | /* |
| 151 | ** Copyright (c) 2013 D. Richard Hipp |
| 152 | ** |
| 153 | ** This program is free software; you can redistribute it and/or |
| 154 | ** modify it under the terms of the Simplified BSD License (also |
| 155 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 156 | ** |
| 157 | ** This program is distributed in the hope that it will be useful, |
| 158 | ** but without any warranty; without even the implied warranty of |
| 159 | ** merchantability or fitness for a particular purpose. |
| 160 | ** |
| 161 | ** Author contact information: |
| 162 | ** [email protected] |
| 163 | ** http://www.hwaci.com/drh/ |
| 164 | ** |
| 165 | */ |
| 166 | |
| 167 | #include "config.h" |
| 168 | #include "json_status.h" |
| 169 | |
| 170 | #if INTERFACE |
| 171 | #include "json_detail.h" |
| 172 | #endif |
| 173 | |
| 174 | /* |
| 175 | Reminder to check if a column exists: |
| 176 | |
| 177 | PRAGMA table_info(table_name) |
| 178 | |
| 179 | and search for a row where the 'name' field matches. |
| 180 | |
| 181 | That assumes, of course, that table_info()'s output format |
| 182 | is stable. |
| 183 | */ |
| 184 | |
| 185 | /* |
| 186 | ** Implementation of the /json/status page. |
| 187 | ** |
| 188 | */ |
| 189 | cson_value * json_page_status(){ |
| 190 | Stmt q = empty_Stmt; |
| 191 | cson_object * oPay; |
| 192 | /*cson_object * files;*/ |
| 193 | int vid, nErr = 0; |
| 194 | cson_object * tmpO; |
| 195 | char * zTC |
+12
-2
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -60,10 +60,11 @@ | ||
| 60 | 60 | $(SRCDIR)/json_dir.c \ |
| 61 | 61 | $(SRCDIR)/json_finfo.c \ |
| 62 | 62 | $(SRCDIR)/json_login.c \ |
| 63 | 63 | $(SRCDIR)/json_query.c \ |
| 64 | 64 | $(SRCDIR)/json_report.c \ |
| 65 | + $(SRCDIR)/json_status.c \ | |
| 65 | 66 | $(SRCDIR)/json_tag.c \ |
| 66 | 67 | $(SRCDIR)/json_timeline.c \ |
| 67 | 68 | $(SRCDIR)/json_user.c \ |
| 68 | 69 | $(SRCDIR)/json_wiki.c \ |
| 69 | 70 | $(SRCDIR)/leaf.c \ |
| @@ -167,10 +168,11 @@ | ||
| 167 | 168 | $(OBJDIR)/json_dir_.c \ |
| 168 | 169 | $(OBJDIR)/json_finfo_.c \ |
| 169 | 170 | $(OBJDIR)/json_login_.c \ |
| 170 | 171 | $(OBJDIR)/json_query_.c \ |
| 171 | 172 | $(OBJDIR)/json_report_.c \ |
| 173 | + $(OBJDIR)/json_status_.c \ | |
| 172 | 174 | $(OBJDIR)/json_tag_.c \ |
| 173 | 175 | $(OBJDIR)/json_timeline_.c \ |
| 174 | 176 | $(OBJDIR)/json_user_.c \ |
| 175 | 177 | $(OBJDIR)/json_wiki_.c \ |
| 176 | 178 | $(OBJDIR)/leaf_.c \ |
| @@ -274,10 +276,11 @@ | ||
| 274 | 276 | $(OBJDIR)/json_dir.o \ |
| 275 | 277 | $(OBJDIR)/json_finfo.o \ |
| 276 | 278 | $(OBJDIR)/json_login.o \ |
| 277 | 279 | $(OBJDIR)/json_query.o \ |
| 278 | 280 | $(OBJDIR)/json_report.o \ |
| 281 | + $(OBJDIR)/json_status.o \ | |
| 279 | 282 | $(OBJDIR)/json_tag.o \ |
| 280 | 283 | $(OBJDIR)/json_timeline.o \ |
| 281 | 284 | $(OBJDIR)/json_user.o \ |
| 282 | 285 | $(OBJDIR)/json_wiki.o \ |
| 283 | 286 | $(OBJDIR)/leaf.o \ |
| @@ -399,14 +402,14 @@ | ||
| 399 | 402 | |
| 400 | 403 | |
| 401 | 404 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 402 | 405 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 403 | 406 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 404 | - $(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_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.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_user_.c:$(OBJDIR)/json_user.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)/markdown_.c:$(OBJDIR)/markdown.h $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.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)/regexp_.c:$(OBJDIR)/regexp.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)/unicode_.c:$(OBJDIR)/unicode.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/util_.c:$(OBJDIR)/util.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)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h | |
| 407 | + $(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_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.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_status_.c:$(OBJDIR)/json_status.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.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)/markdown_.c:$(OBJDIR)/markdown.h $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.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)/regexp_.c:$(OBJDIR)/regexp.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)/unicode_.c:$(OBJDIR)/unicode.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/util_.c:$(OBJDIR)/util.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)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h | |
| 405 | 408 | touch $(OBJDIR)/headers |
| 406 | 409 | $(OBJDIR)/headers: Makefile |
| 407 | -$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h | |
| 410 | +$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h | |
| 408 | 411 | Makefile: |
| 409 | 412 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| 410 | 413 | $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 411 | 414 | |
| 412 | 415 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| @@ -740,10 +743,17 @@ | ||
| 740 | 743 | |
| 741 | 744 | $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h |
| 742 | 745 | $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c |
| 743 | 746 | |
| 744 | 747 | $(OBJDIR)/json_report.h: $(OBJDIR)/headers |
| 748 | +$(OBJDIR)/json_status_.c: $(SRCDIR)/json_status.c $(OBJDIR)/translate | |
| 749 | + $(OBJDIR)/translate $(SRCDIR)/json_status.c >$(OBJDIR)/json_status_.c | |
| 750 | + | |
| 751 | +$(OBJDIR)/json_status.o: $(OBJDIR)/json_status_.c $(OBJDIR)/json_status.h $(SRCDIR)/config.h | |
| 752 | + $(XTCC) -o $(OBJDIR)/json_status.o -c $(OBJDIR)/json_status_.c | |
| 753 | + | |
| 754 | +$(OBJDIR)/json_status.h: $(OBJDIR)/headers | |
| 745 | 755 | $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate |
| 746 | 756 | $(OBJDIR)/translate $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c |
| 747 | 757 | |
| 748 | 758 | $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h |
| 749 | 759 | $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c |
| 750 | 760 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -60,10 +60,11 @@ | |
| 60 | $(SRCDIR)/json_dir.c \ |
| 61 | $(SRCDIR)/json_finfo.c \ |
| 62 | $(SRCDIR)/json_login.c \ |
| 63 | $(SRCDIR)/json_query.c \ |
| 64 | $(SRCDIR)/json_report.c \ |
| 65 | $(SRCDIR)/json_tag.c \ |
| 66 | $(SRCDIR)/json_timeline.c \ |
| 67 | $(SRCDIR)/json_user.c \ |
| 68 | $(SRCDIR)/json_wiki.c \ |
| 69 | $(SRCDIR)/leaf.c \ |
| @@ -167,10 +168,11 @@ | |
| 167 | $(OBJDIR)/json_dir_.c \ |
| 168 | $(OBJDIR)/json_finfo_.c \ |
| 169 | $(OBJDIR)/json_login_.c \ |
| 170 | $(OBJDIR)/json_query_.c \ |
| 171 | $(OBJDIR)/json_report_.c \ |
| 172 | $(OBJDIR)/json_tag_.c \ |
| 173 | $(OBJDIR)/json_timeline_.c \ |
| 174 | $(OBJDIR)/json_user_.c \ |
| 175 | $(OBJDIR)/json_wiki_.c \ |
| 176 | $(OBJDIR)/leaf_.c \ |
| @@ -274,10 +276,11 @@ | |
| 274 | $(OBJDIR)/json_dir.o \ |
| 275 | $(OBJDIR)/json_finfo.o \ |
| 276 | $(OBJDIR)/json_login.o \ |
| 277 | $(OBJDIR)/json_query.o \ |
| 278 | $(OBJDIR)/json_report.o \ |
| 279 | $(OBJDIR)/json_tag.o \ |
| 280 | $(OBJDIR)/json_timeline.o \ |
| 281 | $(OBJDIR)/json_user.o \ |
| 282 | $(OBJDIR)/json_wiki.o \ |
| 283 | $(OBJDIR)/leaf.o \ |
| @@ -399,14 +402,14 @@ | |
| 399 | |
| 400 | |
| 401 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 402 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 403 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 404 | $(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_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.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_user_.c:$(OBJDIR)/json_user.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)/markdown_.c:$(OBJDIR)/markdown.h $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.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)/regexp_.c:$(OBJDIR)/regexp.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)/unicode_.c:$(OBJDIR)/unicode.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/util_.c:$(OBJDIR)/util.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)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h |
| 405 | touch $(OBJDIR)/headers |
| 406 | $(OBJDIR)/headers: Makefile |
| 407 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 408 | Makefile: |
| 409 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| 410 | $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 411 | |
| 412 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| @@ -740,10 +743,17 @@ | |
| 740 | |
| 741 | $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h |
| 742 | $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c |
| 743 | |
| 744 | $(OBJDIR)/json_report.h: $(OBJDIR)/headers |
| 745 | $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate |
| 746 | $(OBJDIR)/translate $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c |
| 747 | |
| 748 | $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h |
| 749 | $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c |
| 750 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -60,10 +60,11 @@ | |
| 60 | $(SRCDIR)/json_dir.c \ |
| 61 | $(SRCDIR)/json_finfo.c \ |
| 62 | $(SRCDIR)/json_login.c \ |
| 63 | $(SRCDIR)/json_query.c \ |
| 64 | $(SRCDIR)/json_report.c \ |
| 65 | $(SRCDIR)/json_status.c \ |
| 66 | $(SRCDIR)/json_tag.c \ |
| 67 | $(SRCDIR)/json_timeline.c \ |
| 68 | $(SRCDIR)/json_user.c \ |
| 69 | $(SRCDIR)/json_wiki.c \ |
| 70 | $(SRCDIR)/leaf.c \ |
| @@ -167,10 +168,11 @@ | |
| 168 | $(OBJDIR)/json_dir_.c \ |
| 169 | $(OBJDIR)/json_finfo_.c \ |
| 170 | $(OBJDIR)/json_login_.c \ |
| 171 | $(OBJDIR)/json_query_.c \ |
| 172 | $(OBJDIR)/json_report_.c \ |
| 173 | $(OBJDIR)/json_status_.c \ |
| 174 | $(OBJDIR)/json_tag_.c \ |
| 175 | $(OBJDIR)/json_timeline_.c \ |
| 176 | $(OBJDIR)/json_user_.c \ |
| 177 | $(OBJDIR)/json_wiki_.c \ |
| 178 | $(OBJDIR)/leaf_.c \ |
| @@ -274,10 +276,11 @@ | |
| 276 | $(OBJDIR)/json_dir.o \ |
| 277 | $(OBJDIR)/json_finfo.o \ |
| 278 | $(OBJDIR)/json_login.o \ |
| 279 | $(OBJDIR)/json_query.o \ |
| 280 | $(OBJDIR)/json_report.o \ |
| 281 | $(OBJDIR)/json_status.o \ |
| 282 | $(OBJDIR)/json_tag.o \ |
| 283 | $(OBJDIR)/json_timeline.o \ |
| 284 | $(OBJDIR)/json_user.o \ |
| 285 | $(OBJDIR)/json_wiki.o \ |
| 286 | $(OBJDIR)/leaf.o \ |
| @@ -399,14 +402,14 @@ | |
| 402 | |
| 403 | |
| 404 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 405 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 406 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 407 | $(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_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.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_status_.c:$(OBJDIR)/json_status.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.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)/markdown_.c:$(OBJDIR)/markdown.h $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.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)/regexp_.c:$(OBJDIR)/regexp.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)/unicode_.c:$(OBJDIR)/unicode.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/util_.c:$(OBJDIR)/util.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)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h |
| 408 | touch $(OBJDIR)/headers |
| 409 | $(OBJDIR)/headers: Makefile |
| 410 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 411 | Makefile: |
| 412 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| 413 | $(OBJDIR)/translate $(SRCDIR)/add.c >$(OBJDIR)/add_.c |
| 414 | |
| 415 | $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h |
| @@ -740,10 +743,17 @@ | |
| 743 | |
| 744 | $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h |
| 745 | $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c |
| 746 | |
| 747 | $(OBJDIR)/json_report.h: $(OBJDIR)/headers |
| 748 | $(OBJDIR)/json_status_.c: $(SRCDIR)/json_status.c $(OBJDIR)/translate |
| 749 | $(OBJDIR)/translate $(SRCDIR)/json_status.c >$(OBJDIR)/json_status_.c |
| 750 | |
| 751 | $(OBJDIR)/json_status.o: $(OBJDIR)/json_status_.c $(OBJDIR)/json_status.h $(SRCDIR)/config.h |
| 752 | $(XTCC) -o $(OBJDIR)/json_status.o -c $(OBJDIR)/json_status_.c |
| 753 | |
| 754 | $(OBJDIR)/json_status.h: $(OBJDIR)/headers |
| 755 | $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate |
| 756 | $(OBJDIR)/translate $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c |
| 757 | |
| 758 | $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h |
| 759 | $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c |
| 760 |
+5
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -63,10 +63,11 @@ | ||
| 63 | 63 | json_dir |
| 64 | 64 | json_finfo |
| 65 | 65 | json_login |
| 66 | 66 | json_query |
| 67 | 67 | json_report |
| 68 | + json_status | |
| 68 | 69 | json_tag |
| 69 | 70 | json_timeline |
| 70 | 71 | json_user |
| 71 | 72 | json_wiki |
| 72 | 73 | leaf |
| @@ -269,11 +270,11 @@ | ||
| 269 | 270 | writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@" |
| 270 | 271 | writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h" |
| 271 | 272 | writeln "\t\$(OBJDIR)/makeheaders $mhargs" |
| 272 | 273 | writeln "\ttouch \$(OBJDIR)/headers" |
| 273 | 274 | writeln "\$(OBJDIR)/headers: Makefile" |
| 274 | -writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" | |
| 275 | +writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" | |
| 275 | 276 | writeln "Makefile:" |
| 276 | 277 | set extra_h(main) \$(OBJDIR)/page_index.h |
| 277 | 278 | |
| 278 | 279 | foreach s [lsort $src] { |
| 279 | 280 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate" |
| @@ -753,11 +754,11 @@ | ||
| 753 | 754 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 754 | 755 | |
| 755 | 756 | set opt {} |
| 756 | 757 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 757 | 758 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n" |
| 758 | -writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n" | |
| 759 | +writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n" | |
| 759 | 760 | |
| 760 | 761 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 761 | 762 | set opt {-Dmain=sqlite3_shell} |
| 762 | 763 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 763 | 764 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| @@ -901,10 +902,11 @@ | ||
| 901 | 902 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 902 | 903 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 903 | 904 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 904 | 905 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 905 | 906 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 907 | +$(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h | |
| 906 | 908 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 907 | 909 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 908 | 910 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 909 | 911 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 910 | 912 | |
| @@ -1097,10 +1099,11 @@ | ||
| 1097 | 1099 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 1098 | 1100 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 1099 | 1101 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 1100 | 1102 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 1101 | 1103 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 1104 | +$(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h | |
| 1102 | 1105 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 1103 | 1106 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 1104 | 1107 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 1105 | 1108 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 1106 | 1109 | |
| 1107 | 1110 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -63,10 +63,11 @@ | |
| 63 | json_dir |
| 64 | json_finfo |
| 65 | json_login |
| 66 | json_query |
| 67 | json_report |
| 68 | json_tag |
| 69 | json_timeline |
| 70 | json_user |
| 71 | json_wiki |
| 72 | leaf |
| @@ -269,11 +270,11 @@ | |
| 269 | writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@" |
| 270 | writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h" |
| 271 | writeln "\t\$(OBJDIR)/makeheaders $mhargs" |
| 272 | writeln "\ttouch \$(OBJDIR)/headers" |
| 273 | writeln "\$(OBJDIR)/headers: Makefile" |
| 274 | writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" |
| 275 | writeln "Makefile:" |
| 276 | set extra_h(main) \$(OBJDIR)/page_index.h |
| 277 | |
| 278 | foreach s [lsort $src] { |
| 279 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate" |
| @@ -753,11 +754,11 @@ | |
| 753 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 754 | |
| 755 | set opt {} |
| 756 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 757 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n" |
| 758 | writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n" |
| 759 | |
| 760 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 761 | set opt {-Dmain=sqlite3_shell} |
| 762 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 763 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| @@ -901,10 +902,11 @@ | |
| 901 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 902 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 903 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 904 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 905 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 906 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 907 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 908 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 909 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 910 | |
| @@ -1097,10 +1099,11 @@ | |
| 1097 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 1098 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 1099 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 1100 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 1101 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 1102 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 1103 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 1104 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 1105 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 1106 | |
| 1107 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -63,10 +63,11 @@ | |
| 63 | json_dir |
| 64 | json_finfo |
| 65 | json_login |
| 66 | json_query |
| 67 | json_report |
| 68 | json_status |
| 69 | json_tag |
| 70 | json_timeline |
| 71 | json_user |
| 72 | json_wiki |
| 73 | leaf |
| @@ -269,11 +270,11 @@ | |
| 270 | writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >$@" |
| 271 | writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h" |
| 272 | writeln "\t\$(OBJDIR)/makeheaders $mhargs" |
| 273 | writeln "\ttouch \$(OBJDIR)/headers" |
| 274 | writeln "\$(OBJDIR)/headers: Makefile" |
| 275 | writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/json_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h" |
| 276 | writeln "Makefile:" |
| 277 | set extra_h(main) \$(OBJDIR)/page_index.h |
| 278 | |
| 279 | foreach s [lsort $src] { |
| 280 | writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(OBJDIR)/translate" |
| @@ -753,11 +754,11 @@ | |
| 754 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" |
| 755 | |
| 756 | set opt {} |
| 757 | writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c" |
| 758 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n" |
| 759 | writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n" |
| 760 | |
| 761 | writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" |
| 762 | set opt {-Dmain=sqlite3_shell} |
| 763 | append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" |
| 764 | writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" |
| @@ -901,10 +902,11 @@ | |
| 902 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 903 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 904 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 905 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 906 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 907 | $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h |
| 908 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 909 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 910 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 911 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 912 | |
| @@ -1097,10 +1099,11 @@ | |
| 1099 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 1100 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 1101 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 1102 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 1103 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 1104 | $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h |
| 1105 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 1106 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 1107 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 1108 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 1109 | |
| 1110 |
+11
-4
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -26,13 +26,13 @@ | ||
| 26 | 26 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 27 | 27 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 |
| 28 | 28 | |
| 29 | 29 | 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 |
| 30 | 30 | |
| 31 | -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_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c | |
| 31 | +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_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c | |
| 32 | 32 | |
| 33 | -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_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O | |
| 33 | +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_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O | |
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | RC=$(DMDIR)\bin\rcc |
| 37 | 37 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 38 | 38 | |
| @@ -46,11 +46,11 @@ | ||
| 46 | 46 | |
| 47 | 47 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 48 | 48 | $(RC) $(RCFLAGS) -o$@ $** |
| 49 | 49 | |
| 50 | 50 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 51 | - +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_config json_diff json_dir json_finfo json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild regexp report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@ | |
| 51 | + +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_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf login main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild regexp report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@ | |
| 52 | 52 | +echo fossil >> $@ |
| 53 | 53 | +echo fossil >> $@ |
| 54 | 54 | +echo $(LIBS) >> $@ |
| 55 | 55 | +echo. >> $@ |
| 56 | 56 | +echo fossil >> $@ |
| @@ -103,10 +103,11 @@ | ||
| 103 | 103 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 104 | 104 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 105 | 105 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 106 | 106 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 107 | 107 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 108 | +$(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h | |
| 108 | 109 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 109 | 110 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 110 | 111 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 111 | 112 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 112 | 113 | |
| @@ -397,10 +398,16 @@ | ||
| 397 | 398 | $(OBJDIR)\json_report$O : json_report_.c json_report.h |
| 398 | 399 | $(TCC) -o$@ -c json_report_.c |
| 399 | 400 | |
| 400 | 401 | json_report_.c : $(SRCDIR)\json_report.c |
| 401 | 402 | +translate$E $** > $@ |
| 403 | + | |
| 404 | +$(OBJDIR)\json_status$O : json_status_.c json_status.h | |
| 405 | + $(TCC) -o$@ -c json_status_.c | |
| 406 | + | |
| 407 | +json_status_.c : $(SRCDIR)\json_status.c | |
| 408 | + +translate$E $** > $@ | |
| 402 | 409 | |
| 403 | 410 | $(OBJDIR)\json_tag$O : json_tag_.c json_tag.h |
| 404 | 411 | $(TCC) -o$@ -c json_tag_.c |
| 405 | 412 | |
| 406 | 413 | json_tag_.c : $(SRCDIR)\json_tag.c |
| @@ -741,7 +748,7 @@ | ||
| 741 | 748 | |
| 742 | 749 | zip_.c : $(SRCDIR)\zip.c |
| 743 | 750 | +translate$E $** > $@ |
| 744 | 751 | |
| 745 | 752 | headers: makeheaders$E page_index.h VERSION.h |
| 746 | - +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_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h | |
| 753 | + +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_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h | |
| 747 | 754 | @copy /Y nul: headers |
| 748 | 755 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -26,13 +26,13 @@ | |
| 26 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 27 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 |
| 28 | |
| 29 | 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 |
| 30 | |
| 31 | 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_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c |
| 32 | |
| 33 | 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_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 34 | |
| 35 | |
| 36 | RC=$(DMDIR)\bin\rcc |
| 37 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 38 | |
| @@ -46,11 +46,11 @@ | |
| 46 | |
| 47 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 48 | $(RC) $(RCFLAGS) -o$@ $** |
| 49 | |
| 50 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 51 | +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_config json_diff json_dir json_finfo json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild regexp report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@ |
| 52 | +echo fossil >> $@ |
| 53 | +echo fossil >> $@ |
| 54 | +echo $(LIBS) >> $@ |
| 55 | +echo. >> $@ |
| 56 | +echo fossil >> $@ |
| @@ -103,10 +103,11 @@ | |
| 103 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 104 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 105 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 106 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 107 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 108 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 109 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 110 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 111 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 112 | |
| @@ -397,10 +398,16 @@ | |
| 397 | $(OBJDIR)\json_report$O : json_report_.c json_report.h |
| 398 | $(TCC) -o$@ -c json_report_.c |
| 399 | |
| 400 | json_report_.c : $(SRCDIR)\json_report.c |
| 401 | +translate$E $** > $@ |
| 402 | |
| 403 | $(OBJDIR)\json_tag$O : json_tag_.c json_tag.h |
| 404 | $(TCC) -o$@ -c json_tag_.c |
| 405 | |
| 406 | json_tag_.c : $(SRCDIR)\json_tag.c |
| @@ -741,7 +748,7 @@ | |
| 741 | |
| 742 | zip_.c : $(SRCDIR)\zip.c |
| 743 | +translate$E $** > $@ |
| 744 | |
| 745 | headers: makeheaders$E page_index.h VERSION.h |
| 746 | +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_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h |
| 747 | @copy /Y nul: headers |
| 748 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -26,13 +26,13 @@ | |
| 26 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 27 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 |
| 28 | |
| 29 | 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 |
| 30 | |
| 31 | 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_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c regexp_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c |
| 32 | |
| 33 | 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_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 34 | |
| 35 | |
| 36 | RC=$(DMDIR)\bin\rcc |
| 37 | RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__ |
| 38 | |
| @@ -46,11 +46,11 @@ | |
| 46 | |
| 47 | $(OBJDIR)\fossil.res: $B\win\fossil.rc |
| 48 | $(RC) $(RCFLAGS) -o$@ $** |
| 49 | |
| 50 | $(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res |
| 51 | +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_config json_diff json_dir json_finfo json_login json_query json_report json_status json_tag json_timeline json_user json_wiki leaf login main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild regexp report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo unicode update url user utf8 util verify vfile wiki wikiformat winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@ |
| 52 | +echo fossil >> $@ |
| 53 | +echo fossil >> $@ |
| 54 | +echo $(LIBS) >> $@ |
| 55 | +echo. >> $@ |
| 56 | +echo fossil >> $@ |
| @@ -103,10 +103,11 @@ | |
| 103 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 104 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 105 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 106 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 107 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 108 | $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h |
| 109 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 110 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 111 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 112 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 113 | |
| @@ -397,10 +398,16 @@ | |
| 398 | $(OBJDIR)\json_report$O : json_report_.c json_report.h |
| 399 | $(TCC) -o$@ -c json_report_.c |
| 400 | |
| 401 | json_report_.c : $(SRCDIR)\json_report.c |
| 402 | +translate$E $** > $@ |
| 403 | |
| 404 | $(OBJDIR)\json_status$O : json_status_.c json_status.h |
| 405 | $(TCC) -o$@ -c json_status_.c |
| 406 | |
| 407 | json_status_.c : $(SRCDIR)\json_status.c |
| 408 | +translate$E $** > $@ |
| 409 | |
| 410 | $(OBJDIR)\json_tag$O : json_tag_.c json_tag.h |
| 411 | $(TCC) -o$@ -c json_tag_.c |
| 412 | |
| 413 | json_tag_.c : $(SRCDIR)\json_tag.c |
| @@ -741,7 +748,7 @@ | |
| 748 | |
| 749 | zip_.c : $(SRCDIR)\zip.c |
| 750 | +translate$E $** > $@ |
| 751 | |
| 752 | headers: makeheaders$E page_index.h VERSION.h |
| 753 | +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_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h regexp_.c:regexp.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h |
| 754 | @copy /Y nul: headers |
| 755 |
+13
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -301,10 +301,11 @@ | ||
| 301 | 301 | $(SRCDIR)/json_dir.c \ |
| 302 | 302 | $(SRCDIR)/json_finfo.c \ |
| 303 | 303 | $(SRCDIR)/json_login.c \ |
| 304 | 304 | $(SRCDIR)/json_query.c \ |
| 305 | 305 | $(SRCDIR)/json_report.c \ |
| 306 | + $(SRCDIR)/json_status.c \ | |
| 306 | 307 | $(SRCDIR)/json_tag.c \ |
| 307 | 308 | $(SRCDIR)/json_timeline.c \ |
| 308 | 309 | $(SRCDIR)/json_user.c \ |
| 309 | 310 | $(SRCDIR)/json_wiki.c \ |
| 310 | 311 | $(SRCDIR)/leaf.c \ |
| @@ -408,10 +409,11 @@ | ||
| 408 | 409 | $(OBJDIR)/json_dir_.c \ |
| 409 | 410 | $(OBJDIR)/json_finfo_.c \ |
| 410 | 411 | $(OBJDIR)/json_login_.c \ |
| 411 | 412 | $(OBJDIR)/json_query_.c \ |
| 412 | 413 | $(OBJDIR)/json_report_.c \ |
| 414 | + $(OBJDIR)/json_status_.c \ | |
| 413 | 415 | $(OBJDIR)/json_tag_.c \ |
| 414 | 416 | $(OBJDIR)/json_timeline_.c \ |
| 415 | 417 | $(OBJDIR)/json_user_.c \ |
| 416 | 418 | $(OBJDIR)/json_wiki_.c \ |
| 417 | 419 | $(OBJDIR)/leaf_.c \ |
| @@ -515,10 +517,11 @@ | ||
| 515 | 517 | $(OBJDIR)/json_dir.o \ |
| 516 | 518 | $(OBJDIR)/json_finfo.o \ |
| 517 | 519 | $(OBJDIR)/json_login.o \ |
| 518 | 520 | $(OBJDIR)/json_query.o \ |
| 519 | 521 | $(OBJDIR)/json_report.o \ |
| 522 | + $(OBJDIR)/json_status.o \ | |
| 520 | 523 | $(OBJDIR)/json_tag.o \ |
| 521 | 524 | $(OBJDIR)/json_timeline.o \ |
| 522 | 525 | $(OBJDIR)/json_user.o \ |
| 523 | 526 | $(OBJDIR)/json_wiki.o \ |
| 524 | 527 | $(OBJDIR)/leaf.o \ |
| @@ -735,10 +738,11 @@ | ||
| 735 | 738 | $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \ |
| 736 | 739 | $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \ |
| 737 | 740 | $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \ |
| 738 | 741 | $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \ |
| 739 | 742 | $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \ |
| 743 | + $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \ | |
| 740 | 744 | $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \ |
| 741 | 745 | $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \ |
| 742 | 746 | $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \ |
| 743 | 747 | $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \ |
| 744 | 748 | $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \ |
| @@ -1184,10 +1188,18 @@ | ||
| 1184 | 1188 | |
| 1185 | 1189 | $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h |
| 1186 | 1190 | $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c |
| 1187 | 1191 | |
| 1188 | 1192 | $(OBJDIR)/json_report.h: $(OBJDIR)/headers |
| 1193 | + | |
| 1194 | +$(OBJDIR)/json_status_.c: $(SRCDIR)/json_status.c $(OBJDIR)/translate | |
| 1195 | + $(TRANSLATE) $(SRCDIR)/json_status.c >$(OBJDIR)/json_status_.c | |
| 1196 | + | |
| 1197 | +$(OBJDIR)/json_status.o: $(OBJDIR)/json_status_.c $(OBJDIR)/json_status.h $(SRCDIR)/config.h | |
| 1198 | + $(XTCC) -o $(OBJDIR)/json_status.o -c $(OBJDIR)/json_status_.c | |
| 1199 | + | |
| 1200 | +$(OBJDIR)/json_status.h: $(OBJDIR)/headers | |
| 1189 | 1201 | |
| 1190 | 1202 | $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate |
| 1191 | 1203 | $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c |
| 1192 | 1204 | |
| 1193 | 1205 | $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h |
| @@ -1647,11 +1659,11 @@ | ||
| 1647 | 1659 | $(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 |
| 1648 | 1660 | |
| 1649 | 1661 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1650 | 1662 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1651 | 1663 | |
| 1652 | -$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h | |
| 1664 | +$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h | |
| 1653 | 1665 | |
| 1654 | 1666 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1655 | 1667 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1656 | 1668 | |
| 1657 | 1669 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1658 | 1670 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -301,10 +301,11 @@ | |
| 301 | $(SRCDIR)/json_dir.c \ |
| 302 | $(SRCDIR)/json_finfo.c \ |
| 303 | $(SRCDIR)/json_login.c \ |
| 304 | $(SRCDIR)/json_query.c \ |
| 305 | $(SRCDIR)/json_report.c \ |
| 306 | $(SRCDIR)/json_tag.c \ |
| 307 | $(SRCDIR)/json_timeline.c \ |
| 308 | $(SRCDIR)/json_user.c \ |
| 309 | $(SRCDIR)/json_wiki.c \ |
| 310 | $(SRCDIR)/leaf.c \ |
| @@ -408,10 +409,11 @@ | |
| 408 | $(OBJDIR)/json_dir_.c \ |
| 409 | $(OBJDIR)/json_finfo_.c \ |
| 410 | $(OBJDIR)/json_login_.c \ |
| 411 | $(OBJDIR)/json_query_.c \ |
| 412 | $(OBJDIR)/json_report_.c \ |
| 413 | $(OBJDIR)/json_tag_.c \ |
| 414 | $(OBJDIR)/json_timeline_.c \ |
| 415 | $(OBJDIR)/json_user_.c \ |
| 416 | $(OBJDIR)/json_wiki_.c \ |
| 417 | $(OBJDIR)/leaf_.c \ |
| @@ -515,10 +517,11 @@ | |
| 515 | $(OBJDIR)/json_dir.o \ |
| 516 | $(OBJDIR)/json_finfo.o \ |
| 517 | $(OBJDIR)/json_login.o \ |
| 518 | $(OBJDIR)/json_query.o \ |
| 519 | $(OBJDIR)/json_report.o \ |
| 520 | $(OBJDIR)/json_tag.o \ |
| 521 | $(OBJDIR)/json_timeline.o \ |
| 522 | $(OBJDIR)/json_user.o \ |
| 523 | $(OBJDIR)/json_wiki.o \ |
| 524 | $(OBJDIR)/leaf.o \ |
| @@ -735,10 +738,11 @@ | |
| 735 | $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \ |
| 736 | $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \ |
| 737 | $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \ |
| 738 | $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \ |
| 739 | $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \ |
| 740 | $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \ |
| 741 | $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \ |
| 742 | $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \ |
| 743 | $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \ |
| 744 | $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \ |
| @@ -1184,10 +1188,18 @@ | |
| 1184 | |
| 1185 | $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h |
| 1186 | $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c |
| 1187 | |
| 1188 | $(OBJDIR)/json_report.h: $(OBJDIR)/headers |
| 1189 | |
| 1190 | $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate |
| 1191 | $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c |
| 1192 | |
| 1193 | $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h |
| @@ -1647,11 +1659,11 @@ | |
| 1647 | $(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 |
| 1648 | |
| 1649 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1650 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1651 | |
| 1652 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1653 | |
| 1654 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1655 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1656 | |
| 1657 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1658 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -301,10 +301,11 @@ | |
| 301 | $(SRCDIR)/json_dir.c \ |
| 302 | $(SRCDIR)/json_finfo.c \ |
| 303 | $(SRCDIR)/json_login.c \ |
| 304 | $(SRCDIR)/json_query.c \ |
| 305 | $(SRCDIR)/json_report.c \ |
| 306 | $(SRCDIR)/json_status.c \ |
| 307 | $(SRCDIR)/json_tag.c \ |
| 308 | $(SRCDIR)/json_timeline.c \ |
| 309 | $(SRCDIR)/json_user.c \ |
| 310 | $(SRCDIR)/json_wiki.c \ |
| 311 | $(SRCDIR)/leaf.c \ |
| @@ -408,10 +409,11 @@ | |
| 409 | $(OBJDIR)/json_dir_.c \ |
| 410 | $(OBJDIR)/json_finfo_.c \ |
| 411 | $(OBJDIR)/json_login_.c \ |
| 412 | $(OBJDIR)/json_query_.c \ |
| 413 | $(OBJDIR)/json_report_.c \ |
| 414 | $(OBJDIR)/json_status_.c \ |
| 415 | $(OBJDIR)/json_tag_.c \ |
| 416 | $(OBJDIR)/json_timeline_.c \ |
| 417 | $(OBJDIR)/json_user_.c \ |
| 418 | $(OBJDIR)/json_wiki_.c \ |
| 419 | $(OBJDIR)/leaf_.c \ |
| @@ -515,10 +517,11 @@ | |
| 517 | $(OBJDIR)/json_dir.o \ |
| 518 | $(OBJDIR)/json_finfo.o \ |
| 519 | $(OBJDIR)/json_login.o \ |
| 520 | $(OBJDIR)/json_query.o \ |
| 521 | $(OBJDIR)/json_report.o \ |
| 522 | $(OBJDIR)/json_status.o \ |
| 523 | $(OBJDIR)/json_tag.o \ |
| 524 | $(OBJDIR)/json_timeline.o \ |
| 525 | $(OBJDIR)/json_user.o \ |
| 526 | $(OBJDIR)/json_wiki.o \ |
| 527 | $(OBJDIR)/leaf.o \ |
| @@ -735,10 +738,11 @@ | |
| 738 | $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \ |
| 739 | $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \ |
| 740 | $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \ |
| 741 | $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \ |
| 742 | $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \ |
| 743 | $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \ |
| 744 | $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \ |
| 745 | $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \ |
| 746 | $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \ |
| 747 | $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \ |
| 748 | $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \ |
| @@ -1184,10 +1188,18 @@ | |
| 1188 | |
| 1189 | $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h |
| 1190 | $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c |
| 1191 | |
| 1192 | $(OBJDIR)/json_report.h: $(OBJDIR)/headers |
| 1193 | |
| 1194 | $(OBJDIR)/json_status_.c: $(SRCDIR)/json_status.c $(OBJDIR)/translate |
| 1195 | $(TRANSLATE) $(SRCDIR)/json_status.c >$(OBJDIR)/json_status_.c |
| 1196 | |
| 1197 | $(OBJDIR)/json_status.o: $(OBJDIR)/json_status_.c $(OBJDIR)/json_status.h $(SRCDIR)/config.h |
| 1198 | $(XTCC) -o $(OBJDIR)/json_status.o -c $(OBJDIR)/json_status_.c |
| 1199 | |
| 1200 | $(OBJDIR)/json_status.h: $(OBJDIR)/headers |
| 1201 | |
| 1202 | $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate |
| 1203 | $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c |
| 1204 | |
| 1205 | $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h |
| @@ -1647,11 +1659,11 @@ | |
| 1659 | $(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 |
| 1660 | |
| 1661 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1662 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1663 | |
| 1664 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1665 | |
| 1666 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1667 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1668 | |
| 1669 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1670 |
+11
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -103,10 +103,11 @@ | ||
| 103 | 103 | json_dir_.c \ |
| 104 | 104 | json_finfo_.c \ |
| 105 | 105 | json_login_.c \ |
| 106 | 106 | json_query_.c \ |
| 107 | 107 | json_report_.c \ |
| 108 | + json_status_.c \ | |
| 108 | 109 | json_tag_.c \ |
| 109 | 110 | json_timeline_.c \ |
| 110 | 111 | json_user_.c \ |
| 111 | 112 | json_wiki_.c \ |
| 112 | 113 | leaf_.c \ |
| @@ -210,10 +211,11 @@ | ||
| 210 | 211 | $(OX)\json_dir$O \ |
| 211 | 212 | $(OX)\json_finfo$O \ |
| 212 | 213 | $(OX)\json_login$O \ |
| 213 | 214 | $(OX)\json_query$O \ |
| 214 | 215 | $(OX)\json_report$O \ |
| 216 | + $(OX)\json_status$O \ | |
| 215 | 217 | $(OX)\json_tag$O \ |
| 216 | 218 | $(OX)\json_timeline$O \ |
| 217 | 219 | $(OX)\json_user$O \ |
| 218 | 220 | $(OX)\json_wiki$O \ |
| 219 | 221 | $(OX)\leaf$O \ |
| @@ -335,10 +337,11 @@ | ||
| 335 | 337 | echo $(OX)\json_dir.obj >> $@ |
| 336 | 338 | echo $(OX)\json_finfo.obj >> $@ |
| 337 | 339 | echo $(OX)\json_login.obj >> $@ |
| 338 | 340 | echo $(OX)\json_query.obj >> $@ |
| 339 | 341 | echo $(OX)\json_report.obj >> $@ |
| 342 | + echo $(OX)\json_status.obj >> $@ | |
| 340 | 343 | echo $(OX)\json_tag.obj >> $@ |
| 341 | 344 | echo $(OX)\json_timeline.obj >> $@ |
| 342 | 345 | echo $(OX)\json_user.obj >> $@ |
| 343 | 346 | echo $(OX)\json_wiki.obj >> $@ |
| 344 | 347 | echo $(OX)\leaf.obj >> $@ |
| @@ -464,10 +467,11 @@ | ||
| 464 | 467 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 465 | 468 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 466 | 469 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 467 | 470 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 468 | 471 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 472 | +$(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h | |
| 469 | 473 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 470 | 474 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 471 | 475 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 472 | 476 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 473 | 477 | |
| @@ -757,10 +761,16 @@ | ||
| 757 | 761 | $(OX)\json_report$O : json_report_.c json_report.h |
| 758 | 762 | $(TCC) /Fo$@ -c json_report_.c |
| 759 | 763 | |
| 760 | 764 | json_report_.c : $(SRCDIR)\json_report.c |
| 761 | 765 | translate$E $** > $@ |
| 766 | + | |
| 767 | +$(OX)\json_status$O : json_status_.c json_status.h | |
| 768 | + $(TCC) /Fo$@ -c json_status_.c | |
| 769 | + | |
| 770 | +json_status_.c : $(SRCDIR)\json_status.c | |
| 771 | + translate$E $** > $@ | |
| 762 | 772 | |
| 763 | 773 | $(OX)\json_tag$O : json_tag_.c json_tag.h |
| 764 | 774 | $(TCC) /Fo$@ -c json_tag_.c |
| 765 | 775 | |
| 766 | 776 | json_tag_.c : $(SRCDIR)\json_tag.c |
| @@ -1151,10 +1161,11 @@ | ||
| 1151 | 1161 | json_dir_.c:json_dir.h \ |
| 1152 | 1162 | json_finfo_.c:json_finfo.h \ |
| 1153 | 1163 | json_login_.c:json_login.h \ |
| 1154 | 1164 | json_query_.c:json_query.h \ |
| 1155 | 1165 | json_report_.c:json_report.h \ |
| 1166 | + json_status_.c:json_status.h \ | |
| 1156 | 1167 | json_tag_.c:json_tag.h \ |
| 1157 | 1168 | json_timeline_.c:json_timeline.h \ |
| 1158 | 1169 | json_user_.c:json_user.h \ |
| 1159 | 1170 | json_wiki_.c:json_wiki.h \ |
| 1160 | 1171 | leaf_.c:leaf.h \ |
| 1161 | 1172 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -103,10 +103,11 @@ | |
| 103 | json_dir_.c \ |
| 104 | json_finfo_.c \ |
| 105 | json_login_.c \ |
| 106 | json_query_.c \ |
| 107 | json_report_.c \ |
| 108 | json_tag_.c \ |
| 109 | json_timeline_.c \ |
| 110 | json_user_.c \ |
| 111 | json_wiki_.c \ |
| 112 | leaf_.c \ |
| @@ -210,10 +211,11 @@ | |
| 210 | $(OX)\json_dir$O \ |
| 211 | $(OX)\json_finfo$O \ |
| 212 | $(OX)\json_login$O \ |
| 213 | $(OX)\json_query$O \ |
| 214 | $(OX)\json_report$O \ |
| 215 | $(OX)\json_tag$O \ |
| 216 | $(OX)\json_timeline$O \ |
| 217 | $(OX)\json_user$O \ |
| 218 | $(OX)\json_wiki$O \ |
| 219 | $(OX)\leaf$O \ |
| @@ -335,10 +337,11 @@ | |
| 335 | echo $(OX)\json_dir.obj >> $@ |
| 336 | echo $(OX)\json_finfo.obj >> $@ |
| 337 | echo $(OX)\json_login.obj >> $@ |
| 338 | echo $(OX)\json_query.obj >> $@ |
| 339 | echo $(OX)\json_report.obj >> $@ |
| 340 | echo $(OX)\json_tag.obj >> $@ |
| 341 | echo $(OX)\json_timeline.obj >> $@ |
| 342 | echo $(OX)\json_user.obj >> $@ |
| 343 | echo $(OX)\json_wiki.obj >> $@ |
| 344 | echo $(OX)\leaf.obj >> $@ |
| @@ -464,10 +467,11 @@ | |
| 464 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 465 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 466 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 467 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 468 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 469 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 470 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 471 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 472 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 473 | |
| @@ -757,10 +761,16 @@ | |
| 757 | $(OX)\json_report$O : json_report_.c json_report.h |
| 758 | $(TCC) /Fo$@ -c json_report_.c |
| 759 | |
| 760 | json_report_.c : $(SRCDIR)\json_report.c |
| 761 | translate$E $** > $@ |
| 762 | |
| 763 | $(OX)\json_tag$O : json_tag_.c json_tag.h |
| 764 | $(TCC) /Fo$@ -c json_tag_.c |
| 765 | |
| 766 | json_tag_.c : $(SRCDIR)\json_tag.c |
| @@ -1151,10 +1161,11 @@ | |
| 1151 | json_dir_.c:json_dir.h \ |
| 1152 | json_finfo_.c:json_finfo.h \ |
| 1153 | json_login_.c:json_login.h \ |
| 1154 | json_query_.c:json_query.h \ |
| 1155 | json_report_.c:json_report.h \ |
| 1156 | json_tag_.c:json_tag.h \ |
| 1157 | json_timeline_.c:json_timeline.h \ |
| 1158 | json_user_.c:json_user.h \ |
| 1159 | json_wiki_.c:json_wiki.h \ |
| 1160 | leaf_.c:leaf.h \ |
| 1161 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -103,10 +103,11 @@ | |
| 103 | json_dir_.c \ |
| 104 | json_finfo_.c \ |
| 105 | json_login_.c \ |
| 106 | json_query_.c \ |
| 107 | json_report_.c \ |
| 108 | json_status_.c \ |
| 109 | json_tag_.c \ |
| 110 | json_timeline_.c \ |
| 111 | json_user_.c \ |
| 112 | json_wiki_.c \ |
| 113 | leaf_.c \ |
| @@ -210,10 +211,11 @@ | |
| 211 | $(OX)\json_dir$O \ |
| 212 | $(OX)\json_finfo$O \ |
| 213 | $(OX)\json_login$O \ |
| 214 | $(OX)\json_query$O \ |
| 215 | $(OX)\json_report$O \ |
| 216 | $(OX)\json_status$O \ |
| 217 | $(OX)\json_tag$O \ |
| 218 | $(OX)\json_timeline$O \ |
| 219 | $(OX)\json_user$O \ |
| 220 | $(OX)\json_wiki$O \ |
| 221 | $(OX)\leaf$O \ |
| @@ -335,10 +337,11 @@ | |
| 337 | echo $(OX)\json_dir.obj >> $@ |
| 338 | echo $(OX)\json_finfo.obj >> $@ |
| 339 | echo $(OX)\json_login.obj >> $@ |
| 340 | echo $(OX)\json_query.obj >> $@ |
| 341 | echo $(OX)\json_report.obj >> $@ |
| 342 | echo $(OX)\json_status.obj >> $@ |
| 343 | echo $(OX)\json_tag.obj >> $@ |
| 344 | echo $(OX)\json_timeline.obj >> $@ |
| 345 | echo $(OX)\json_user.obj >> $@ |
| 346 | echo $(OX)\json_wiki.obj >> $@ |
| 347 | echo $(OX)\leaf.obj >> $@ |
| @@ -464,10 +467,11 @@ | |
| 467 | $(OBJDIR)\json_dir$O : $(SRCDIR)\json_detail.h |
| 468 | $(OBJDIR)\json_finfo$O : $(SRCDIR)\json_detail.h |
| 469 | $(OBJDIR)\json_login$O : $(SRCDIR)\json_detail.h |
| 470 | $(OBJDIR)\json_query$O : $(SRCDIR)\json_detail.h |
| 471 | $(OBJDIR)\json_report$O : $(SRCDIR)\json_detail.h |
| 472 | $(OBJDIR)\json_status$O : $(SRCDIR)\json_detail.h |
| 473 | $(OBJDIR)\json_tag$O : $(SRCDIR)\json_detail.h |
| 474 | $(OBJDIR)\json_timeline$O : $(SRCDIR)\json_detail.h |
| 475 | $(OBJDIR)\json_user$O : $(SRCDIR)\json_detail.h |
| 476 | $(OBJDIR)\json_wiki$O : $(SRCDIR)\json_detail.h |
| 477 | |
| @@ -757,10 +761,16 @@ | |
| 761 | $(OX)\json_report$O : json_report_.c json_report.h |
| 762 | $(TCC) /Fo$@ -c json_report_.c |
| 763 | |
| 764 | json_report_.c : $(SRCDIR)\json_report.c |
| 765 | translate$E $** > $@ |
| 766 | |
| 767 | $(OX)\json_status$O : json_status_.c json_status.h |
| 768 | $(TCC) /Fo$@ -c json_status_.c |
| 769 | |
| 770 | json_status_.c : $(SRCDIR)\json_status.c |
| 771 | translate$E $** > $@ |
| 772 | |
| 773 | $(OX)\json_tag$O : json_tag_.c json_tag.h |
| 774 | $(TCC) /Fo$@ -c json_tag_.c |
| 775 | |
| 776 | json_tag_.c : $(SRCDIR)\json_tag.c |
| @@ -1151,10 +1161,11 @@ | |
| 1161 | json_dir_.c:json_dir.h \ |
| 1162 | json_finfo_.c:json_finfo.h \ |
| 1163 | json_login_.c:json_login.h \ |
| 1164 | json_query_.c:json_query.h \ |
| 1165 | json_report_.c:json_report.h \ |
| 1166 | json_status_.c:json_status.h \ |
| 1167 | json_tag_.c:json_tag.h \ |
| 1168 | json_timeline_.c:json_timeline.h \ |
| 1169 | json_user_.c:json_user.h \ |
| 1170 | json_wiki_.c:json_wiki.h \ |
| 1171 | leaf_.c:leaf.h \ |
| 1172 |