Fossil SCM
Merge markdown support for embedded documentation into the trunk.
Commit
61079c3bef3257f1f4b247fec1252273a8a36a3c
Parent
0bb8184e3c1d21c…
13 files changed
+6
+8
+16
+21
-1
+12
+34
+170
+6
+16
-4
+33
-1
+33
-1
+33
-1
+20
M
auto.def
+6
| --- auto.def | ||
| +++ auto.def | ||
| @@ -11,10 +11,11 @@ | ||
| 11 | 11 | internal-sqlite=1 => {Don't use the internal sqlite, use the system one} |
| 12 | 12 | static=0 => {Link a static executable} |
| 13 | 13 | lineedit=1 => {Disable line editing} |
| 14 | 14 | fossil-debug=0 => {Build with fossil debugging enabled} |
| 15 | 15 | json=0 => {Build with fossil JSON API enabled} |
| 16 | + markdown=0 => {Build with markdown engine enabled} | |
| 16 | 17 | } |
| 17 | 18 | |
| 18 | 19 | # sqlite wants these types if possible |
| 19 | 20 | cc-with {-includes {stdint.h inttypes.h}} { |
| 20 | 21 | cc-check-types uint32_t uint16_t int16_t uint8_t |
| @@ -73,10 +74,15 @@ | ||
| 73 | 74 | # have #ifdef guards around the whole file without |
| 74 | 75 | # reading config.h first. |
| 75 | 76 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON |
| 76 | 77 | define FOSSIL_ENABLE_JSON |
| 77 | 78 | } |
| 79 | + | |
| 80 | +if {[opt-bool markdown]} { | |
| 81 | + define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_MARKDOWN | |
| 82 | + define FOSSIL_ENABLE_MARKDOWN | |
| 83 | +} | |
| 78 | 84 | |
| 79 | 85 | if {[opt-bool static]} { |
| 80 | 86 | # XXX: This will not work on all systems. |
| 81 | 87 | define-append EXTRA_LDFLAGS -static |
| 82 | 88 | } |
| 83 | 89 |
| --- auto.def | |
| +++ auto.def | |
| @@ -11,10 +11,11 @@ | |
| 11 | internal-sqlite=1 => {Don't use the internal sqlite, use the system one} |
| 12 | static=0 => {Link a static executable} |
| 13 | lineedit=1 => {Disable line editing} |
| 14 | fossil-debug=0 => {Build with fossil debugging enabled} |
| 15 | json=0 => {Build with fossil JSON API enabled} |
| 16 | } |
| 17 | |
| 18 | # sqlite wants these types if possible |
| 19 | cc-with {-includes {stdint.h inttypes.h}} { |
| 20 | cc-check-types uint32_t uint16_t int16_t uint8_t |
| @@ -73,10 +74,15 @@ | |
| 73 | # have #ifdef guards around the whole file without |
| 74 | # reading config.h first. |
| 75 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON |
| 76 | define FOSSIL_ENABLE_JSON |
| 77 | } |
| 78 | |
| 79 | if {[opt-bool static]} { |
| 80 | # XXX: This will not work on all systems. |
| 81 | define-append EXTRA_LDFLAGS -static |
| 82 | } |
| 83 |
| --- auto.def | |
| +++ auto.def | |
| @@ -11,10 +11,11 @@ | |
| 11 | internal-sqlite=1 => {Don't use the internal sqlite, use the system one} |
| 12 | static=0 => {Link a static executable} |
| 13 | lineedit=1 => {Disable line editing} |
| 14 | fossil-debug=0 => {Build with fossil debugging enabled} |
| 15 | json=0 => {Build with fossil JSON API enabled} |
| 16 | markdown=0 => {Build with markdown engine enabled} |
| 17 | } |
| 18 | |
| 19 | # sqlite wants these types if possible |
| 20 | cc-with {-includes {stdint.h inttypes.h}} { |
| 21 | cc-check-types uint32_t uint16_t int16_t uint8_t |
| @@ -73,10 +74,15 @@ | |
| 74 | # have #ifdef guards around the whole file without |
| 75 | # reading config.h first. |
| 76 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON |
| 77 | define FOSSIL_ENABLE_JSON |
| 78 | } |
| 79 | |
| 80 | if {[opt-bool markdown]} { |
| 81 | define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_MARKDOWN |
| 82 | define FOSSIL_ENABLE_MARKDOWN |
| 83 | } |
| 84 | |
| 85 | if {[opt-bool static]} { |
| 86 | # XXX: This will not work on all systems. |
| 87 | define-append EXTRA_LDFLAGS -static |
| 88 | } |
| 89 |
M
src/db.c
+8
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2074,10 +2074,13 @@ | ||
| 2074 | 2074 | { "empty-dirs", 0, 40, 1, "" }, |
| 2075 | 2075 | { "http-port", 0, 16, 0, "8080" }, |
| 2076 | 2076 | { "localauth", 0, 0, 0, "off" }, |
| 2077 | 2077 | { "main-branch", 0, 40, 0, "trunk" }, |
| 2078 | 2078 | { "manifest", 0, 0, 1, "off" }, |
| 2079 | +#ifdef FOSSIL_ENABLE_MARKDOWN | |
| 2080 | + { "markdown", 0, 0, 0, "off" }, | |
| 2081 | +#endif | |
| 2079 | 2082 | { "max-upload", 0, 25, 0, "250000" }, |
| 2080 | 2083 | { "mtime-changes", 0, 0, 0, "on" }, |
| 2081 | 2084 | { "pgp-command", 0, 40, 0, "gpg --clearsign -o " }, |
| 2082 | 2085 | { "proxy", 0, 32, 0, "off" }, |
| 2083 | 2086 | { "relative-paths",0, 0, 0, "on" }, |
| @@ -2205,10 +2208,15 @@ | ||
| 2205 | 2208 | ** |
| 2206 | 2209 | ** manifest If enabled, automatically create files "manifest" and |
| 2207 | 2210 | ** (versionable) "manifest.uuid" in every checkout. The SQLite and |
| 2208 | 2211 | ** Fossil repositories both require this. Default: off. |
| 2209 | 2212 | ** |
| 2213 | +** markdown If enabled (and Fossil was compiled with markdown | |
| 2214 | +** support), the markdown engine will be used to render | |
| 2215 | +** embedded documentation conforming to the appropriate | |
| 2216 | +** content types (e.g. "text/x-markdown"). Default: off. | |
| 2217 | +** | |
| 2210 | 2218 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2211 | 2219 | ** default is 250000 bytes. |
| 2212 | 2220 | ** |
| 2213 | 2221 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2214 | 2222 | ** files have been modified. (Default "on".) |
| 2215 | 2223 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2074,10 +2074,13 @@ | |
| 2074 | { "empty-dirs", 0, 40, 1, "" }, |
| 2075 | { "http-port", 0, 16, 0, "8080" }, |
| 2076 | { "localauth", 0, 0, 0, "off" }, |
| 2077 | { "main-branch", 0, 40, 0, "trunk" }, |
| 2078 | { "manifest", 0, 0, 1, "off" }, |
| 2079 | { "max-upload", 0, 25, 0, "250000" }, |
| 2080 | { "mtime-changes", 0, 0, 0, "on" }, |
| 2081 | { "pgp-command", 0, 40, 0, "gpg --clearsign -o " }, |
| 2082 | { "proxy", 0, 32, 0, "off" }, |
| 2083 | { "relative-paths",0, 0, 0, "on" }, |
| @@ -2205,10 +2208,15 @@ | |
| 2205 | ** |
| 2206 | ** manifest If enabled, automatically create files "manifest" and |
| 2207 | ** (versionable) "manifest.uuid" in every checkout. The SQLite and |
| 2208 | ** Fossil repositories both require this. Default: off. |
| 2209 | ** |
| 2210 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2211 | ** default is 250000 bytes. |
| 2212 | ** |
| 2213 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2214 | ** files have been modified. (Default "on".) |
| 2215 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2074,10 +2074,13 @@ | |
| 2074 | { "empty-dirs", 0, 40, 1, "" }, |
| 2075 | { "http-port", 0, 16, 0, "8080" }, |
| 2076 | { "localauth", 0, 0, 0, "off" }, |
| 2077 | { "main-branch", 0, 40, 0, "trunk" }, |
| 2078 | { "manifest", 0, 0, 1, "off" }, |
| 2079 | #ifdef FOSSIL_ENABLE_MARKDOWN |
| 2080 | { "markdown", 0, 0, 0, "off" }, |
| 2081 | #endif |
| 2082 | { "max-upload", 0, 25, 0, "250000" }, |
| 2083 | { "mtime-changes", 0, 0, 0, "on" }, |
| 2084 | { "pgp-command", 0, 40, 0, "gpg --clearsign -o " }, |
| 2085 | { "proxy", 0, 32, 0, "off" }, |
| 2086 | { "relative-paths",0, 0, 0, "on" }, |
| @@ -2205,10 +2208,15 @@ | |
| 2208 | ** |
| 2209 | ** manifest If enabled, automatically create files "manifest" and |
| 2210 | ** (versionable) "manifest.uuid" in every checkout. The SQLite and |
| 2211 | ** Fossil repositories both require this. Default: off. |
| 2212 | ** |
| 2213 | ** markdown If enabled (and Fossil was compiled with markdown |
| 2214 | ** support), the markdown engine will be used to render |
| 2215 | ** embedded documentation conforming to the appropriate |
| 2216 | ** content types (e.g. "text/x-markdown"). Default: off. |
| 2217 | ** |
| 2218 | ** max-upload A limit on the size of uplink HTTP requests. The |
| 2219 | ** default is 250000 bytes. |
| 2220 | ** |
| 2221 | ** mtime-changes Use file modification times (mtimes) to detect when |
| 2222 | ** files have been modified. (Default "on".) |
| 2223 |
+16
| --- src/doc.c | ||
| +++ src/doc.c | ||
| @@ -166,16 +166,18 @@ | ||
| 166 | 166 | { "lsp", 3, "application/x-lisp" }, |
| 167 | 167 | { "lzh", 3, "application/octet-stream" }, |
| 168 | 168 | { "m", 1, "text/plain" }, |
| 169 | 169 | { "m3u", 3, "audio/x-mpegurl" }, |
| 170 | 170 | { "man", 3, "application/x-troff-man" }, |
| 171 | + { "markdown", 8, "text/x-markdown" }, | |
| 171 | 172 | { "me", 2, "application/x-troff-me" }, |
| 172 | 173 | { "mesh", 4, "model/mesh" }, |
| 173 | 174 | { "mid", 3, "audio/midi" }, |
| 174 | 175 | { "midi", 4, "audio/midi" }, |
| 175 | 176 | { "mif", 3, "application/x-mif" }, |
| 176 | 177 | { "mime", 4, "www/mime" }, |
| 178 | + { "mkd", 3, "text/x-markdown" }, | |
| 177 | 179 | { "mov", 3, "video/quicktime" }, |
| 178 | 180 | { "movie", 5, "video/x-sgi-movie" }, |
| 179 | 181 | { "mp2", 3, "audio/mpeg" }, |
| 180 | 182 | { "mp3", 3, "audio/mpeg" }, |
| 181 | 183 | { "mpe", 3, "video/mpeg" }, |
| @@ -498,10 +500,24 @@ | ||
| 498 | 500 | }else{ |
| 499 | 501 | style_header("Documentation"); |
| 500 | 502 | wiki_convert(&filebody, 0, WIKI_BUTTONS); |
| 501 | 503 | } |
| 502 | 504 | style_footer(); |
| 505 | +#ifdef FOSSIL_ENABLE_MARKDOWN | |
| 506 | + }else if( fossil_strcmp(zMime, "text/x-markdown")==0 | |
| 507 | + && db_get_boolean("markdown", 0) ){ | |
| 508 | + Blob title = BLOB_INITIALIZER; | |
| 509 | + Blob tail = BLOB_INITIALIZER; | |
| 510 | + markdown_to_html(&filebody, &title, &tail); | |
| 511 | + if( blob_size(&title)>0 ){ | |
| 512 | + style_header(blob_str(&title)); | |
| 513 | + }else{ | |
| 514 | + style_header("Documentation"); | |
| 515 | + } | |
| 516 | + blob_append(cgi_output_blob(), blob_buffer(&tail), blob_size(&tail)); | |
| 517 | + style_footer(); | |
| 518 | +#endif | |
| 503 | 519 | }else if( fossil_strcmp(zMime, "text/plain")==0 ){ |
| 504 | 520 | style_header("Documentation"); |
| 505 | 521 | @ <blockquote><pre> |
| 506 | 522 | @ %h(blob_str(&filebody)) |
| 507 | 523 | @ </pre></blockquote> |
| 508 | 524 |
| --- src/doc.c | |
| +++ src/doc.c | |
| @@ -166,16 +166,18 @@ | |
| 166 | { "lsp", 3, "application/x-lisp" }, |
| 167 | { "lzh", 3, "application/octet-stream" }, |
| 168 | { "m", 1, "text/plain" }, |
| 169 | { "m3u", 3, "audio/x-mpegurl" }, |
| 170 | { "man", 3, "application/x-troff-man" }, |
| 171 | { "me", 2, "application/x-troff-me" }, |
| 172 | { "mesh", 4, "model/mesh" }, |
| 173 | { "mid", 3, "audio/midi" }, |
| 174 | { "midi", 4, "audio/midi" }, |
| 175 | { "mif", 3, "application/x-mif" }, |
| 176 | { "mime", 4, "www/mime" }, |
| 177 | { "mov", 3, "video/quicktime" }, |
| 178 | { "movie", 5, "video/x-sgi-movie" }, |
| 179 | { "mp2", 3, "audio/mpeg" }, |
| 180 | { "mp3", 3, "audio/mpeg" }, |
| 181 | { "mpe", 3, "video/mpeg" }, |
| @@ -498,10 +500,24 @@ | |
| 498 | }else{ |
| 499 | style_header("Documentation"); |
| 500 | wiki_convert(&filebody, 0, WIKI_BUTTONS); |
| 501 | } |
| 502 | style_footer(); |
| 503 | }else if( fossil_strcmp(zMime, "text/plain")==0 ){ |
| 504 | style_header("Documentation"); |
| 505 | @ <blockquote><pre> |
| 506 | @ %h(blob_str(&filebody)) |
| 507 | @ </pre></blockquote> |
| 508 |
| --- src/doc.c | |
| +++ src/doc.c | |
| @@ -166,16 +166,18 @@ | |
| 166 | { "lsp", 3, "application/x-lisp" }, |
| 167 | { "lzh", 3, "application/octet-stream" }, |
| 168 | { "m", 1, "text/plain" }, |
| 169 | { "m3u", 3, "audio/x-mpegurl" }, |
| 170 | { "man", 3, "application/x-troff-man" }, |
| 171 | { "markdown", 8, "text/x-markdown" }, |
| 172 | { "me", 2, "application/x-troff-me" }, |
| 173 | { "mesh", 4, "model/mesh" }, |
| 174 | { "mid", 3, "audio/midi" }, |
| 175 | { "midi", 4, "audio/midi" }, |
| 176 | { "mif", 3, "application/x-mif" }, |
| 177 | { "mime", 4, "www/mime" }, |
| 178 | { "mkd", 3, "text/x-markdown" }, |
| 179 | { "mov", 3, "video/quicktime" }, |
| 180 | { "movie", 5, "video/x-sgi-movie" }, |
| 181 | { "mp2", 3, "audio/mpeg" }, |
| 182 | { "mp3", 3, "audio/mpeg" }, |
| 183 | { "mpe", 3, "video/mpeg" }, |
| @@ -498,10 +500,24 @@ | |
| 500 | }else{ |
| 501 | style_header("Documentation"); |
| 502 | wiki_convert(&filebody, 0, WIKI_BUTTONS); |
| 503 | } |
| 504 | style_footer(); |
| 505 | #ifdef FOSSIL_ENABLE_MARKDOWN |
| 506 | }else if( fossil_strcmp(zMime, "text/x-markdown")==0 |
| 507 | && db_get_boolean("markdown", 0) ){ |
| 508 | Blob title = BLOB_INITIALIZER; |
| 509 | Blob tail = BLOB_INITIALIZER; |
| 510 | markdown_to_html(&filebody, &title, &tail); |
| 511 | if( blob_size(&title)>0 ){ |
| 512 | style_header(blob_str(&title)); |
| 513 | }else{ |
| 514 | style_header("Documentation"); |
| 515 | } |
| 516 | blob_append(cgi_output_blob(), blob_buffer(&tail), blob_size(&tail)); |
| 517 | style_footer(); |
| 518 | #endif |
| 519 | }else if( fossil_strcmp(zMime, "text/plain")==0 ){ |
| 520 | style_header("Documentation"); |
| 521 | @ <blockquote><pre> |
| 522 | @ %h(blob_str(&filebody)) |
| 523 | @ </pre></blockquote> |
| 524 |
+21
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -68,10 +68,12 @@ | ||
| 68 | 68 | $(SRCDIR)/json_wiki.c \ |
| 69 | 69 | $(SRCDIR)/leaf.c \ |
| 70 | 70 | $(SRCDIR)/login.c \ |
| 71 | 71 | $(SRCDIR)/main.c \ |
| 72 | 72 | $(SRCDIR)/manifest.c \ |
| 73 | + $(SRCDIR)/markdown.c \ | |
| 74 | + $(SRCDIR)/markdown_html.c \ | |
| 73 | 75 | $(SRCDIR)/md5.c \ |
| 74 | 76 | $(SRCDIR)/merge.c \ |
| 75 | 77 | $(SRCDIR)/merge3.c \ |
| 76 | 78 | $(SRCDIR)/moderate.c \ |
| 77 | 79 | $(SRCDIR)/name.c \ |
| @@ -170,10 +172,12 @@ | ||
| 170 | 172 | $(OBJDIR)/json_wiki_.c \ |
| 171 | 173 | $(OBJDIR)/leaf_.c \ |
| 172 | 174 | $(OBJDIR)/login_.c \ |
| 173 | 175 | $(OBJDIR)/main_.c \ |
| 174 | 176 | $(OBJDIR)/manifest_.c \ |
| 177 | + $(OBJDIR)/markdown_.c \ | |
| 178 | + $(OBJDIR)/markdown_html_.c \ | |
| 175 | 179 | $(OBJDIR)/md5_.c \ |
| 176 | 180 | $(OBJDIR)/merge_.c \ |
| 177 | 181 | $(OBJDIR)/merge3_.c \ |
| 178 | 182 | $(OBJDIR)/moderate_.c \ |
| 179 | 183 | $(OBJDIR)/name_.c \ |
| @@ -272,10 +276,12 @@ | ||
| 272 | 276 | $(OBJDIR)/json_wiki.o \ |
| 273 | 277 | $(OBJDIR)/leaf.o \ |
| 274 | 278 | $(OBJDIR)/login.o \ |
| 275 | 279 | $(OBJDIR)/main.o \ |
| 276 | 280 | $(OBJDIR)/manifest.o \ |
| 281 | + $(OBJDIR)/markdown.o \ | |
| 282 | + $(OBJDIR)/markdown_html.o \ | |
| 277 | 283 | $(OBJDIR)/md5.o \ |
| 278 | 284 | $(OBJDIR)/merge.o \ |
| 279 | 285 | $(OBJDIR)/merge3.o \ |
| 280 | 286 | $(OBJDIR)/moderate.o \ |
| 281 | 287 | $(OBJDIR)/name.o \ |
| @@ -384,11 +390,11 @@ | ||
| 384 | 390 | |
| 385 | 391 | |
| 386 | 392 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 387 | 393 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 388 | 394 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 389 | - $(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)/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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 | |
| 395 | + $(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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 | |
| 390 | 396 | touch $(OBJDIR)/headers |
| 391 | 397 | $(OBJDIR)/headers: Makefile |
| 392 | 398 | $(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 |
| 393 | 399 | Makefile: |
| 394 | 400 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -781,10 +787,24 @@ | ||
| 781 | 787 | |
| 782 | 788 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 783 | 789 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 784 | 790 | |
| 785 | 791 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 792 | +$(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate | |
| 793 | + $(OBJDIR)/translate $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c | |
| 794 | + | |
| 795 | +$(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h | |
| 796 | + $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c | |
| 797 | + | |
| 798 | +$(OBJDIR)/markdown.h: $(OBJDIR)/headers | |
| 799 | +$(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate | |
| 800 | + $(OBJDIR)/translate $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c | |
| 801 | + | |
| 802 | +$(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h | |
| 803 | + $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c | |
| 804 | + | |
| 805 | +$(OBJDIR)/markdown_html.h: $(OBJDIR)/headers | |
| 786 | 806 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 787 | 807 | $(OBJDIR)/translate $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 788 | 808 | |
| 789 | 809 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 790 | 810 | $(XTCC) -o $(OBJDIR)/md5.o -c $(OBJDIR)/md5_.c |
| 791 | 811 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -68,10 +68,12 @@ | |
| 68 | $(SRCDIR)/json_wiki.c \ |
| 69 | $(SRCDIR)/leaf.c \ |
| 70 | $(SRCDIR)/login.c \ |
| 71 | $(SRCDIR)/main.c \ |
| 72 | $(SRCDIR)/manifest.c \ |
| 73 | $(SRCDIR)/md5.c \ |
| 74 | $(SRCDIR)/merge.c \ |
| 75 | $(SRCDIR)/merge3.c \ |
| 76 | $(SRCDIR)/moderate.c \ |
| 77 | $(SRCDIR)/name.c \ |
| @@ -170,10 +172,12 @@ | |
| 170 | $(OBJDIR)/json_wiki_.c \ |
| 171 | $(OBJDIR)/leaf_.c \ |
| 172 | $(OBJDIR)/login_.c \ |
| 173 | $(OBJDIR)/main_.c \ |
| 174 | $(OBJDIR)/manifest_.c \ |
| 175 | $(OBJDIR)/md5_.c \ |
| 176 | $(OBJDIR)/merge_.c \ |
| 177 | $(OBJDIR)/merge3_.c \ |
| 178 | $(OBJDIR)/moderate_.c \ |
| 179 | $(OBJDIR)/name_.c \ |
| @@ -272,10 +276,12 @@ | |
| 272 | $(OBJDIR)/json_wiki.o \ |
| 273 | $(OBJDIR)/leaf.o \ |
| 274 | $(OBJDIR)/login.o \ |
| 275 | $(OBJDIR)/main.o \ |
| 276 | $(OBJDIR)/manifest.o \ |
| 277 | $(OBJDIR)/md5.o \ |
| 278 | $(OBJDIR)/merge.o \ |
| 279 | $(OBJDIR)/merge3.o \ |
| 280 | $(OBJDIR)/moderate.o \ |
| 281 | $(OBJDIR)/name.o \ |
| @@ -384,11 +390,11 @@ | |
| 384 | |
| 385 | |
| 386 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 387 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 388 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 389 | $(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)/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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 |
| 390 | touch $(OBJDIR)/headers |
| 391 | $(OBJDIR)/headers: Makefile |
| 392 | $(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 |
| 393 | Makefile: |
| 394 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -781,10 +787,24 @@ | |
| 781 | |
| 782 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 783 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 784 | |
| 785 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 786 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 787 | $(OBJDIR)/translate $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 788 | |
| 789 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 790 | $(XTCC) -o $(OBJDIR)/md5.o -c $(OBJDIR)/md5_.c |
| 791 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -68,10 +68,12 @@ | |
| 68 | $(SRCDIR)/json_wiki.c \ |
| 69 | $(SRCDIR)/leaf.c \ |
| 70 | $(SRCDIR)/login.c \ |
| 71 | $(SRCDIR)/main.c \ |
| 72 | $(SRCDIR)/manifest.c \ |
| 73 | $(SRCDIR)/markdown.c \ |
| 74 | $(SRCDIR)/markdown_html.c \ |
| 75 | $(SRCDIR)/md5.c \ |
| 76 | $(SRCDIR)/merge.c \ |
| 77 | $(SRCDIR)/merge3.c \ |
| 78 | $(SRCDIR)/moderate.c \ |
| 79 | $(SRCDIR)/name.c \ |
| @@ -170,10 +172,12 @@ | |
| 172 | $(OBJDIR)/json_wiki_.c \ |
| 173 | $(OBJDIR)/leaf_.c \ |
| 174 | $(OBJDIR)/login_.c \ |
| 175 | $(OBJDIR)/main_.c \ |
| 176 | $(OBJDIR)/manifest_.c \ |
| 177 | $(OBJDIR)/markdown_.c \ |
| 178 | $(OBJDIR)/markdown_html_.c \ |
| 179 | $(OBJDIR)/md5_.c \ |
| 180 | $(OBJDIR)/merge_.c \ |
| 181 | $(OBJDIR)/merge3_.c \ |
| 182 | $(OBJDIR)/moderate_.c \ |
| 183 | $(OBJDIR)/name_.c \ |
| @@ -272,10 +276,12 @@ | |
| 276 | $(OBJDIR)/json_wiki.o \ |
| 277 | $(OBJDIR)/leaf.o \ |
| 278 | $(OBJDIR)/login.o \ |
| 279 | $(OBJDIR)/main.o \ |
| 280 | $(OBJDIR)/manifest.o \ |
| 281 | $(OBJDIR)/markdown.o \ |
| 282 | $(OBJDIR)/markdown_html.o \ |
| 283 | $(OBJDIR)/md5.o \ |
| 284 | $(OBJDIR)/merge.o \ |
| 285 | $(OBJDIR)/merge3.o \ |
| 286 | $(OBJDIR)/moderate.o \ |
| 287 | $(OBJDIR)/name.o \ |
| @@ -384,11 +390,11 @@ | |
| 390 | |
| 391 | |
| 392 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 393 | $(OBJDIR)/mkindex $(TRANS_SRC) >$@ |
| 394 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 395 | $(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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 |
| 396 | touch $(OBJDIR)/headers |
| 397 | $(OBJDIR)/headers: Makefile |
| 398 | $(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 |
| 399 | Makefile: |
| 400 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -781,10 +787,24 @@ | |
| 787 | |
| 788 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 789 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 790 | |
| 791 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 792 | $(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate |
| 793 | $(OBJDIR)/translate $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c |
| 794 | |
| 795 | $(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h |
| 796 | $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c |
| 797 | |
| 798 | $(OBJDIR)/markdown.h: $(OBJDIR)/headers |
| 799 | $(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate |
| 800 | $(OBJDIR)/translate $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c |
| 801 | |
| 802 | $(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h |
| 803 | $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c |
| 804 | |
| 805 | $(OBJDIR)/markdown_html.h: $(OBJDIR)/headers |
| 806 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 807 | $(OBJDIR)/translate $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 808 | |
| 809 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 810 | $(XTCC) -o $(OBJDIR)/md5.o -c $(OBJDIR)/md5_.c |
| 811 |
+12
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -71,10 +71,12 @@ | ||
| 71 | 71 | json_wiki |
| 72 | 72 | leaf |
| 73 | 73 | login |
| 74 | 74 | main |
| 75 | 75 | manifest |
| 76 | + markdown | |
| 77 | + markdown_html | |
| 76 | 78 | md5 |
| 77 | 79 | merge |
| 78 | 80 | merge3 |
| 79 | 81 | moderate |
| 80 | 82 | name |
| @@ -373,10 +375,14 @@ | ||
| 373 | 375 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 374 | 376 | |
| 375 | 377 | #### Enable JSON (http://www.json.org) support using "cson" |
| 376 | 378 | # |
| 377 | 379 | # FOSSIL_ENABLE_JSON = 1 |
| 380 | + | |
| 381 | +#### Enable markdown support | |
| 382 | +# | |
| 383 | +# FOSSIL_ENABLE_MARKDOWN = 1 | |
| 378 | 384 | |
| 379 | 385 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 380 | 386 | # |
| 381 | 387 | # FOSSIL_ENABLE_SSL = 1 |
| 382 | 388 | |
| @@ -514,10 +520,16 @@ | ||
| 514 | 520 | # With JSON support |
| 515 | 521 | ifdef FOSSIL_ENABLE_JSON |
| 516 | 522 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 517 | 523 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 518 | 524 | endif |
| 525 | + | |
| 526 | +# With markdown support | |
| 527 | +ifdef FOSSIL_ENABLE_MARKDOWN | |
| 528 | +TCC += -DFOSSIL_ENABLE_MARKDOWN=1 | |
| 529 | +RCC += -DFOSSIL_ENABLE_MARKDOWN=1 | |
| 530 | +endif | |
| 519 | 531 | |
| 520 | 532 | #### We add the -static option here so that we can build a static |
| 521 | 533 | # executable that will run in a chroot jail. |
| 522 | 534 | # |
| 523 | 535 | LIB = -static |
| 524 | 536 | |
| 525 | 537 | ADDED src/markdown.c |
| 526 | 538 | ADDED src/markdown_html.c |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -71,10 +71,12 @@ | |
| 71 | json_wiki |
| 72 | leaf |
| 73 | login |
| 74 | main |
| 75 | manifest |
| 76 | md5 |
| 77 | merge |
| 78 | merge3 |
| 79 | moderate |
| 80 | name |
| @@ -373,10 +375,14 @@ | |
| 373 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 374 | |
| 375 | #### Enable JSON (http://www.json.org) support using "cson" |
| 376 | # |
| 377 | # FOSSIL_ENABLE_JSON = 1 |
| 378 | |
| 379 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 380 | # |
| 381 | # FOSSIL_ENABLE_SSL = 1 |
| 382 | |
| @@ -514,10 +520,16 @@ | |
| 514 | # With JSON support |
| 515 | ifdef FOSSIL_ENABLE_JSON |
| 516 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 517 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 518 | endif |
| 519 | |
| 520 | #### We add the -static option here so that we can build a static |
| 521 | # executable that will run in a chroot jail. |
| 522 | # |
| 523 | LIB = -static |
| 524 | |
| 525 | DDED src/markdown.c |
| 526 | DDED src/markdown_html.c |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -71,10 +71,12 @@ | |
| 71 | json_wiki |
| 72 | leaf |
| 73 | login |
| 74 | main |
| 75 | manifest |
| 76 | markdown |
| 77 | markdown_html |
| 78 | md5 |
| 79 | merge |
| 80 | merge3 |
| 81 | moderate |
| 82 | name |
| @@ -373,10 +375,14 @@ | |
| 375 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 376 | |
| 377 | #### Enable JSON (http://www.json.org) support using "cson" |
| 378 | # |
| 379 | # FOSSIL_ENABLE_JSON = 1 |
| 380 | |
| 381 | #### Enable markdown support |
| 382 | # |
| 383 | # FOSSIL_ENABLE_MARKDOWN = 1 |
| 384 | |
| 385 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 386 | # |
| 387 | # FOSSIL_ENABLE_SSL = 1 |
| 388 | |
| @@ -514,10 +520,16 @@ | |
| 520 | # With JSON support |
| 521 | ifdef FOSSIL_ENABLE_JSON |
| 522 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 523 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 524 | endif |
| 525 | |
| 526 | # With markdown support |
| 527 | ifdef FOSSIL_ENABLE_MARKDOWN |
| 528 | TCC += -DFOSSIL_ENABLE_MARKDOWN=1 |
| 529 | RCC += -DFOSSIL_ENABLE_MARKDOWN=1 |
| 530 | endif |
| 531 | |
| 532 | #### We add the -static option here so that we can build a static |
| 533 | # executable that will run in a chroot jail. |
| 534 | # |
| 535 | LIB = -static |
| 536 | |
| 537 | DDED src/markdown.c |
| 538 | DDED src/markdown_html.c |
+34
| --- a/src/markdown.c | ||
| +++ b/src/markdown.c | ||
| @@ -0,0 +1,34 @@ | ||
| 1 | +/* skipping a code span */`' ){ | |
| 2 | + nb = 0, bt; | |
| 3 | + && i++; | |
| 4 | + span_nb0; | |
| 5 | + | |
| 6 | + bt = 0;bt<span_nb++a linkdata[i]=='[' ){ i++; } | |
| 7 | +ifif((id, " ", 1);(work, "\n", 1(work, "\n", 1(work, "\n", 1(&text, "\n", 1);quote(ob, outout);/* skipping a code span */`' ){ | |
| 8 | + nb = 0, bt; | |
| 9 | + && i++; | |
| 10 | + span_nb0; | |
| 11 | + | |
| 12 | + bt = 0;bt<span_nb++a linkdata[i]=='[' ){ i++; } | |
| 13 | +ifif((id, " ", 1);(work, "\n", 1(work, "\n", 1(work, "\n", 1(&text, "\n", 1);nBlobCacheif( !workif( !workif( !workif( !titl if( !work ) work = obcod!if( head }int max_work_stack; /* prevent arbitrary deep recursion, cf READMEwork_activework;new_work_buffer --stack = 0; | |
| 14 | + | |
| 15 | + if( rndr->work_active < rndr->mfdef FOSSIL_ENABLE_MARKDOWNr->make.max_work_stack ){ | |
| 16 | + ret = rndr->work + rndr->work_active; | |
| 17 | + rndr->work_active += 1; | |
| 18 | + blob_reset(ret); | |
| 19 | + }_work_buffer --assert(rndr->work_active>0 && buf==(rndr->work+rndr->work_active-1)); | |
| 20 | + rndr->work_active}t<span_nb++at; | |
| 21 | + && i++; | |
| 22 | + ping a (sizeof block_tags)/()/etcsinhee2e id -the givencodldblockquote -- hanldquote -- hanldperator */ parenthesed dataata[i]=='[' ){ i++; } | |
| 23 | +ifif((id, " ", 1);(work, "\n", 1(work, "\n", 1(work, "\n", 1(&text, "\n", 1);nBlobCacheif( !workif( !workif( !workif( !titl if( !work ) work = obcod!if( head }int max_work_stack; /* prevent arbitrary deep recursion, cf READMEwork_activework;new_work_buffer --stack = 0; | |
| 24 | + | |
| 25 | + if( rndr->work_active < rndr->make.max_work_stack ){ | |
| 26 | + ret = rndr->work + rndr->work_active; | |
| 27 | + rndr->work_active += 1; | |
| 28 | + blob_reset(ret); | |
| 29 | + }_work_buffer --assert(rndr->work_active>0 && buf==(rndr->work+rndr->work_active-1)); | |
| 30 | + rndr->work_active}t<span_nb++at; | |
| 31 | + && i++; | |
| 32 | + ping a (sizeof block_tags)/()/etcsinhee2e id -the givencodldblockquote -- hanldquote -- hanldperator *//* szerozerotagzerozero(&lr[i].id); | |
| 33 | + blob_zerozerozerotstruct html_tag *tag,text_has_nl = 0,text_has_nl = 1 | |
| 34 | +#endif /* defstrncasestrncasestrncasestrncasestrncase |
| --- a/src/markdown.c | |
| +++ b/src/markdown.c | |
| @@ -0,0 +1,34 @@ | |
| --- a/src/markdown.c | |
| +++ b/src/markdown.c | |
| @@ -0,0 +1,34 @@ | |
| 1 | /* skipping a code span */`' ){ |
| 2 | nb = 0, bt; |
| 3 | && i++; |
| 4 | span_nb0; |
| 5 | |
| 6 | bt = 0;bt<span_nb++a linkdata[i]=='[' ){ i++; } |
| 7 | ifif((id, " ", 1);(work, "\n", 1(work, "\n", 1(work, "\n", 1(&text, "\n", 1);quote(ob, outout);/* skipping a code span */`' ){ |
| 8 | nb = 0, bt; |
| 9 | && i++; |
| 10 | span_nb0; |
| 11 | |
| 12 | bt = 0;bt<span_nb++a linkdata[i]=='[' ){ i++; } |
| 13 | ifif((id, " ", 1);(work, "\n", 1(work, "\n", 1(work, "\n", 1(&text, "\n", 1);nBlobCacheif( !workif( !workif( !workif( !titl if( !work ) work = obcod!if( head }int max_work_stack; /* prevent arbitrary deep recursion, cf READMEwork_activework;new_work_buffer --stack = 0; |
| 14 | |
| 15 | if( rndr->work_active < rndr->mfdef FOSSIL_ENABLE_MARKDOWNr->make.max_work_stack ){ |
| 16 | ret = rndr->work + rndr->work_active; |
| 17 | rndr->work_active += 1; |
| 18 | blob_reset(ret); |
| 19 | }_work_buffer --assert(rndr->work_active>0 && buf==(rndr->work+rndr->work_active-1)); |
| 20 | rndr->work_active}t<span_nb++at; |
| 21 | && i++; |
| 22 | ping a (sizeof block_tags)/()/etcsinhee2e id -the givencodldblockquote -- hanldquote -- hanldperator */ parenthesed dataata[i]=='[' ){ i++; } |
| 23 | ifif((id, " ", 1);(work, "\n", 1(work, "\n", 1(work, "\n", 1(&text, "\n", 1);nBlobCacheif( !workif( !workif( !workif( !titl if( !work ) work = obcod!if( head }int max_work_stack; /* prevent arbitrary deep recursion, cf READMEwork_activework;new_work_buffer --stack = 0; |
| 24 | |
| 25 | if( rndr->work_active < rndr->make.max_work_stack ){ |
| 26 | ret = rndr->work + rndr->work_active; |
| 27 | rndr->work_active += 1; |
| 28 | blob_reset(ret); |
| 29 | }_work_buffer --assert(rndr->work_active>0 && buf==(rndr->work+rndr->work_active-1)); |
| 30 | rndr->work_active}t<span_nb++at; |
| 31 | && i++; |
| 32 | ping a (sizeof block_tags)/()/etcsinhee2e id -the givencodldblockquote -- hanldquote -- hanldperator *//* szerozerotagzerozero(&lr[i].id); |
| 33 | blob_zerozerozerotstruct html_tag *tag,text_has_nl = 0,text_has_nl = 1 |
| 34 | #endif /* defstrncasestrncasestrncasestrncasestrncase |
+170
| --- a/src/markdown_html.c | ||
| +++ b/src/markdown_html.c | ||
| @@ -0,0 +1,170 @@ | ||
| 1 | +/* | |
| 2 | +** /* | |
| 3 | +** pp/* Invoked for @name and #tag tagged words, marked up in the | |
| 4 | +** output text in a way that JS and CSS can do something | |
| 5 | +** interesting with them. This isn't standard Markdown, so | |
| 6 | +** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* | |
| 7 | +** /* | |
| 8 | +** ppblob_appendf(o | |
| 9 | +** /* | |
| 10 | +** pp/* Invoked for ame and #taraw_blockchar *TagL/* | |
| 11 | +** For each byte of pIn which is an ASCII alphanumeric, its lowercase | |
| 12 | +** form is appended to pOut. The intent is to generate an automated | |
| 13 | +** HTML ID attribute from, e.g., header textfdef FOSSIL_ENABLE_MARKDOWNtext, in particular an ID | |
| 14 | +** which a human could easily recreate "in their hude "cmark_amalgamationir head" while writing a | |
| 15 | +** document, to facilitate the create of intra-document links. | |
| 16 | +*/text_to_id(Blob const * pIn, Blob *pOut){ | |
| 17 | + int i; | |
| 18 | + unsigned char const * z = (unsigned char const *)pIn->aData; | |
| 19 | + for( i = 0; i < pIn->nUsed; ++i, ++z ){ | |
| 20 | + if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS TERAL -- append a string lit and CSS c/* | |
| 21 | +**TERAL(blob, litresolve_hyteral, (sizeof lit zLink[0]=='/' && g.zTop ){ | |
| 22 | + /* For any hyperlink that begins with "/", make it refer to the root | |
| 23 | + ** of g.zTop, -1); | |
| 24 | + } | |
| 25 | +>onteent</a>".*s.*s.*shem. This isn't standard Markdown, so | |
| 26 | +** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* | |
| 27 | +** /* | |
| 28 | +** ppblob_appendf(o | |
| 29 | +** /* | |
| 30 | +** */"while writing a | |
| 31 | +** d *)pIn->aData; | |
| 32 | + for( i = 0; i < pIn->nUsed; ++i, ++z ){ | |
| 33 | + if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS and CSS c/* | |
| 34 | +** /* | |
| 35 | +** pp/* Inv64, /* maximum stackwiki_resolve_hyperlink(ob, 0 | |
| 36 | +a href=\""); | |
| 37 | + if( zLink && zLink[0]=='/' && g.zTop ){ | |
| 38 | + /* For any hyperlink that begzLink &){ | |
| 39 | + /* For any hyperlink that begins with "/", make it refer to the rooot | |
| 40 | + ** of g.zTop, -1); | |
| 41 | + } | |
| 42 | +>ontent</a>"/* | |
| 43 | +** /* | |
| 44 | +** pp/* Invoked for @na&.zTop, -1); | |
| 45 | + } | |
| 46 | +>ontent</a>"/* | |
| 47 | +", -1); | |
| 48 | + } | |
| 49 | +>ontent</a>"/* | |
| 50 | +**paquopaqu0char *zCss = 0&& zCss=t){ | |
| 51 | + int i; | |
| 52 | + unsigned ch "\n", 1 rticular an ID | |
| 53 | +** which a human could easily recreate "in their hude "cmark_amalgamationir he* document, to facilitate the create of intra-document links. | |
| 54 | +*/text_to_id(Blob const * pIn, Blob *pOut){ | |
| 55 | + int i; | |
| 56 | + unsigned char const * z = (unsigned char const *)pIn->aData; | |
| 57 | + for( i = 0; i < pIn->nUsed; ++i, ++z ){ | |
| 58 | + if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS TERAL -- append a string lit and CSS c/* | |
| 59 | +**TERAL(blob, litresolve_hyteral, (sizeof lit zLink[0]=='/' && g.zTop ){ | |
| 60 | + /* For any hyperlink that begins with "/", make it refer to the root | |
| 61 | + ** of g.zTop, -1); | |
| 62 | + } | |
| 63 | +>onteent</a>".*s.*s.*shem. This isn't standard Markdown, so | |
| 64 | +** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* | |
| 65 | +** /* | |
| 66 | +** ppblob_appendf(o | |
| 67 | +** /* | |
| 68 | +** */"while writing a | |
| 69 | +** d *)pIn->aData; | |
| 70 | + for( i = 0; i < pIn->nUsed; ++i, ++z ){ | |
| 71 | + if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS and CSS c/* | |
| 72 | +** /* | |
| 73 | +** pp/* Inv64, /* maximum stackwiki_resolve_hyperlink(ob, 0 | |
| 74 | +a href=\""); | |
| 75 | + if( zLink && zLink[0]=='/' && g.zTop ){ | |
| 76 | + /* For any hyperlink that begzLink &){ | |
| 77 | + /* For any hyperlink that begins with "/", make it refer to the rooot | |
| 78 | + ** of g.zTop, -1); | |
| 79 | + } | |
| 80 | +>ontent</a>"/* | |
| 81 | +** /* | |
| 82 | +** pp/* Invoked for @na&.zTop, -1); | |
| 83 | + } | |
| 84 | +>ontent</a>"/* | |
| 85 | +", -1); | |
| 86 | + } | |
| 87 | +>ontent</a>"/* | |
| 88 | +**paquopaqu0char *zCss = 0&& zCss=t){ | |
| 89 | + int i; | |
| 90 | + unsigned ch "\n", 1 rticular an ID | |
| 91 | +** which a human could easily recreate "in their hude "cmark_amalgamationir head" while /* | |
| 92 | +** /* | |
| 93 | +** pp/* Invoked for @name and #tag tagged words, marked up in the | |
| 94 | +** output text in a way that JS and CSS can do something | |
| 95 | +*/* | |
| 96 | +** /* | |
| 97 | +** pp/* Invepilog and #tag tagged wo/* | |
| 98 | +** /* | |
| 99 | +** pp/* Invoked for @name and #tag tagged words, marked up in the | |
| 100 | +** output text in a way that JS and CSS can do something | |
| 101 | +** interesting with them. This isn't standard Markdown, so | |
| 102 | +** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* | |
| 103 | +** /* | |
| 104 | +** ppblob_appendf(o | |
| 105 | +** /* | |
| 106 | +** pp/* Invoked for ame and #taraw_blockchar *TagL/* | |
| 107 | +** For each byte of pIn which is an ASCII alphanumeric, its lowercase | |
| 108 | +** form is appended to pOut. The intent is to generate an automated | |
| 109 | +** HTML ID attribute from, e.g., header text, in particular an ID | |
| 110 | +** which a human could easily recreate "in their hude "cmark_amalgamationir head" while writing a | |
| 111 | +** document, to facilitate the create of intra-document links. | |
| 112 | +*/text_to_id(Blob const * pIn, Blob *pOut){ | |
| 113 | + int i; | |
| 114 | + unsigned char const * z = (unsigned char const *)pIn->aData; | |
| 115 | + for( i = 0; i < pIn->nUsed; ++i, ++z ){ | |
| 116 | + if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS T==0 &&/* Invoked for @n return; | |
| 117 | + }dard Markdown, so | |
| 118 | +** igned ch "\n", 1 rtih%d>", levelmprintf(width:%dp){ | |
| 119 | + int i; | |
| 120 | + unsigned ch "\n", 1 rticular an ID | |
| 121 | +** which a human could easily recreate "in their hude "cmark_amalgamationir head" while writing a | |
| 122 | +** document, to facilitate the creatpIn, Blob *pOut){ | |
| 123 | + int i; | |
| 124 | + unsigned char const * z = (unsigned char const *)pIn->aData; | |
| 125 | + for( i = 0; i < pIn->nUsed; ++i, ++z ){ | |
| 126 | + if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS and CSS c/* | |
| 127 | +** /* | |
| 128 | +** pp/* Inv64, /* maximum stackwiki_resolve_hyperlink(ob, 0 | |
| 129 | +a href=\""); | |
| 130 | + if( zLink && zLink[0]=='/' && g.zTop ){ | |
| 131 | + /* For aith "/", make it refer to the root | |
| 132 | + ** of g.zTop, -1); | |
| 133 | + } | |
| 134 | +>ontent</a>".*s.*s.*shem. This isn't standard Markdown, so | |
| 135 | +** it's impllementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_st</preloat:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* | |
| 136 | +** /* | |
| 137 | +** ppblob_appendf(o | |
| 138 | +** / d *)pIn->aData; | |
| 139 | + for( i = 0; i < pIn->nUsed; ++i, ++z ){ | |
| 140 | + if(*z<128(ob,, "\n", 1 Z = h%d>", levelin a way that JS and CSS c/* | |
| 141 | +** /* | |
| 142 | +** pp/* Inv64, /* maximum stackwiki_resolve_hyperlink(ob, 0 | |
| 143 | +a href=\""); | |
| 144 | + if( zLink && zLink[0]=='/' && g.zTop ){ | |
| 145 | + /* For any hyperlink that begzLink && zLink[0]=='/' && g.zTop ){ | |
| 146 | + /* For any hyperlink that begins with "/", make it refer to the root | |
| 147 | + ** of g.zTop, -1); | |
| 148 | + } | |
| 149 | +>ontent</a>"/* | |
| 150 | +** /* | |
| 151 | +** pp/* Invoked for @name and #tag tagged't standard Markdown, so | |
| 152 | +** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss=t){ | |
| 153 | + int i; | |
| 154 | + unsigned ch "\n", 1 a way that JS and CSS ca/* | |
| 155 | +** /* | |
| 156 | +**code* | |
| 157 | +** /* | |
| 158 | +** pp/* Invoked for @name and #tag tagged words, marked up in tameTERAL(ob, "TERAL(ob, "\"ting with them. This isn't standard Markdown, so | |
| 159 | +** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* | |
| 160 | +** /* | |
| 161 | +** ppblob_appendf(o | |
| 162 | +** /* | |
| 163 | +** pp/* Invoked for ame and #taraw_blockchar *TagL/* | |
| 164 | +** For each byte of pIn which is an ASCII alphanumeric, its lowercase | |
| 165 | +** form is appended to pOut. The intent is to generate an automated | |
| 166 | +** HTML ID attribute from, e.g., header text, in particular an ID | |
| 167 | +** which a human could easily recreate "in their hude "cmark_amalgamationir head" while writing a | |
| 168 | +** document, to facilitate the create of intra-document links. | |
| 169 | +*/text_to_id(Blob co0, 0, /* no prolog or epilog */output_title | |
| 170 | +#endif /* def |
| --- a/src/markdown_html.c | |
| +++ b/src/markdown_html.c | |
| @@ -0,0 +1,170 @@ | |
| --- a/src/markdown_html.c | |
| +++ b/src/markdown_html.c | |
| @@ -0,0 +1,170 @@ | |
| 1 | /* |
| 2 | ** /* |
| 3 | ** pp/* Invoked for @name and #tag tagged words, marked up in the |
| 4 | ** output text in a way that JS and CSS can do something |
| 5 | ** interesting with them. This isn't standard Markdown, so |
| 6 | ** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* |
| 7 | ** /* |
| 8 | ** ppblob_appendf(o |
| 9 | ** /* |
| 10 | ** pp/* Invoked for ame and #taraw_blockchar *TagL/* |
| 11 | ** For each byte of pIn which is an ASCII alphanumeric, its lowercase |
| 12 | ** form is appended to pOut. The intent is to generate an automated |
| 13 | ** HTML ID attribute from, e.g., header textfdef FOSSIL_ENABLE_MARKDOWNtext, in particular an ID |
| 14 | ** which a human could easily recreate "in their hude "cmark_amalgamationir head" while writing a |
| 15 | ** document, to facilitate the create of intra-document links. |
| 16 | */text_to_id(Blob const * pIn, Blob *pOut){ |
| 17 | int i; |
| 18 | unsigned char const * z = (unsigned char const *)pIn->aData; |
| 19 | for( i = 0; i < pIn->nUsed; ++i, ++z ){ |
| 20 | if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS TERAL -- append a string lit and CSS c/* |
| 21 | **TERAL(blob, litresolve_hyteral, (sizeof lit zLink[0]=='/' && g.zTop ){ |
| 22 | /* For any hyperlink that begins with "/", make it refer to the root |
| 23 | ** of g.zTop, -1); |
| 24 | } |
| 25 | >onteent</a>".*s.*s.*shem. This isn't standard Markdown, so |
| 26 | ** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* |
| 27 | ** /* |
| 28 | ** ppblob_appendf(o |
| 29 | ** /* |
| 30 | ** */"while writing a |
| 31 | ** d *)pIn->aData; |
| 32 | for( i = 0; i < pIn->nUsed; ++i, ++z ){ |
| 33 | if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS and CSS c/* |
| 34 | ** /* |
| 35 | ** pp/* Inv64, /* maximum stackwiki_resolve_hyperlink(ob, 0 |
| 36 | a href=\""); |
| 37 | if( zLink && zLink[0]=='/' && g.zTop ){ |
| 38 | /* For any hyperlink that begzLink &){ |
| 39 | /* For any hyperlink that begins with "/", make it refer to the rooot |
| 40 | ** of g.zTop, -1); |
| 41 | } |
| 42 | >ontent</a>"/* |
| 43 | ** /* |
| 44 | ** pp/* Invoked for @na&.zTop, -1); |
| 45 | } |
| 46 | >ontent</a>"/* |
| 47 | ", -1); |
| 48 | } |
| 49 | >ontent</a>"/* |
| 50 | **paquopaqu0char *zCss = 0&& zCss=t){ |
| 51 | int i; |
| 52 | unsigned ch "\n", 1 rticular an ID |
| 53 | ** which a human could easily recreate "in their hude "cmark_amalgamationir he* document, to facilitate the create of intra-document links. |
| 54 | */text_to_id(Blob const * pIn, Blob *pOut){ |
| 55 | int i; |
| 56 | unsigned char const * z = (unsigned char const *)pIn->aData; |
| 57 | for( i = 0; i < pIn->nUsed; ++i, ++z ){ |
| 58 | if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS TERAL -- append a string lit and CSS c/* |
| 59 | **TERAL(blob, litresolve_hyteral, (sizeof lit zLink[0]=='/' && g.zTop ){ |
| 60 | /* For any hyperlink that begins with "/", make it refer to the root |
| 61 | ** of g.zTop, -1); |
| 62 | } |
| 63 | >onteent</a>".*s.*s.*shem. This isn't standard Markdown, so |
| 64 | ** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* |
| 65 | ** /* |
| 66 | ** ppblob_appendf(o |
| 67 | ** /* |
| 68 | ** */"while writing a |
| 69 | ** d *)pIn->aData; |
| 70 | for( i = 0; i < pIn->nUsed; ++i, ++z ){ |
| 71 | if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS and CSS c/* |
| 72 | ** /* |
| 73 | ** pp/* Inv64, /* maximum stackwiki_resolve_hyperlink(ob, 0 |
| 74 | a href=\""); |
| 75 | if( zLink && zLink[0]=='/' && g.zTop ){ |
| 76 | /* For any hyperlink that begzLink &){ |
| 77 | /* For any hyperlink that begins with "/", make it refer to the rooot |
| 78 | ** of g.zTop, -1); |
| 79 | } |
| 80 | >ontent</a>"/* |
| 81 | ** /* |
| 82 | ** pp/* Invoked for @na&.zTop, -1); |
| 83 | } |
| 84 | >ontent</a>"/* |
| 85 | ", -1); |
| 86 | } |
| 87 | >ontent</a>"/* |
| 88 | **paquopaqu0char *zCss = 0&& zCss=t){ |
| 89 | int i; |
| 90 | unsigned ch "\n", 1 rticular an ID |
| 91 | ** which a human could easily recreate "in their hude "cmark_amalgamationir head" while /* |
| 92 | ** /* |
| 93 | ** pp/* Invoked for @name and #tag tagged words, marked up in the |
| 94 | ** output text in a way that JS and CSS can do something |
| 95 | */* |
| 96 | ** /* |
| 97 | ** pp/* Invepilog and #tag tagged wo/* |
| 98 | ** /* |
| 99 | ** pp/* Invoked for @name and #tag tagged words, marked up in the |
| 100 | ** output text in a way that JS and CSS can do something |
| 101 | ** interesting with them. This isn't standard Markdown, so |
| 102 | ** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* |
| 103 | ** /* |
| 104 | ** ppblob_appendf(o |
| 105 | ** /* |
| 106 | ** pp/* Invoked for ame and #taraw_blockchar *TagL/* |
| 107 | ** For each byte of pIn which is an ASCII alphanumeric, its lowercase |
| 108 | ** form is appended to pOut. The intent is to generate an automated |
| 109 | ** HTML ID attribute from, e.g., header text, in particular an ID |
| 110 | ** which a human could easily recreate "in their hude "cmark_amalgamationir head" while writing a |
| 111 | ** document, to facilitate the create of intra-document links. |
| 112 | */text_to_id(Blob const * pIn, Blob *pOut){ |
| 113 | int i; |
| 114 | unsigned char const * z = (unsigned char const *)pIn->aData; |
| 115 | for( i = 0; i < pIn->nUsed; ++i, ++z ){ |
| 116 | if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS T==0 &&/* Invoked for @n return; |
| 117 | }dard Markdown, so |
| 118 | ** igned ch "\n", 1 rtih%d>", levelmprintf(width:%dp){ |
| 119 | int i; |
| 120 | unsigned ch "\n", 1 rticular an ID |
| 121 | ** which a human could easily recreate "in their hude "cmark_amalgamationir head" while writing a |
| 122 | ** document, to facilitate the creatpIn, Blob *pOut){ |
| 123 | int i; |
| 124 | unsigned char const * z = (unsigned char const *)pIn->aData; |
| 125 | for( i = 0; i < pIn->nUsed; ++i, ++z ){ |
| 126 | if(*z<128(ob, "\n", 1 Z = h%d>", levelin a way that JS and CSS c/* |
| 127 | ** /* |
| 128 | ** pp/* Inv64, /* maximum stackwiki_resolve_hyperlink(ob, 0 |
| 129 | a href=\""); |
| 130 | if( zLink && zLink[0]=='/' && g.zTop ){ |
| 131 | /* For aith "/", make it refer to the root |
| 132 | ** of g.zTop, -1); |
| 133 | } |
| 134 | >ontent</a>".*s.*s.*shem. This isn't standard Markdown, so |
| 135 | ** it's impllementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_st</preloat:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* |
| 136 | ** /* |
| 137 | ** ppblob_appendf(o |
| 138 | ** / d *)pIn->aData; |
| 139 | for( i = 0; i < pIn->nUsed; ++i, ++z ){ |
| 140 | if(*z<128(ob,, "\n", 1 Z = h%d>", levelin a way that JS and CSS c/* |
| 141 | ** /* |
| 142 | ** pp/* Inv64, /* maximum stackwiki_resolve_hyperlink(ob, 0 |
| 143 | a href=\""); |
| 144 | if( zLink && zLink[0]=='/' && g.zTop ){ |
| 145 | /* For any hyperlink that begzLink && zLink[0]=='/' && g.zTop ){ |
| 146 | /* For any hyperlink that begins with "/", make it refer to the root |
| 147 | ** of g.zTop, -1); |
| 148 | } |
| 149 | >ontent</a>"/* |
| 150 | ** /* |
| 151 | ** pp/* Invoked for @name and #tag tagged't standard Markdown, so |
| 152 | ** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss=t){ |
| 153 | int i; |
| 154 | unsigned ch "\n", 1 a way that JS and CSS ca/* |
| 155 | ** /* |
| 156 | **code* |
| 157 | ** /* |
| 158 | ** pp/* Invoked for @name and #tag tagged words, marked up in tameTERAL(ob, "TERAL(ob, "\"ting with them. This isn't standard Markdown, so |
| 159 | ** it's implementation-Blob*)opaquopaqu0char *zCss = 0&& zCss==zCss = mprintf(width:%dpx;", wzCss = fossil_strdup(zCss = mprintf("float:lestatic void fenced_code_fenced_code_ pp/* Invoked for @nam/* |
| 160 | ** /* |
| 161 | ** ppblob_appendf(o |
| 162 | ** /* |
| 163 | ** pp/* Invoked for ame and #taraw_blockchar *TagL/* |
| 164 | ** For each byte of pIn which is an ASCII alphanumeric, its lowercase |
| 165 | ** form is appended to pOut. The intent is to generate an automated |
| 166 | ** HTML ID attribute from, e.g., header text, in particular an ID |
| 167 | ** which a human could easily recreate "in their hude "cmark_amalgamationir head" while writing a |
| 168 | ** document, to facilitate the create of intra-document links. |
| 169 | */text_to_id(Blob co0, 0, /* no prolog or epilog */output_title |
| 170 | #endif /* def |
+6
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -265,10 +265,11 @@ | ||
| 265 | 265 | ** |
| 266 | 266 | ** "json" = FOSSIL_ENABLE_JSON |
| 267 | 267 | ** "ssl" = FOSSIL_ENABLE_SSL |
| 268 | 268 | ** "tcl" = FOSSIL_ENABLE_TCL |
| 269 | 269 | ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS |
| 270 | +** "markdown" = FOSSIL_ENABLE_MARKDOWN | |
| 270 | 271 | ** |
| 271 | 272 | */ |
| 272 | 273 | static int hasfeatureCmd( |
| 273 | 274 | Th_Interp *interp, |
| 274 | 275 | void *p, |
| @@ -302,10 +303,15 @@ | ||
| 302 | 303 | #endif |
| 303 | 304 | #if defined(FOSSIL_ENABLE_TCL_STUBS) |
| 304 | 305 | else if( 0 == fossil_strnicmp( zArg, "tclStubs", 8 ) ){ |
| 305 | 306 | rc = 1; |
| 306 | 307 | } |
| 308 | +#endif | |
| 309 | +#if defined(FOSSIL_ENABLE_MARKDOWN) | |
| 310 | + else if( 0 == fossil_strnicmp( zArg, "markdown", 8 ) ){ | |
| 311 | + rc = 1; | |
| 312 | + } | |
| 307 | 313 | #endif |
| 308 | 314 | if( g.thTrace ){ |
| 309 | 315 | Th_Trace("[hasfeature %#h] => %d<br />\n", argl[1], zArg, rc); |
| 310 | 316 | } |
| 311 | 317 | Th_SetResultInt(interp, rc); |
| 312 | 318 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -265,10 +265,11 @@ | |
| 265 | ** |
| 266 | ** "json" = FOSSIL_ENABLE_JSON |
| 267 | ** "ssl" = FOSSIL_ENABLE_SSL |
| 268 | ** "tcl" = FOSSIL_ENABLE_TCL |
| 269 | ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS |
| 270 | ** |
| 271 | */ |
| 272 | static int hasfeatureCmd( |
| 273 | Th_Interp *interp, |
| 274 | void *p, |
| @@ -302,10 +303,15 @@ | |
| 302 | #endif |
| 303 | #if defined(FOSSIL_ENABLE_TCL_STUBS) |
| 304 | else if( 0 == fossil_strnicmp( zArg, "tclStubs", 8 ) ){ |
| 305 | rc = 1; |
| 306 | } |
| 307 | #endif |
| 308 | if( g.thTrace ){ |
| 309 | Th_Trace("[hasfeature %#h] => %d<br />\n", argl[1], zArg, rc); |
| 310 | } |
| 311 | Th_SetResultInt(interp, rc); |
| 312 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -265,10 +265,11 @@ | |
| 265 | ** |
| 266 | ** "json" = FOSSIL_ENABLE_JSON |
| 267 | ** "ssl" = FOSSIL_ENABLE_SSL |
| 268 | ** "tcl" = FOSSIL_ENABLE_TCL |
| 269 | ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS |
| 270 | ** "markdown" = FOSSIL_ENABLE_MARKDOWN |
| 271 | ** |
| 272 | */ |
| 273 | static int hasfeatureCmd( |
| 274 | Th_Interp *interp, |
| 275 | void *p, |
| @@ -302,10 +303,15 @@ | |
| 303 | #endif |
| 304 | #if defined(FOSSIL_ENABLE_TCL_STUBS) |
| 305 | else if( 0 == fossil_strnicmp( zArg, "tclStubs", 8 ) ){ |
| 306 | rc = 1; |
| 307 | } |
| 308 | #endif |
| 309 | #if defined(FOSSIL_ENABLE_MARKDOWN) |
| 310 | else if( 0 == fossil_strnicmp( zArg, "markdown", 8 ) ){ |
| 311 | rc = 1; |
| 312 | } |
| 313 | #endif |
| 314 | if( g.thTrace ){ |
| 315 | Th_Trace("[hasfeature %#h] => %d<br />\n", argl[1], zArg, rc); |
| 316 | } |
| 317 | Th_SetResultInt(interp, rc); |
| 318 |
+16
-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 md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c utf8_.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_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 report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c utf8_.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)\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)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$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_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)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$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 md5 merge merge3 moderate name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user utf8 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_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 report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user utf8 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 >> $@ |
| @@ -445,10 +445,22 @@ | ||
| 445 | 445 | $(OBJDIR)\manifest$O : manifest_.c manifest.h |
| 446 | 446 | $(TCC) -o$@ -c manifest_.c |
| 447 | 447 | |
| 448 | 448 | manifest_.c : $(SRCDIR)\manifest.c |
| 449 | 449 | +translate$E $** > $@ |
| 450 | + | |
| 451 | +$(OBJDIR)\markdown$O : markdown_.c markdown.h | |
| 452 | + $(TCC) -o$@ -c markdown_.c | |
| 453 | + | |
| 454 | +markdown_.c : $(SRCDIR)\markdown.c | |
| 455 | + +translate$E $** > $@ | |
| 456 | + | |
| 457 | +$(OBJDIR)\markdown_html$O : markdown_html_.c markdown_html.h | |
| 458 | + $(TCC) -o$@ -c markdown_html_.c | |
| 459 | + | |
| 460 | +markdown_html_.c : $(SRCDIR)\markdown_html.c | |
| 461 | + +translate$E $** > $@ | |
| 450 | 462 | |
| 451 | 463 | $(OBJDIR)\md5$O : md5_.c md5.h |
| 452 | 464 | $(TCC) -o$@ -c md5_.c |
| 453 | 465 | |
| 454 | 466 | md5_.c : $(SRCDIR)\md5.c |
| @@ -711,7 +723,7 @@ | ||
| 711 | 723 | |
| 712 | 724 | zip_.c : $(SRCDIR)\zip.c |
| 713 | 725 | +translate$E $** > $@ |
| 714 | 726 | |
| 715 | 727 | headers: makeheaders$E page_index.h VERSION.h |
| 716 | - +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 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 report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.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 | |
| 728 | + +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 report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.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 | |
| 717 | 729 | @copy /Y nul: headers |
| 718 | 730 |
| --- 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 md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c utf8_.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)\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)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$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 md5 merge merge3 moderate name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user utf8 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 >> $@ |
| @@ -445,10 +445,22 @@ | |
| 445 | $(OBJDIR)\manifest$O : manifest_.c manifest.h |
| 446 | $(TCC) -o$@ -c manifest_.c |
| 447 | |
| 448 | manifest_.c : $(SRCDIR)\manifest.c |
| 449 | +translate$E $** > $@ |
| 450 | |
| 451 | $(OBJDIR)\md5$O : md5_.c md5.h |
| 452 | $(TCC) -o$@ -c md5_.c |
| 453 | |
| 454 | md5_.c : $(SRCDIR)\md5.c |
| @@ -711,7 +723,7 @@ | |
| 711 | |
| 712 | zip_.c : $(SRCDIR)\zip.c |
| 713 | +translate$E $** > $@ |
| 714 | |
| 715 | headers: makeheaders$E page_index.h VERSION.h |
| 716 | +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 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 report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.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 |
| 717 | @copy /Y nul: headers |
| 718 |
| --- 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 report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c utf8_.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)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$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 report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user utf8 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 >> $@ |
| @@ -445,10 +445,22 @@ | |
| 445 | $(OBJDIR)\manifest$O : manifest_.c manifest.h |
| 446 | $(TCC) -o$@ -c manifest_.c |
| 447 | |
| 448 | manifest_.c : $(SRCDIR)\manifest.c |
| 449 | +translate$E $** > $@ |
| 450 | |
| 451 | $(OBJDIR)\markdown$O : markdown_.c markdown.h |
| 452 | $(TCC) -o$@ -c markdown_.c |
| 453 | |
| 454 | markdown_.c : $(SRCDIR)\markdown.c |
| 455 | +translate$E $** > $@ |
| 456 | |
| 457 | $(OBJDIR)\markdown_html$O : markdown_html_.c markdown_html.h |
| 458 | $(TCC) -o$@ -c markdown_html_.c |
| 459 | |
| 460 | markdown_html_.c : $(SRCDIR)\markdown_html.c |
| 461 | +translate$E $** > $@ |
| 462 | |
| 463 | $(OBJDIR)\md5$O : md5_.c md5.h |
| 464 | $(TCC) -o$@ -c md5_.c |
| 465 | |
| 466 | md5_.c : $(SRCDIR)\md5.c |
| @@ -711,7 +723,7 @@ | |
| 723 | |
| 724 | zip_.c : $(SRCDIR)\zip.c |
| 725 | +translate$E $** > $@ |
| 726 | |
| 727 | headers: makeheaders$E page_index.h VERSION.h |
| 728 | +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 report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.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 |
| 729 | @copy /Y nul: headers |
| 730 |
+33
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -43,10 +43,14 @@ | ||
| 43 | 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | 44 | |
| 45 | 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | 46 | # |
| 47 | 47 | # FOSSIL_ENABLE_JSON = 1 |
| 48 | + | |
| 49 | +#### Enable markdown support | |
| 50 | +# | |
| 51 | +# FOSSIL_ENABLE_MARKDOWN = 1 | |
| 48 | 52 | |
| 49 | 53 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | 54 | # |
| 51 | 55 | # FOSSIL_ENABLE_SSL = 1 |
| 52 | 56 | |
| @@ -184,10 +188,16 @@ | ||
| 184 | 188 | # With JSON support |
| 185 | 189 | ifdef FOSSIL_ENABLE_JSON |
| 186 | 190 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 187 | 191 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 188 | 192 | endif |
| 193 | + | |
| 194 | +# With markdown support | |
| 195 | +ifdef FOSSIL_ENABLE_MARKDOWN | |
| 196 | +TCC += -DFOSSIL_ENABLE_MARKDOWN=1 | |
| 197 | +RCC += -DFOSSIL_ENABLE_MARKDOWN=1 | |
| 198 | +endif | |
| 189 | 199 | |
| 190 | 200 | #### We add the -static option here so that we can build a static |
| 191 | 201 | # executable that will run in a chroot jail. |
| 192 | 202 | # |
| 193 | 203 | LIB = -static |
| @@ -299,10 +309,12 @@ | ||
| 299 | 309 | $(SRCDIR)/json_wiki.c \ |
| 300 | 310 | $(SRCDIR)/leaf.c \ |
| 301 | 311 | $(SRCDIR)/login.c \ |
| 302 | 312 | $(SRCDIR)/main.c \ |
| 303 | 313 | $(SRCDIR)/manifest.c \ |
| 314 | + $(SRCDIR)/markdown.c \ | |
| 315 | + $(SRCDIR)/markdown_html.c \ | |
| 304 | 316 | $(SRCDIR)/md5.c \ |
| 305 | 317 | $(SRCDIR)/merge.c \ |
| 306 | 318 | $(SRCDIR)/merge3.c \ |
| 307 | 319 | $(SRCDIR)/moderate.c \ |
| 308 | 320 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | ||
| 401 | 413 | $(OBJDIR)/json_wiki_.c \ |
| 402 | 414 | $(OBJDIR)/leaf_.c \ |
| 403 | 415 | $(OBJDIR)/login_.c \ |
| 404 | 416 | $(OBJDIR)/main_.c \ |
| 405 | 417 | $(OBJDIR)/manifest_.c \ |
| 418 | + $(OBJDIR)/markdown_.c \ | |
| 419 | + $(OBJDIR)/markdown_html_.c \ | |
| 406 | 420 | $(OBJDIR)/md5_.c \ |
| 407 | 421 | $(OBJDIR)/merge_.c \ |
| 408 | 422 | $(OBJDIR)/merge3_.c \ |
| 409 | 423 | $(OBJDIR)/moderate_.c \ |
| 410 | 424 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | ||
| 503 | 517 | $(OBJDIR)/json_wiki.o \ |
| 504 | 518 | $(OBJDIR)/leaf.o \ |
| 505 | 519 | $(OBJDIR)/login.o \ |
| 506 | 520 | $(OBJDIR)/main.o \ |
| 507 | 521 | $(OBJDIR)/manifest.o \ |
| 522 | + $(OBJDIR)/markdown.o \ | |
| 523 | + $(OBJDIR)/markdown_html.o \ | |
| 508 | 524 | $(OBJDIR)/md5.o \ |
| 509 | 525 | $(OBJDIR)/merge.o \ |
| 510 | 526 | $(OBJDIR)/merge3.o \ |
| 511 | 527 | $(OBJDIR)/moderate.o \ |
| 512 | 528 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | ||
| 662 | 678 | |
| 663 | 679 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 664 | 680 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 665 | 681 | |
| 666 | 682 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 667 | - $(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)/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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 | |
| 683 | + $(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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 | |
| 668 | 684 | echo Done >$(OBJDIR)/headers |
| 669 | 685 | |
| 670 | 686 | $(OBJDIR)/headers: Makefile |
| 671 | 687 | |
| 672 | 688 | Makefile: |
| @@ -1116,10 +1132,26 @@ | ||
| 1116 | 1132 | |
| 1117 | 1133 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1118 | 1134 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1119 | 1135 | |
| 1120 | 1136 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1137 | + | |
| 1138 | +$(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate | |
| 1139 | + $(TRANSLATE) $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c | |
| 1140 | + | |
| 1141 | +$(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h | |
| 1142 | + $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c | |
| 1143 | + | |
| 1144 | +$(OBJDIR)/markdown.h: $(OBJDIR)/headers | |
| 1145 | + | |
| 1146 | +$(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate | |
| 1147 | + $(TRANSLATE) $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c | |
| 1148 | + | |
| 1149 | +$(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h | |
| 1150 | + $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c | |
| 1151 | + | |
| 1152 | +$(OBJDIR)/markdown_html.h: $(OBJDIR)/headers | |
| 1121 | 1153 | |
| 1122 | 1154 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1123 | 1155 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1124 | 1156 | |
| 1125 | 1157 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1126 | 1158 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -43,10 +43,14 @@ | |
| 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | |
| 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | # |
| 47 | # FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | # |
| 51 | # FOSSIL_ENABLE_SSL = 1 |
| 52 | |
| @@ -184,10 +188,16 @@ | |
| 184 | # With JSON support |
| 185 | ifdef FOSSIL_ENABLE_JSON |
| 186 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 187 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 188 | endif |
| 189 | |
| 190 | #### We add the -static option here so that we can build a static |
| 191 | # executable that will run in a chroot jail. |
| 192 | # |
| 193 | LIB = -static |
| @@ -299,10 +309,12 @@ | |
| 299 | $(SRCDIR)/json_wiki.c \ |
| 300 | $(SRCDIR)/leaf.c \ |
| 301 | $(SRCDIR)/login.c \ |
| 302 | $(SRCDIR)/main.c \ |
| 303 | $(SRCDIR)/manifest.c \ |
| 304 | $(SRCDIR)/md5.c \ |
| 305 | $(SRCDIR)/merge.c \ |
| 306 | $(SRCDIR)/merge3.c \ |
| 307 | $(SRCDIR)/moderate.c \ |
| 308 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | |
| 401 | $(OBJDIR)/json_wiki_.c \ |
| 402 | $(OBJDIR)/leaf_.c \ |
| 403 | $(OBJDIR)/login_.c \ |
| 404 | $(OBJDIR)/main_.c \ |
| 405 | $(OBJDIR)/manifest_.c \ |
| 406 | $(OBJDIR)/md5_.c \ |
| 407 | $(OBJDIR)/merge_.c \ |
| 408 | $(OBJDIR)/merge3_.c \ |
| 409 | $(OBJDIR)/moderate_.c \ |
| 410 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | |
| 503 | $(OBJDIR)/json_wiki.o \ |
| 504 | $(OBJDIR)/leaf.o \ |
| 505 | $(OBJDIR)/login.o \ |
| 506 | $(OBJDIR)/main.o \ |
| 507 | $(OBJDIR)/manifest.o \ |
| 508 | $(OBJDIR)/md5.o \ |
| 509 | $(OBJDIR)/merge.o \ |
| 510 | $(OBJDIR)/merge3.o \ |
| 511 | $(OBJDIR)/moderate.o \ |
| 512 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | |
| 662 | |
| 663 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 664 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 665 | |
| 666 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 667 | $(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)/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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 |
| 668 | echo Done >$(OBJDIR)/headers |
| 669 | |
| 670 | $(OBJDIR)/headers: Makefile |
| 671 | |
| 672 | Makefile: |
| @@ -1116,10 +1132,26 @@ | |
| 1116 | |
| 1117 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1118 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1119 | |
| 1120 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1121 | |
| 1122 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1123 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1124 | |
| 1125 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1126 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -43,10 +43,14 @@ | |
| 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | |
| 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | # |
| 47 | # FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable markdown support |
| 50 | # |
| 51 | # FOSSIL_ENABLE_MARKDOWN = 1 |
| 52 | |
| 53 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 54 | # |
| 55 | # FOSSIL_ENABLE_SSL = 1 |
| 56 | |
| @@ -184,10 +188,16 @@ | |
| 188 | # With JSON support |
| 189 | ifdef FOSSIL_ENABLE_JSON |
| 190 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 191 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 192 | endif |
| 193 | |
| 194 | # With markdown support |
| 195 | ifdef FOSSIL_ENABLE_MARKDOWN |
| 196 | TCC += -DFOSSIL_ENABLE_MARKDOWN=1 |
| 197 | RCC += -DFOSSIL_ENABLE_MARKDOWN=1 |
| 198 | endif |
| 199 | |
| 200 | #### We add the -static option here so that we can build a static |
| 201 | # executable that will run in a chroot jail. |
| 202 | # |
| 203 | LIB = -static |
| @@ -299,10 +309,12 @@ | |
| 309 | $(SRCDIR)/json_wiki.c \ |
| 310 | $(SRCDIR)/leaf.c \ |
| 311 | $(SRCDIR)/login.c \ |
| 312 | $(SRCDIR)/main.c \ |
| 313 | $(SRCDIR)/manifest.c \ |
| 314 | $(SRCDIR)/markdown.c \ |
| 315 | $(SRCDIR)/markdown_html.c \ |
| 316 | $(SRCDIR)/md5.c \ |
| 317 | $(SRCDIR)/merge.c \ |
| 318 | $(SRCDIR)/merge3.c \ |
| 319 | $(SRCDIR)/moderate.c \ |
| 320 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | |
| 413 | $(OBJDIR)/json_wiki_.c \ |
| 414 | $(OBJDIR)/leaf_.c \ |
| 415 | $(OBJDIR)/login_.c \ |
| 416 | $(OBJDIR)/main_.c \ |
| 417 | $(OBJDIR)/manifest_.c \ |
| 418 | $(OBJDIR)/markdown_.c \ |
| 419 | $(OBJDIR)/markdown_html_.c \ |
| 420 | $(OBJDIR)/md5_.c \ |
| 421 | $(OBJDIR)/merge_.c \ |
| 422 | $(OBJDIR)/merge3_.c \ |
| 423 | $(OBJDIR)/moderate_.c \ |
| 424 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | |
| 517 | $(OBJDIR)/json_wiki.o \ |
| 518 | $(OBJDIR)/leaf.o \ |
| 519 | $(OBJDIR)/login.o \ |
| 520 | $(OBJDIR)/main.o \ |
| 521 | $(OBJDIR)/manifest.o \ |
| 522 | $(OBJDIR)/markdown.o \ |
| 523 | $(OBJDIR)/markdown_html.o \ |
| 524 | $(OBJDIR)/md5.o \ |
| 525 | $(OBJDIR)/merge.o \ |
| 526 | $(OBJDIR)/merge3.o \ |
| 527 | $(OBJDIR)/moderate.o \ |
| 528 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | |
| 678 | |
| 679 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 680 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 681 | |
| 682 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 683 | $(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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 |
| 684 | echo Done >$(OBJDIR)/headers |
| 685 | |
| 686 | $(OBJDIR)/headers: Makefile |
| 687 | |
| 688 | Makefile: |
| @@ -1116,10 +1132,26 @@ | |
| 1132 | |
| 1133 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1134 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1135 | |
| 1136 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1137 | |
| 1138 | $(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate |
| 1139 | $(TRANSLATE) $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c |
| 1140 | |
| 1141 | $(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h |
| 1142 | $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c |
| 1143 | |
| 1144 | $(OBJDIR)/markdown.h: $(OBJDIR)/headers |
| 1145 | |
| 1146 | $(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate |
| 1147 | $(TRANSLATE) $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c |
| 1148 | |
| 1149 | $(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h |
| 1150 | $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c |
| 1151 | |
| 1152 | $(OBJDIR)/markdown_html.h: $(OBJDIR)/headers |
| 1153 | |
| 1154 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1155 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1156 | |
| 1157 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1158 |
+33
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -43,10 +43,14 @@ | ||
| 43 | 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | 44 | |
| 45 | 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | 46 | # |
| 47 | 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | + | |
| 49 | +#### Enable markdown support | |
| 50 | +# | |
| 51 | +FOSSIL_ENABLE_MARKDOWN = 1 | |
| 48 | 52 | |
| 49 | 53 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | 54 | # |
| 51 | 55 | FOSSIL_ENABLE_SSL = 1 |
| 52 | 56 | |
| @@ -184,10 +188,16 @@ | ||
| 184 | 188 | # With JSON support |
| 185 | 189 | ifdef FOSSIL_ENABLE_JSON |
| 186 | 190 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 187 | 191 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 188 | 192 | endif |
| 193 | + | |
| 194 | +# With markdown support | |
| 195 | +ifdef FOSSIL_ENABLE_MARKDOWN | |
| 196 | +TCC += -DFOSSIL_ENABLE_MARKDOWN=1 | |
| 197 | +RCC += -DFOSSIL_ENABLE_MARKDOWN=1 | |
| 198 | +endif | |
| 189 | 199 | |
| 190 | 200 | #### We add the -static option here so that we can build a static |
| 191 | 201 | # executable that will run in a chroot jail. |
| 192 | 202 | # |
| 193 | 203 | LIB = -static |
| @@ -299,10 +309,12 @@ | ||
| 299 | 309 | $(SRCDIR)/json_wiki.c \ |
| 300 | 310 | $(SRCDIR)/leaf.c \ |
| 301 | 311 | $(SRCDIR)/login.c \ |
| 302 | 312 | $(SRCDIR)/main.c \ |
| 303 | 313 | $(SRCDIR)/manifest.c \ |
| 314 | + $(SRCDIR)/markdown.c \ | |
| 315 | + $(SRCDIR)/markdown_html.c \ | |
| 304 | 316 | $(SRCDIR)/md5.c \ |
| 305 | 317 | $(SRCDIR)/merge.c \ |
| 306 | 318 | $(SRCDIR)/merge3.c \ |
| 307 | 319 | $(SRCDIR)/moderate.c \ |
| 308 | 320 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | ||
| 401 | 413 | $(OBJDIR)/json_wiki_.c \ |
| 402 | 414 | $(OBJDIR)/leaf_.c \ |
| 403 | 415 | $(OBJDIR)/login_.c \ |
| 404 | 416 | $(OBJDIR)/main_.c \ |
| 405 | 417 | $(OBJDIR)/manifest_.c \ |
| 418 | + $(OBJDIR)/markdown_.c \ | |
| 419 | + $(OBJDIR)/markdown_html_.c \ | |
| 406 | 420 | $(OBJDIR)/md5_.c \ |
| 407 | 421 | $(OBJDIR)/merge_.c \ |
| 408 | 422 | $(OBJDIR)/merge3_.c \ |
| 409 | 423 | $(OBJDIR)/moderate_.c \ |
| 410 | 424 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | ||
| 503 | 517 | $(OBJDIR)/json_wiki.o \ |
| 504 | 518 | $(OBJDIR)/leaf.o \ |
| 505 | 519 | $(OBJDIR)/login.o \ |
| 506 | 520 | $(OBJDIR)/main.o \ |
| 507 | 521 | $(OBJDIR)/manifest.o \ |
| 522 | + $(OBJDIR)/markdown.o \ | |
| 523 | + $(OBJDIR)/markdown_html.o \ | |
| 508 | 524 | $(OBJDIR)/md5.o \ |
| 509 | 525 | $(OBJDIR)/merge.o \ |
| 510 | 526 | $(OBJDIR)/merge3.o \ |
| 511 | 527 | $(OBJDIR)/moderate.o \ |
| 512 | 528 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | ||
| 662 | 678 | |
| 663 | 679 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 664 | 680 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 665 | 681 | |
| 666 | 682 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 667 | - $(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)/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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 | |
| 683 | + $(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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 | |
| 668 | 684 | echo Done >$(OBJDIR)/headers |
| 669 | 685 | |
| 670 | 686 | $(OBJDIR)/headers: Makefile |
| 671 | 687 | |
| 672 | 688 | Makefile: |
| @@ -1116,10 +1132,26 @@ | ||
| 1116 | 1132 | |
| 1117 | 1133 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1118 | 1134 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1119 | 1135 | |
| 1120 | 1136 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1137 | + | |
| 1138 | +$(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate | |
| 1139 | + $(TRANSLATE) $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c | |
| 1140 | + | |
| 1141 | +$(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h | |
| 1142 | + $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c | |
| 1143 | + | |
| 1144 | +$(OBJDIR)/markdown.h: $(OBJDIR)/headers | |
| 1145 | + | |
| 1146 | +$(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate | |
| 1147 | + $(TRANSLATE) $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c | |
| 1148 | + | |
| 1149 | +$(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h | |
| 1150 | + $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c | |
| 1151 | + | |
| 1152 | +$(OBJDIR)/markdown_html.h: $(OBJDIR)/headers | |
| 1121 | 1153 | |
| 1122 | 1154 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1123 | 1155 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1124 | 1156 | |
| 1125 | 1157 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1126 | 1158 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -43,10 +43,14 @@ | |
| 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | |
| 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | # |
| 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | # |
| 51 | FOSSIL_ENABLE_SSL = 1 |
| 52 | |
| @@ -184,10 +188,16 @@ | |
| 184 | # With JSON support |
| 185 | ifdef FOSSIL_ENABLE_JSON |
| 186 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 187 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 188 | endif |
| 189 | |
| 190 | #### We add the -static option here so that we can build a static |
| 191 | # executable that will run in a chroot jail. |
| 192 | # |
| 193 | LIB = -static |
| @@ -299,10 +309,12 @@ | |
| 299 | $(SRCDIR)/json_wiki.c \ |
| 300 | $(SRCDIR)/leaf.c \ |
| 301 | $(SRCDIR)/login.c \ |
| 302 | $(SRCDIR)/main.c \ |
| 303 | $(SRCDIR)/manifest.c \ |
| 304 | $(SRCDIR)/md5.c \ |
| 305 | $(SRCDIR)/merge.c \ |
| 306 | $(SRCDIR)/merge3.c \ |
| 307 | $(SRCDIR)/moderate.c \ |
| 308 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | |
| 401 | $(OBJDIR)/json_wiki_.c \ |
| 402 | $(OBJDIR)/leaf_.c \ |
| 403 | $(OBJDIR)/login_.c \ |
| 404 | $(OBJDIR)/main_.c \ |
| 405 | $(OBJDIR)/manifest_.c \ |
| 406 | $(OBJDIR)/md5_.c \ |
| 407 | $(OBJDIR)/merge_.c \ |
| 408 | $(OBJDIR)/merge3_.c \ |
| 409 | $(OBJDIR)/moderate_.c \ |
| 410 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | |
| 503 | $(OBJDIR)/json_wiki.o \ |
| 504 | $(OBJDIR)/leaf.o \ |
| 505 | $(OBJDIR)/login.o \ |
| 506 | $(OBJDIR)/main.o \ |
| 507 | $(OBJDIR)/manifest.o \ |
| 508 | $(OBJDIR)/md5.o \ |
| 509 | $(OBJDIR)/merge.o \ |
| 510 | $(OBJDIR)/merge3.o \ |
| 511 | $(OBJDIR)/moderate.o \ |
| 512 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | |
| 662 | |
| 663 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 664 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 665 | |
| 666 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 667 | $(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)/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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 |
| 668 | echo Done >$(OBJDIR)/headers |
| 669 | |
| 670 | $(OBJDIR)/headers: Makefile |
| 671 | |
| 672 | Makefile: |
| @@ -1116,10 +1132,26 @@ | |
| 1116 | |
| 1117 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1118 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1119 | |
| 1120 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1121 | |
| 1122 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1123 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1124 | |
| 1125 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1126 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -43,10 +43,14 @@ | |
| 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | |
| 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | # |
| 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable markdown support |
| 50 | # |
| 51 | FOSSIL_ENABLE_MARKDOWN = 1 |
| 52 | |
| 53 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 54 | # |
| 55 | FOSSIL_ENABLE_SSL = 1 |
| 56 | |
| @@ -184,10 +188,16 @@ | |
| 188 | # With JSON support |
| 189 | ifdef FOSSIL_ENABLE_JSON |
| 190 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 191 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 192 | endif |
| 193 | |
| 194 | # With markdown support |
| 195 | ifdef FOSSIL_ENABLE_MARKDOWN |
| 196 | TCC += -DFOSSIL_ENABLE_MARKDOWN=1 |
| 197 | RCC += -DFOSSIL_ENABLE_MARKDOWN=1 |
| 198 | endif |
| 199 | |
| 200 | #### We add the -static option here so that we can build a static |
| 201 | # executable that will run in a chroot jail. |
| 202 | # |
| 203 | LIB = -static |
| @@ -299,10 +309,12 @@ | |
| 309 | $(SRCDIR)/json_wiki.c \ |
| 310 | $(SRCDIR)/leaf.c \ |
| 311 | $(SRCDIR)/login.c \ |
| 312 | $(SRCDIR)/main.c \ |
| 313 | $(SRCDIR)/manifest.c \ |
| 314 | $(SRCDIR)/markdown.c \ |
| 315 | $(SRCDIR)/markdown_html.c \ |
| 316 | $(SRCDIR)/md5.c \ |
| 317 | $(SRCDIR)/merge.c \ |
| 318 | $(SRCDIR)/merge3.c \ |
| 319 | $(SRCDIR)/moderate.c \ |
| 320 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | |
| 413 | $(OBJDIR)/json_wiki_.c \ |
| 414 | $(OBJDIR)/leaf_.c \ |
| 415 | $(OBJDIR)/login_.c \ |
| 416 | $(OBJDIR)/main_.c \ |
| 417 | $(OBJDIR)/manifest_.c \ |
| 418 | $(OBJDIR)/markdown_.c \ |
| 419 | $(OBJDIR)/markdown_html_.c \ |
| 420 | $(OBJDIR)/md5_.c \ |
| 421 | $(OBJDIR)/merge_.c \ |
| 422 | $(OBJDIR)/merge3_.c \ |
| 423 | $(OBJDIR)/moderate_.c \ |
| 424 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | |
| 517 | $(OBJDIR)/json_wiki.o \ |
| 518 | $(OBJDIR)/leaf.o \ |
| 519 | $(OBJDIR)/login.o \ |
| 520 | $(OBJDIR)/main.o \ |
| 521 | $(OBJDIR)/manifest.o \ |
| 522 | $(OBJDIR)/markdown.o \ |
| 523 | $(OBJDIR)/markdown_html.o \ |
| 524 | $(OBJDIR)/md5.o \ |
| 525 | $(OBJDIR)/merge.o \ |
| 526 | $(OBJDIR)/merge3.o \ |
| 527 | $(OBJDIR)/moderate.o \ |
| 528 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | |
| 678 | |
| 679 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 680 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 681 | |
| 682 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 683 | $(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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 |
| 684 | echo Done >$(OBJDIR)/headers |
| 685 | |
| 686 | $(OBJDIR)/headers: Makefile |
| 687 | |
| 688 | Makefile: |
| @@ -1116,10 +1132,26 @@ | |
| 1132 | |
| 1133 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1134 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1135 | |
| 1136 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1137 | |
| 1138 | $(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate |
| 1139 | $(TRANSLATE) $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c |
| 1140 | |
| 1141 | $(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h |
| 1142 | $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c |
| 1143 | |
| 1144 | $(OBJDIR)/markdown.h: $(OBJDIR)/headers |
| 1145 | |
| 1146 | $(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate |
| 1147 | $(TRANSLATE) $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c |
| 1148 | |
| 1149 | $(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h |
| 1150 | $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c |
| 1151 | |
| 1152 | $(OBJDIR)/markdown_html.h: $(OBJDIR)/headers |
| 1153 | |
| 1154 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1155 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1156 | |
| 1157 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1158 |
+33
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -43,10 +43,14 @@ | ||
| 43 | 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | 44 | |
| 45 | 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | 46 | # |
| 47 | 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | + | |
| 49 | +#### Enable markdown support | |
| 50 | +# | |
| 51 | +FOSSIL_ENABLE_MARKDOWN = 1 | |
| 48 | 52 | |
| 49 | 53 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | 54 | # |
| 51 | 55 | FOSSIL_ENABLE_SSL = 1 |
| 52 | 56 | |
| @@ -184,10 +188,16 @@ | ||
| 184 | 188 | # With JSON support |
| 185 | 189 | ifdef FOSSIL_ENABLE_JSON |
| 186 | 190 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 187 | 191 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 188 | 192 | endif |
| 193 | + | |
| 194 | +# With markdown support | |
| 195 | +ifdef FOSSIL_ENABLE_MARKDOWN | |
| 196 | +TCC += -DFOSSIL_ENABLE_MARKDOWN=1 | |
| 197 | +RCC += -DFOSSIL_ENABLE_MARKDOWN=1 | |
| 198 | +endif | |
| 189 | 199 | |
| 190 | 200 | #### We add the -static option here so that we can build a static |
| 191 | 201 | # executable that will run in a chroot jail. |
| 192 | 202 | # |
| 193 | 203 | LIB = -static |
| @@ -299,10 +309,12 @@ | ||
| 299 | 309 | $(SRCDIR)/json_wiki.c \ |
| 300 | 310 | $(SRCDIR)/leaf.c \ |
| 301 | 311 | $(SRCDIR)/login.c \ |
| 302 | 312 | $(SRCDIR)/main.c \ |
| 303 | 313 | $(SRCDIR)/manifest.c \ |
| 314 | + $(SRCDIR)/markdown.c \ | |
| 315 | + $(SRCDIR)/markdown_html.c \ | |
| 304 | 316 | $(SRCDIR)/md5.c \ |
| 305 | 317 | $(SRCDIR)/merge.c \ |
| 306 | 318 | $(SRCDIR)/merge3.c \ |
| 307 | 319 | $(SRCDIR)/moderate.c \ |
| 308 | 320 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | ||
| 401 | 413 | $(OBJDIR)/json_wiki_.c \ |
| 402 | 414 | $(OBJDIR)/leaf_.c \ |
| 403 | 415 | $(OBJDIR)/login_.c \ |
| 404 | 416 | $(OBJDIR)/main_.c \ |
| 405 | 417 | $(OBJDIR)/manifest_.c \ |
| 418 | + $(OBJDIR)/markdown_.c \ | |
| 419 | + $(OBJDIR)/markdown_html_.c \ | |
| 406 | 420 | $(OBJDIR)/md5_.c \ |
| 407 | 421 | $(OBJDIR)/merge_.c \ |
| 408 | 422 | $(OBJDIR)/merge3_.c \ |
| 409 | 423 | $(OBJDIR)/moderate_.c \ |
| 410 | 424 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | ||
| 503 | 517 | $(OBJDIR)/json_wiki.o \ |
| 504 | 518 | $(OBJDIR)/leaf.o \ |
| 505 | 519 | $(OBJDIR)/login.o \ |
| 506 | 520 | $(OBJDIR)/main.o \ |
| 507 | 521 | $(OBJDIR)/manifest.o \ |
| 522 | + $(OBJDIR)/markdown.o \ | |
| 523 | + $(OBJDIR)/markdown_html.o \ | |
| 508 | 524 | $(OBJDIR)/md5.o \ |
| 509 | 525 | $(OBJDIR)/merge.o \ |
| 510 | 526 | $(OBJDIR)/merge3.o \ |
| 511 | 527 | $(OBJDIR)/moderate.o \ |
| 512 | 528 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | ||
| 662 | 678 | |
| 663 | 679 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 664 | 680 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 665 | 681 | |
| 666 | 682 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 667 | - $(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)/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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 | |
| 683 | + $(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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 | |
| 668 | 684 | echo Done >$(OBJDIR)/headers |
| 669 | 685 | |
| 670 | 686 | $(OBJDIR)/headers: Makefile |
| 671 | 687 | |
| 672 | 688 | Makefile: |
| @@ -1116,10 +1132,26 @@ | ||
| 1116 | 1132 | |
| 1117 | 1133 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1118 | 1134 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1119 | 1135 | |
| 1120 | 1136 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1137 | + | |
| 1138 | +$(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate | |
| 1139 | + $(TRANSLATE) $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c | |
| 1140 | + | |
| 1141 | +$(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h | |
| 1142 | + $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c | |
| 1143 | + | |
| 1144 | +$(OBJDIR)/markdown.h: $(OBJDIR)/headers | |
| 1145 | + | |
| 1146 | +$(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate | |
| 1147 | + $(TRANSLATE) $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c | |
| 1148 | + | |
| 1149 | +$(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h | |
| 1150 | + $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c | |
| 1151 | + | |
| 1152 | +$(OBJDIR)/markdown_html.h: $(OBJDIR)/headers | |
| 1121 | 1153 | |
| 1122 | 1154 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1123 | 1155 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1124 | 1156 | |
| 1125 | 1157 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1126 | 1158 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -43,10 +43,14 @@ | |
| 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | |
| 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | # |
| 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | # |
| 51 | FOSSIL_ENABLE_SSL = 1 |
| 52 | |
| @@ -184,10 +188,16 @@ | |
| 184 | # With JSON support |
| 185 | ifdef FOSSIL_ENABLE_JSON |
| 186 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 187 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 188 | endif |
| 189 | |
| 190 | #### We add the -static option here so that we can build a static |
| 191 | # executable that will run in a chroot jail. |
| 192 | # |
| 193 | LIB = -static |
| @@ -299,10 +309,12 @@ | |
| 299 | $(SRCDIR)/json_wiki.c \ |
| 300 | $(SRCDIR)/leaf.c \ |
| 301 | $(SRCDIR)/login.c \ |
| 302 | $(SRCDIR)/main.c \ |
| 303 | $(SRCDIR)/manifest.c \ |
| 304 | $(SRCDIR)/md5.c \ |
| 305 | $(SRCDIR)/merge.c \ |
| 306 | $(SRCDIR)/merge3.c \ |
| 307 | $(SRCDIR)/moderate.c \ |
| 308 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | |
| 401 | $(OBJDIR)/json_wiki_.c \ |
| 402 | $(OBJDIR)/leaf_.c \ |
| 403 | $(OBJDIR)/login_.c \ |
| 404 | $(OBJDIR)/main_.c \ |
| 405 | $(OBJDIR)/manifest_.c \ |
| 406 | $(OBJDIR)/md5_.c \ |
| 407 | $(OBJDIR)/merge_.c \ |
| 408 | $(OBJDIR)/merge3_.c \ |
| 409 | $(OBJDIR)/moderate_.c \ |
| 410 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | |
| 503 | $(OBJDIR)/json_wiki.o \ |
| 504 | $(OBJDIR)/leaf.o \ |
| 505 | $(OBJDIR)/login.o \ |
| 506 | $(OBJDIR)/main.o \ |
| 507 | $(OBJDIR)/manifest.o \ |
| 508 | $(OBJDIR)/md5.o \ |
| 509 | $(OBJDIR)/merge.o \ |
| 510 | $(OBJDIR)/merge3.o \ |
| 511 | $(OBJDIR)/moderate.o \ |
| 512 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | |
| 662 | |
| 663 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 664 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 665 | |
| 666 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 667 | $(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)/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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 |
| 668 | echo Done >$(OBJDIR)/headers |
| 669 | |
| 670 | $(OBJDIR)/headers: Makefile |
| 671 | |
| 672 | Makefile: |
| @@ -1116,10 +1132,26 @@ | |
| 1116 | |
| 1117 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1118 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1119 | |
| 1120 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1121 | |
| 1122 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1123 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1124 | |
| 1125 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1126 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -43,10 +43,14 @@ | |
| 43 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 44 | |
| 45 | #### Enable JSON (http://www.json.org) support using "cson" |
| 46 | # |
| 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable markdown support |
| 50 | # |
| 51 | FOSSIL_ENABLE_MARKDOWN = 1 |
| 52 | |
| 53 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 54 | # |
| 55 | FOSSIL_ENABLE_SSL = 1 |
| 56 | |
| @@ -184,10 +188,16 @@ | |
| 188 | # With JSON support |
| 189 | ifdef FOSSIL_ENABLE_JSON |
| 190 | TCC += -DFOSSIL_ENABLE_JSON=1 |
| 191 | RCC += -DFOSSIL_ENABLE_JSON=1 |
| 192 | endif |
| 193 | |
| 194 | # With markdown support |
| 195 | ifdef FOSSIL_ENABLE_MARKDOWN |
| 196 | TCC += -DFOSSIL_ENABLE_MARKDOWN=1 |
| 197 | RCC += -DFOSSIL_ENABLE_MARKDOWN=1 |
| 198 | endif |
| 199 | |
| 200 | #### We add the -static option here so that we can build a static |
| 201 | # executable that will run in a chroot jail. |
| 202 | # |
| 203 | LIB = -static |
| @@ -299,10 +309,12 @@ | |
| 309 | $(SRCDIR)/json_wiki.c \ |
| 310 | $(SRCDIR)/leaf.c \ |
| 311 | $(SRCDIR)/login.c \ |
| 312 | $(SRCDIR)/main.c \ |
| 313 | $(SRCDIR)/manifest.c \ |
| 314 | $(SRCDIR)/markdown.c \ |
| 315 | $(SRCDIR)/markdown_html.c \ |
| 316 | $(SRCDIR)/md5.c \ |
| 317 | $(SRCDIR)/merge.c \ |
| 318 | $(SRCDIR)/merge3.c \ |
| 319 | $(SRCDIR)/moderate.c \ |
| 320 | $(SRCDIR)/name.c \ |
| @@ -401,10 +413,12 @@ | |
| 413 | $(OBJDIR)/json_wiki_.c \ |
| 414 | $(OBJDIR)/leaf_.c \ |
| 415 | $(OBJDIR)/login_.c \ |
| 416 | $(OBJDIR)/main_.c \ |
| 417 | $(OBJDIR)/manifest_.c \ |
| 418 | $(OBJDIR)/markdown_.c \ |
| 419 | $(OBJDIR)/markdown_html_.c \ |
| 420 | $(OBJDIR)/md5_.c \ |
| 421 | $(OBJDIR)/merge_.c \ |
| 422 | $(OBJDIR)/merge3_.c \ |
| 423 | $(OBJDIR)/moderate_.c \ |
| 424 | $(OBJDIR)/name_.c \ |
| @@ -503,10 +517,12 @@ | |
| 517 | $(OBJDIR)/json_wiki.o \ |
| 518 | $(OBJDIR)/leaf.o \ |
| 519 | $(OBJDIR)/login.o \ |
| 520 | $(OBJDIR)/main.o \ |
| 521 | $(OBJDIR)/manifest.o \ |
| 522 | $(OBJDIR)/markdown.o \ |
| 523 | $(OBJDIR)/markdown_html.o \ |
| 524 | $(OBJDIR)/md5.o \ |
| 525 | $(OBJDIR)/merge.o \ |
| 526 | $(OBJDIR)/merge3.o \ |
| 527 | $(OBJDIR)/moderate.o \ |
| 528 | $(OBJDIR)/name.o \ |
| @@ -662,11 +678,11 @@ | |
| 678 | |
| 679 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 680 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 681 | |
| 682 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 683 | $(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)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.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 |
| 684 | echo Done >$(OBJDIR)/headers |
| 685 | |
| 686 | $(OBJDIR)/headers: Makefile |
| 687 | |
| 688 | Makefile: |
| @@ -1116,10 +1132,26 @@ | |
| 1132 | |
| 1133 | $(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h |
| 1134 | $(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c |
| 1135 | |
| 1136 | $(OBJDIR)/manifest.h: $(OBJDIR)/headers |
| 1137 | |
| 1138 | $(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate |
| 1139 | $(TRANSLATE) $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c |
| 1140 | |
| 1141 | $(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h |
| 1142 | $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c |
| 1143 | |
| 1144 | $(OBJDIR)/markdown.h: $(OBJDIR)/headers |
| 1145 | |
| 1146 | $(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate |
| 1147 | $(TRANSLATE) $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c |
| 1148 | |
| 1149 | $(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h |
| 1150 | $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c |
| 1151 | |
| 1152 | $(OBJDIR)/markdown_html.h: $(OBJDIR)/headers |
| 1153 | |
| 1154 | $(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate |
| 1155 | $(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c |
| 1156 | |
| 1157 | $(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h |
| 1158 |
+20
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -94,10 +94,12 @@ | ||
| 94 | 94 | json_wiki_.c \ |
| 95 | 95 | leaf_.c \ |
| 96 | 96 | login_.c \ |
| 97 | 97 | main_.c \ |
| 98 | 98 | manifest_.c \ |
| 99 | + markdown_.c \ | |
| 100 | + markdown_html_.c \ | |
| 99 | 101 | md5_.c \ |
| 100 | 102 | merge_.c \ |
| 101 | 103 | merge3_.c \ |
| 102 | 104 | moderate_.c \ |
| 103 | 105 | name_.c \ |
| @@ -195,10 +197,12 @@ | ||
| 195 | 197 | $(OX)\json_wiki$O \ |
| 196 | 198 | $(OX)\leaf$O \ |
| 197 | 199 | $(OX)\login$O \ |
| 198 | 200 | $(OX)\main$O \ |
| 199 | 201 | $(OX)\manifest$O \ |
| 202 | + $(OX)\markdown$O \ | |
| 203 | + $(OX)\markdown_html$O \ | |
| 200 | 204 | $(OX)\md5$O \ |
| 201 | 205 | $(OX)\merge$O \ |
| 202 | 206 | $(OX)\merge3$O \ |
| 203 | 207 | $(OX)\moderate$O \ |
| 204 | 208 | $(OX)\name$O \ |
| @@ -313,10 +317,12 @@ | ||
| 313 | 317 | echo $(OX)\json_wiki.obj >> $@ |
| 314 | 318 | echo $(OX)\leaf.obj >> $@ |
| 315 | 319 | echo $(OX)\login.obj >> $@ |
| 316 | 320 | echo $(OX)\main.obj >> $@ |
| 317 | 321 | echo $(OX)\manifest.obj >> $@ |
| 322 | + echo $(OX)\markdown.obj >> $@ | |
| 323 | + echo $(OX)\markdown_html.obj >> $@ | |
| 318 | 324 | echo $(OX)\md5.obj >> $@ |
| 319 | 325 | echo $(OX)\merge.obj >> $@ |
| 320 | 326 | echo $(OX)\merge3.obj >> $@ |
| 321 | 327 | echo $(OX)\moderate.obj >> $@ |
| 322 | 328 | echo $(OX)\name.obj >> $@ |
| @@ -769,10 +775,22 @@ | ||
| 769 | 775 | $(OX)\manifest$O : manifest_.c manifest.h |
| 770 | 776 | $(TCC) /Fo$@ -c manifest_.c |
| 771 | 777 | |
| 772 | 778 | manifest_.c : $(SRCDIR)\manifest.c |
| 773 | 779 | translate$E $** > $@ |
| 780 | + | |
| 781 | +$(OX)\markdown$O : markdown_.c markdown.h | |
| 782 | + $(TCC) /Fo$@ -c markdown_.c | |
| 783 | + | |
| 784 | +markdown_.c : $(SRCDIR)\markdown.c | |
| 785 | + translate$E $** > $@ | |
| 786 | + | |
| 787 | +$(OX)\markdown_html$O : markdown_html_.c markdown_html.h | |
| 788 | + $(TCC) /Fo$@ -c markdown_html_.c | |
| 789 | + | |
| 790 | +markdown_html_.c : $(SRCDIR)\markdown_html.c | |
| 791 | + translate$E $** > $@ | |
| 774 | 792 | |
| 775 | 793 | $(OX)\md5$O : md5_.c md5.h |
| 776 | 794 | $(TCC) /Fo$@ -c md5_.c |
| 777 | 795 | |
| 778 | 796 | md5_.c : $(SRCDIR)\md5.c |
| @@ -1091,10 +1109,12 @@ | ||
| 1091 | 1109 | json_wiki_.c:json_wiki.h \ |
| 1092 | 1110 | leaf_.c:leaf.h \ |
| 1093 | 1111 | login_.c:login.h \ |
| 1094 | 1112 | main_.c:main.h \ |
| 1095 | 1113 | manifest_.c:manifest.h \ |
| 1114 | + markdown_.c:markdown.h \ | |
| 1115 | + markdown_html_.c:markdown_html.h \ | |
| 1096 | 1116 | md5_.c:md5.h \ |
| 1097 | 1117 | merge_.c:merge.h \ |
| 1098 | 1118 | merge3_.c:merge3.h \ |
| 1099 | 1119 | moderate_.c:moderate.h \ |
| 1100 | 1120 | name_.c:name.h \ |
| 1101 | 1121 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -94,10 +94,12 @@ | |
| 94 | json_wiki_.c \ |
| 95 | leaf_.c \ |
| 96 | login_.c \ |
| 97 | main_.c \ |
| 98 | manifest_.c \ |
| 99 | md5_.c \ |
| 100 | merge_.c \ |
| 101 | merge3_.c \ |
| 102 | moderate_.c \ |
| 103 | name_.c \ |
| @@ -195,10 +197,12 @@ | |
| 195 | $(OX)\json_wiki$O \ |
| 196 | $(OX)\leaf$O \ |
| 197 | $(OX)\login$O \ |
| 198 | $(OX)\main$O \ |
| 199 | $(OX)\manifest$O \ |
| 200 | $(OX)\md5$O \ |
| 201 | $(OX)\merge$O \ |
| 202 | $(OX)\merge3$O \ |
| 203 | $(OX)\moderate$O \ |
| 204 | $(OX)\name$O \ |
| @@ -313,10 +317,12 @@ | |
| 313 | echo $(OX)\json_wiki.obj >> $@ |
| 314 | echo $(OX)\leaf.obj >> $@ |
| 315 | echo $(OX)\login.obj >> $@ |
| 316 | echo $(OX)\main.obj >> $@ |
| 317 | echo $(OX)\manifest.obj >> $@ |
| 318 | echo $(OX)\md5.obj >> $@ |
| 319 | echo $(OX)\merge.obj >> $@ |
| 320 | echo $(OX)\merge3.obj >> $@ |
| 321 | echo $(OX)\moderate.obj >> $@ |
| 322 | echo $(OX)\name.obj >> $@ |
| @@ -769,10 +775,22 @@ | |
| 769 | $(OX)\manifest$O : manifest_.c manifest.h |
| 770 | $(TCC) /Fo$@ -c manifest_.c |
| 771 | |
| 772 | manifest_.c : $(SRCDIR)\manifest.c |
| 773 | translate$E $** > $@ |
| 774 | |
| 775 | $(OX)\md5$O : md5_.c md5.h |
| 776 | $(TCC) /Fo$@ -c md5_.c |
| 777 | |
| 778 | md5_.c : $(SRCDIR)\md5.c |
| @@ -1091,10 +1109,12 @@ | |
| 1091 | json_wiki_.c:json_wiki.h \ |
| 1092 | leaf_.c:leaf.h \ |
| 1093 | login_.c:login.h \ |
| 1094 | main_.c:main.h \ |
| 1095 | manifest_.c:manifest.h \ |
| 1096 | md5_.c:md5.h \ |
| 1097 | merge_.c:merge.h \ |
| 1098 | merge3_.c:merge3.h \ |
| 1099 | moderate_.c:moderate.h \ |
| 1100 | name_.c:name.h \ |
| 1101 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -94,10 +94,12 @@ | |
| 94 | json_wiki_.c \ |
| 95 | leaf_.c \ |
| 96 | login_.c \ |
| 97 | main_.c \ |
| 98 | manifest_.c \ |
| 99 | markdown_.c \ |
| 100 | markdown_html_.c \ |
| 101 | md5_.c \ |
| 102 | merge_.c \ |
| 103 | merge3_.c \ |
| 104 | moderate_.c \ |
| 105 | name_.c \ |
| @@ -195,10 +197,12 @@ | |
| 197 | $(OX)\json_wiki$O \ |
| 198 | $(OX)\leaf$O \ |
| 199 | $(OX)\login$O \ |
| 200 | $(OX)\main$O \ |
| 201 | $(OX)\manifest$O \ |
| 202 | $(OX)\markdown$O \ |
| 203 | $(OX)\markdown_html$O \ |
| 204 | $(OX)\md5$O \ |
| 205 | $(OX)\merge$O \ |
| 206 | $(OX)\merge3$O \ |
| 207 | $(OX)\moderate$O \ |
| 208 | $(OX)\name$O \ |
| @@ -313,10 +317,12 @@ | |
| 317 | echo $(OX)\json_wiki.obj >> $@ |
| 318 | echo $(OX)\leaf.obj >> $@ |
| 319 | echo $(OX)\login.obj >> $@ |
| 320 | echo $(OX)\main.obj >> $@ |
| 321 | echo $(OX)\manifest.obj >> $@ |
| 322 | echo $(OX)\markdown.obj >> $@ |
| 323 | echo $(OX)\markdown_html.obj >> $@ |
| 324 | echo $(OX)\md5.obj >> $@ |
| 325 | echo $(OX)\merge.obj >> $@ |
| 326 | echo $(OX)\merge3.obj >> $@ |
| 327 | echo $(OX)\moderate.obj >> $@ |
| 328 | echo $(OX)\name.obj >> $@ |
| @@ -769,10 +775,22 @@ | |
| 775 | $(OX)\manifest$O : manifest_.c manifest.h |
| 776 | $(TCC) /Fo$@ -c manifest_.c |
| 777 | |
| 778 | manifest_.c : $(SRCDIR)\manifest.c |
| 779 | translate$E $** > $@ |
| 780 | |
| 781 | $(OX)\markdown$O : markdown_.c markdown.h |
| 782 | $(TCC) /Fo$@ -c markdown_.c |
| 783 | |
| 784 | markdown_.c : $(SRCDIR)\markdown.c |
| 785 | translate$E $** > $@ |
| 786 | |
| 787 | $(OX)\markdown_html$O : markdown_html_.c markdown_html.h |
| 788 | $(TCC) /Fo$@ -c markdown_html_.c |
| 789 | |
| 790 | markdown_html_.c : $(SRCDIR)\markdown_html.c |
| 791 | translate$E $** > $@ |
| 792 | |
| 793 | $(OX)\md5$O : md5_.c md5.h |
| 794 | $(TCC) /Fo$@ -c md5_.c |
| 795 | |
| 796 | md5_.c : $(SRCDIR)\md5.c |
| @@ -1091,10 +1109,12 @@ | |
| 1109 | json_wiki_.c:json_wiki.h \ |
| 1110 | leaf_.c:leaf.h \ |
| 1111 | login_.c:login.h \ |
| 1112 | main_.c:main.h \ |
| 1113 | manifest_.c:manifest.h \ |
| 1114 | markdown_.c:markdown.h \ |
| 1115 | markdown_html_.c:markdown_html.h \ |
| 1116 | md5_.c:md5.h \ |
| 1117 | merge_.c:merge.h \ |
| 1118 | merge3_.c:merge3.h \ |
| 1119 | moderate_.c:moderate.h \ |
| 1120 | name_.c:name.h \ |
| 1121 |