Permalink
Browse files

[NEW] MarkdownLive 1.4.2. Updated to discount 1.3.5.

  • Loading branch information...
rentzsch committed Apr 23, 2009
1 parent 3a391bc commit 42760606d65c68dd059c7b91965bd4b2b4ff3806
Showing with 616 additions and 330 deletions.
  1. +2 −2 Info.plist
  2. +12 −3 MarkdownLive Release Notes.markdown
  3. +45 −37 MarkdownLive.xcodeproj/project.pbxproj
  4. +0 −1 discount-1.3.0/VERSION
  5. +0 −2 discount-1.3.0/config.cmd
  6. +0 −5 discount-1.3.0/config.md
  7. 0 {discount-1.3.0 → discount-1.3.5}/COPYRIGHT
  8. +49 −0 discount-1.3.5/Csio.c
  9. 0 {discount-1.3.0 → discount-1.3.5}/INSTALL
  10. +15 −15 {discount-1.3.0 → discount-1.3.5}/Makefile
  11. +15 −15 {discount-1.3.0 → discount-1.3.5}/Makefile.in
  12. 0 {discount-1.3.0 → discount-1.3.5}/README
  13. +1 −0 discount-1.3.5/VERSION
  14. 0 {discount-1.3.0 → discount-1.3.5}/amalloc.c
  15. 0 {discount-1.3.0 → discount-1.3.5}/amalloc.h
  16. +2 −0 discount-1.3.5/config.cmd
  17. +1 −1 {discount-1.3.0 → discount-1.3.5}/config.h
  18. +8 −8 {discount-1.3.0 → discount-1.3.5}/config.log
  19. 0 {discount-1.3.0 → discount-1.3.5}/config.mak
  20. +5 −0 discount-1.3.5/config.md
  21. +2 −2 {discount-1.3.0 → discount-1.3.5}/config.sub
  22. +193 −166 {discount-1.3.0 → discount-1.3.5}/configure.inc
  23. +1 −1 {discount-1.3.0 → discount-1.3.5}/configure.sh
  24. +5 −0 {discount-1.3.0 → discount-1.3.5}/cstring.h
  25. 0 {discount-1.3.0 → discount-1.3.5}/docheader.c
  26. 0 {discount-1.3.0 → discount-1.3.5}/dumptree.c
  27. 0 {discount-1.3.0 → discount-1.3.5}/echo.c
  28. +34 −25 {discount-1.3.0 → discount-1.3.5}/generate.c
  29. +15 −3 {discount-1.3.0 → discount-1.3.5}/main.c
  30. 0 {discount-1.3.0 → discount-1.3.5}/makepage.c
  31. +10 −7 {discount-1.3.0 → discount-1.3.5}/markdown.1
  32. +10 −7 {discount-1.3.0 → discount-1.3.5}/markdown.1.in
  33. +6 −1 {discount-1.3.0 → discount-1.3.5}/markdown.3
  34. 0 {discount-1.3.0 → discount-1.3.5}/markdown.7
  35. +19 −8 {discount-1.3.0 → discount-1.3.5}/markdown.c
  36. +4 −0 {discount-1.3.0 → discount-1.3.5}/markdown.h
  37. 0 {discount-1.3.0 → discount-1.3.5}/mkd-extensions.7
  38. +18 −2 {discount-1.3.0 → discount-1.3.5}/mkd-functions.3
  39. 0 {discount-1.3.0 → discount-1.3.5}/mkd2html.c
  40. 0 {discount-1.3.0 → discount-1.3.5}/mkdio.c
  41. +1 −0 {discount-1.3.0 → discount-1.3.5}/mkdio.h
  42. 0 {discount-1.3.0 → discount-1.3.5}/resource.c
  43. 0 {discount-1.3.0 → discount-1.3.5}/tests/chrome.text
  44. 0 {discount-1.3.0 → discount-1.3.5}/tests/code.t
  45. +67 −0 discount-1.3.5/tests/compat.t
  46. 0 {discount-1.3.0 → discount-1.3.5}/tests/crash.t
  47. 0 {discount-1.3.0 → discount-1.3.5}/tests/dl.t
  48. 0 {discount-1.3.0 → discount-1.3.5}/tests/embedlinks.text
  49. 0 {discount-1.3.0 → discount-1.3.5}/tests/emphasis.t
  50. 0 {discount-1.3.0 → discount-1.3.5}/tests/flow.t
  51. 0 {discount-1.3.0 → discount-1.3.5}/tests/footnotes.t
  52. 0 {discount-1.3.0 → discount-1.3.5}/tests/header.t
  53. 0 {discount-1.3.0 → discount-1.3.5}/tests/html.t
  54. 0 {discount-1.3.0 → discount-1.3.5}/tests/links.text
  55. +11 −2 {discount-1.3.0 → discount-1.3.5}/tests/linkylinky.t
  56. 0 {discount-1.3.0 → discount-1.3.5}/tests/linkypix.t
  57. 0 {discount-1.3.0 → discount-1.3.5}/tests/list.t
  58. 0 {discount-1.3.0 → discount-1.3.5}/tests/list3deep.t
  59. 0 {discount-1.3.0 → discount-1.3.5}/tests/misc.t
  60. 0 {discount-1.3.0 → discount-1.3.5}/tests/pandoc.t
  61. 0 {discount-1.3.0 → discount-1.3.5}/tests/para.t
  62. +24 −0 {discount-1.3.0 → discount-1.3.5}/tests/peculiarities.t
  63. 0 {discount-1.3.0 → discount-1.3.5}/tests/pseudo.t
  64. 0 {discount-1.3.0 → discount-1.3.5}/tests/reparse.t
  65. 0 {discount-1.3.0 → discount-1.3.5}/tests/smarty.t
  66. 0 {discount-1.3.0 → discount-1.3.5}/tests/style.t
  67. 0 {discount-1.3.0 → discount-1.3.5}/tests/syntax.text
  68. 0 {discount-1.3.0 → discount-1.3.5}/tests/tabstop.t
  69. 0 {discount-1.3.0 → discount-1.3.5}/tests/xml.t
  70. 0 {discount-1.3.0 → discount-1.3.5}/theme.1
  71. 0 {discount-1.3.0 → discount-1.3.5}/theme.c
  72. +38 −14 {discount-1.3.0 → discount-1.3.5}/toc.c
  73. 0 {discount-1.3.0 → discount-1.3.5}/version.c
  74. 0 {discount-1.3.0 → discount-1.3.5}/version.c.in
  75. 0 {discount-1.3.0 → discount-1.3.5}/xmlpage.c
  76. 0 { → discount_wrappers}/discountWrapper.h
  77. +1 −1 { → discount_wrappers}/discountWrapper.m
  78. +1 −1 { → discount_wrappers}/markdownWrapper.c
  79. 0 { → discount_wrappers}/markdownWrapper.h
  80. +1 −1 { → discount_wrappers}/mkdioWrapper.c
  81. 0 { → discount_wrappers}/mkdioWrapper.h
View
@@ -40,9 +40,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.4.1</string>
+ <string>1.4.2</string>
<key>CFBundleShortVersionString</key>
- <string>1.4.1</string>
+ <string>1.4.2</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
@@ -1,4 +1,13 @@
-# MarkdownLive 1.4 Sun May 21 2008
+## MarkdownLive 1.4.2 Thu Apr 23 2009
+
+* Upgrade to discount 1.3.5.
+
+## MarkdownLive 1.4.1 Sun Nov 16 2008
+
+* Upgraded to discount 1.3.0, which solves a bunch of
+crashers.
+
+## MarkdownLive 1.4 Sun May 21 2008
* Switch to discount for markdown engine. Saves having to spawn a Perl/ruby instance all the time. maruku also had rendering quirks, including not rendering things like `C4[2]` correctly, forcing me to write `C4\[2\]`.
@@ -8,13 +17,13 @@
---
-# MarkdownLive 1.3 Jul 31 2008
+## MarkdownLive 1.3 Jul 31 2008
* Now uses [maruku](http://maruku.rubyforge.org) for its engine to get things like "Markdown inside HTML elements" and definition lists.
---
-# MarkdownLive-0 May 21 2006
+## MarkdownLive-0 May 21 2006
* Supplies a category on `NSTask` (`+runScriptNamed:extension:input:error:`) that handles running external scripts. Marshals `NSString` parameters into `STDIN`/`STDOUT` pipe read/writes.
@@ -7,14 +7,14 @@
objects = {
/* Begin PBXBuildFile section */
- 792530F00E8F40F200DFAD98 /* discountWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 792530EF0E8F40F200DFAD98 /* discountWrapper.m */; };
- 792531470E8F4CD800DFAD98 /* mkdioWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 792531460E8F4CD800DFAD98 /* mkdioWrapper.c */; };
- 7925314B0E8F4E4D00DFAD98 /* markdownWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */; };
796A2AD80A20DCEE00440275 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 796A2AD70A20DCEE00440275 /* WebKit.framework */; };
- 797EF6930ED0EB5400B28F7A /* resource.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF68F0ED0EB5400B28F7A /* resource.c */; };
- 797EF6940ED0EB5400B28F7A /* generate.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6900ED0EB5400B28F7A /* generate.c */; };
- 797EF6950ED0EB5400B28F7A /* markdown.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6910ED0EB5400B28F7A /* markdown.c */; };
- 797EF6960ED0EB5400B28F7A /* mkdio.c in Sources */ = {isa = PBXBuildFile; fileRef = 797EF6920ED0EB5400B28F7A /* mkdio.c */; };
+ 79E5579D0FA1091F00A3687A /* mkdio.c in Sources */ = {isa = PBXBuildFile; fileRef = 79E557990FA1091F00A3687A /* mkdio.c */; };
+ 79E5579E0FA1091F00A3687A /* markdown.c in Sources */ = {isa = PBXBuildFile; fileRef = 79E5579A0FA1091F00A3687A /* markdown.c */; };
+ 79E5579F0FA1091F00A3687A /* generate.c in Sources */ = {isa = PBXBuildFile; fileRef = 79E5579B0FA1091F00A3687A /* generate.c */; };
+ 79E557A00FA1091F00A3687A /* resource.c in Sources */ = {isa = PBXBuildFile; fileRef = 79E5579C0FA1091F00A3687A /* resource.c */; };
+ 79E557AF0FA1098500A3687A /* discountWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 79E557AA0FA1098500A3687A /* discountWrapper.m */; };
+ 79E557B00FA1098500A3687A /* markdownWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 79E557AB0FA1098500A3687A /* markdownWrapper.c */; };
+ 79E557B10FA1098500A3687A /* mkdioWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 79E557AD0FA1098500A3687A /* mkdioWrapper.c */; };
79F7EF740AC39638003DAB4E /* MarkdownLiveApp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */; };
8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; };
8D15AC2D0486D014006FF6A4 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B6FDCFA73011CA2CEA /* MainMenu.nib */; };
@@ -38,17 +38,17 @@
2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32DBCF750370BD2300C91783 /* MarkdownLive_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkdownLive_Prefix.pch; sourceTree = "<group>"; };
- 792530EE0E8F40F200DFAD98 /* discountWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = discountWrapper.h; sourceTree = "<group>"; };
- 792530EF0E8F40F200DFAD98 /* discountWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = discountWrapper.m; sourceTree = "<group>"; };
- 792531450E8F4CD800DFAD98 /* mkdioWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mkdioWrapper.h; sourceTree = "<group>"; };
- 792531460E8F4CD800DFAD98 /* mkdioWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mkdioWrapper.c; sourceTree = "<group>"; };
- 792531490E8F4E4D00DFAD98 /* markdownWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = markdownWrapper.h; sourceTree = "<group>"; };
- 7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = markdownWrapper.c; sourceTree = "<group>"; };
796A2AD70A20DCEE00440275 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
- 797EF68F0ED0EB5400B28F7A /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource.c; path = "discount-1.3.0/resource.c"; sourceTree = "<group>"; };
- 797EF6900ED0EB5400B28F7A /* generate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = generate.c; path = "discount-1.3.0/generate.c"; sourceTree = "<group>"; };
- 797EF6910ED0EB5400B28F7A /* markdown.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = markdown.c; path = "discount-1.3.0/markdown.c"; sourceTree = "<group>"; };
- 797EF6920ED0EB5400B28F7A /* mkdio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mkdio.c; path = "discount-1.3.0/mkdio.c"; sourceTree = "<group>"; };
+ 79E557990FA1091F00A3687A /* mkdio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mkdio.c; sourceTree = "<group>"; };
+ 79E5579A0FA1091F00A3687A /* markdown.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = markdown.c; sourceTree = "<group>"; };
+ 79E5579B0FA1091F00A3687A /* generate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = generate.c; sourceTree = "<group>"; };
+ 79E5579C0FA1091F00A3687A /* resource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resource.c; sourceTree = "<group>"; };
+ 79E557A90FA1098500A3687A /* discountWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = discountWrapper.h; sourceTree = "<group>"; };
+ 79E557AA0FA1098500A3687A /* discountWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = discountWrapper.m; sourceTree = "<group>"; };
+ 79E557AB0FA1098500A3687A /* markdownWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = markdownWrapper.c; sourceTree = "<group>"; };
+ 79E557AC0FA1098500A3687A /* markdownWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = markdownWrapper.h; sourceTree = "<group>"; };
+ 79E557AD0FA1098500A3687A /* mkdioWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mkdioWrapper.c; sourceTree = "<group>"; };
+ 79E557AE0FA1098500A3687A /* mkdioWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mkdioWrapper.h; sourceTree = "<group>"; };
79F7EF730AC39638003DAB4E /* MarkdownLiveApp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = MarkdownLiveApp.icns; sourceTree = "<group>"; };
8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D15AC370486D014006FF6A4 /* MarkdownLive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MarkdownLive.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -98,7 +98,8 @@
isa = PBXGroup;
children = (
2A37F4ABFDCFA73011CA2CEA /* Classes */,
- 792530F90E8F49C600DFAD98 /* discount */,
+ 79E5571F0FA1086D00A3687A /* discount-1.3.5 */,
+ 79E557A80FA1098500A3687A /* discount_wrappers */,
2A37F4AFFDCFA73011CA2CEA /* Other Sources */,
2A37F4B8FDCFA73011CA2CEA /* Resources */,
2A37F4C3FDCFA73011CA2CEA /* Frameworks */,
@@ -147,21 +148,28 @@
name = Frameworks;
sourceTree = "<group>";
};
- 792530F90E8F49C600DFAD98 /* discount */ = {
+ 79E5571F0FA1086D00A3687A /* discount-1.3.5 */ = {
isa = PBXGroup;
children = (
- 792530EE0E8F40F200DFAD98 /* discountWrapper.h */,
- 792530EF0E8F40F200DFAD98 /* discountWrapper.m */,
- 792531450E8F4CD800DFAD98 /* mkdioWrapper.h */,
- 792531460E8F4CD800DFAD98 /* mkdioWrapper.c */,
- 792531490E8F4E4D00DFAD98 /* markdownWrapper.h */,
- 7925314A0E8F4E4D00DFAD98 /* markdownWrapper.c */,
- 797EF68F0ED0EB5400B28F7A /* resource.c */,
- 797EF6900ED0EB5400B28F7A /* generate.c */,
- 797EF6910ED0EB5400B28F7A /* markdown.c */,
- 797EF6920ED0EB5400B28F7A /* mkdio.c */,
+ 79E557990FA1091F00A3687A /* mkdio.c */,
+ 79E5579A0FA1091F00A3687A /* markdown.c */,
+ 79E5579B0FA1091F00A3687A /* generate.c */,
+ 79E5579C0FA1091F00A3687A /* resource.c */,
);
- name = discount;
+ path = "discount-1.3.5";
+ sourceTree = "<group>";
+ };
+ 79E557A80FA1098500A3687A /* discount_wrappers */ = {
+ isa = PBXGroup;
+ children = (
+ 79E557A90FA1098500A3687A /* discountWrapper.h */,
+ 79E557AA0FA1098500A3687A /* discountWrapper.m */,
+ 79E557AB0FA1098500A3687A /* markdownWrapper.c */,
+ 79E557AC0FA1098500A3687A /* markdownWrapper.h */,
+ 79E557AD0FA1098500A3687A /* mkdioWrapper.c */,
+ 79E557AE0FA1098500A3687A /* mkdioWrapper.h */,
+ );
+ path = discount_wrappers;
sourceTree = "<group>";
};
/* End PBXGroup section */
@@ -224,13 +232,13 @@
files = (
8D15AC310486D014006FF6A4 /* MyDocument.m in Sources */,
8D15AC320486D014006FF6A4 /* main.m in Sources */,
- 792530F00E8F40F200DFAD98 /* discountWrapper.m in Sources */,
- 792531470E8F4CD800DFAD98 /* mkdioWrapper.c in Sources */,
- 7925314B0E8F4E4D00DFAD98 /* markdownWrapper.c in Sources */,
- 797EF6930ED0EB5400B28F7A /* resource.c in Sources */,
- 797EF6940ED0EB5400B28F7A /* generate.c in Sources */,
- 797EF6950ED0EB5400B28F7A /* markdown.c in Sources */,
- 797EF6960ED0EB5400B28F7A /* mkdio.c in Sources */,
+ 79E5579D0FA1091F00A3687A /* mkdio.c in Sources */,
+ 79E5579E0FA1091F00A3687A /* markdown.c in Sources */,
+ 79E5579F0FA1091F00A3687A /* generate.c in Sources */,
+ 79E557A00FA1091F00A3687A /* resource.c in Sources */,
+ 79E557AF0FA1098500A3687A /* discountWrapper.m in Sources */,
+ 79E557B00FA1098500A3687A /* markdownWrapper.c in Sources */,
+ 79E557B10FA1098500A3687A /* mkdioWrapper.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
@@ -1 +0,0 @@
-1.3.0
@@ -1,2 +0,0 @@
-#! /bin/sh
- ./configure.sh
View
@@ -1,5 +0,0 @@
-#! /bin/sh
-# script generated Sun Nov 16 17:57:09 CST 2008 by configure.sh
-
-test -d "$1" || mkdir -p "$1"
-exit 0
File renamed without changes.
View
@@ -0,0 +1,49 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+
+/* putc() into a cstring
+ */
+void
+Csputc(int c, Cstring *iot)
+{
+ EXPAND(*iot) = c;
+}
+
+
+/* printf() into a cstring
+ */
+int
+Csprintf(Cstring *iot, char *fmt, ...)
+{
+ va_list ptr;
+ int siz=100;
+
+ do {
+ RESERVE(*iot, siz);
+ va_start(ptr, fmt);
+ siz = vsnprintf(T(*iot)+S(*iot), ALL(*iot)-S(*iot), fmt, ptr);
+ va_end(ptr);
+ } while ( siz > (ALL(*iot)-S(*iot)) );
+
+ S(*iot) += siz;
+ return siz;
+}
+
+
+/* reparse() into a cstring
+ */
+void
+Csreparse(Cstring *iot, char *buf, int size, int flags)
+{
+ MMIOT f;
+ ___mkd_initmmiot(&f, 0);
+ ___mkd_reparse(buf, size, 0, &f);
+ ___mkd_emblock(&f);
+ SUFFIX(*iot, T(f.out), S(f.out));
+ ___mkd_freemmiot(&f, 0);
+}
File renamed without changes.
@@ -12,35 +12,35 @@ SAMPLE_PGMS=mkd2html makepage
SAMPLE_PGMS+= theme
MKDLIB=libmarkdown.a
OBJS=mkdio.o markdown.o dumptree.o generate.o \
- resource.o docheader.o version.o toc.o xmlpage.o
+ resource.o docheader.o version.o toc.o Csio.o xmlpage.o
all: $(PGMS) $(SAMPLE_PGMS)
install: $(PGMS)
- /usr/bin/install -s -m 755 $(PGMS) $(BINDIR)
- /usr/bin/install -m 444 $(MKDLIB) $(LIBDIR)
- /usr/bin/install -m 444 mkdio.h $(INCDIR)
+ /usr/bin/install -s -m 755 $(PGMS) $(DESTDIR)/$(BINDIR)
+ /usr/bin/install -m 444 $(MKDLIB) $(DESTDIR)/$(LIBDIR)
+ /usr/bin/install -m 444 mkdio.h $(DESTDIR)/$(INCDIR)
install.everything: install install.samples install.man
install.samples: $(SAMPLE_PGMS) install
- /usr/bin/install -s -m 755 $(SAMPLE_PGMS) $(BINDIR)
- /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md $(MANDIR)/man1
- /usr/bin/install -m 444 theme.1 $(MANDIR)/man1
+ /usr/bin/install -s -m 755 $(SAMPLE_PGMS) $(DESTDIR)/$(BINDIR)
+ /Users/wolf/code/github/MarkdownLive/discount-1.3.5/config.md $(DESTDIR)/$(MANDIR)/man1
+ /usr/bin/install -m 444 theme.1 $(DESTDIR)/$(MANDIR)/man1
install.man:
- /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md $(MANDIR)/man3
- /usr/bin/install -m 444 mkd-functions.3 markdown.3 $(MANDIR)/man3
+ /Users/wolf/code/github/MarkdownLive/discount-1.3.5/config.md $(DESTDIR)/$(MANDIR)/man3
+ /usr/bin/install -m 444 mkd-functions.3 markdown.3 $(DESTDIR)/$(MANDIR)/man3
for x in mkd_text mkd_in mkd_string; do \
- ( echo '.\"' ; echo ".so man3/markdown.3" ) > $(MANDIR)/man3/$$x.3;\
+ ( echo '.\"' ; echo ".so man3/markdown.3" ) > $(DESTDIR)/$(MANDIR)/man3/$$x.3;\
done
for x in mkd_compile mkd_style mkd_generatehtml mkd_cleanup mkd_doc_title mkd_doc_author mkd_doc_date; do \
- ( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(MANDIR)/man3/$$x.3; \
+ ( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(DESTDIR)/$(MANDIR)/man3/$$x.3; \
done
- /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md $(MANDIR)/man7
- /usr/bin/install -m 444 markdown.7 mkd-extensions.7 $(MANDIR)/man7
- /Users/wolf/code/trac/cocoa/MarkdownLive/discount-1.3.0/config.md $(MANDIR)/man1
- /usr/bin/install -m 444 markdown.1 $(MANDIR)/man1
+ /Users/wolf/code/github/MarkdownLive/discount-1.3.5/config.md $(DESTDIR)/$(MANDIR)/man7
+ /usr/bin/install -m 444 markdown.7 mkd-extensions.7 $(DESTDIR)/$(MANDIR)/man7
+ /Users/wolf/code/github/MarkdownLive/discount-1.3.5/config.md $(DESTDIR)/$(MANDIR)/man1
+ /usr/bin/install -m 444 markdown.1 $(DESTDIR)/$(MANDIR)/man1
install.everything: install install.man
@@ -12,35 +12,35 @@ SAMPLE_PGMS=mkd2html makepage
@THEME@SAMPLE_PGMS+= theme
MKDLIB=libmarkdown.a
OBJS=mkdio.o markdown.o dumptree.o generate.o \
- resource.o docheader.o version.o toc.o xmlpage.o @AMALLOC@
+ resource.o docheader.o version.o toc.o Csio.o xmlpage.o @AMALLOC@
all: $(PGMS) $(SAMPLE_PGMS)
install: $(PGMS)
- @INSTALL_PROGRAM@ $(PGMS) $(BINDIR)
- @INSTALL_DATA@ $(MKDLIB) $(LIBDIR)
- @INSTALL_DATA@ mkdio.h $(INCDIR)
+ @INSTALL_PROGRAM@ $(PGMS) $(DESTDIR)/$(BINDIR)
+ @INSTALL_DATA@ $(MKDLIB) $(DESTDIR)/$(LIBDIR)
+ @INSTALL_DATA@ mkdio.h $(DESTDIR)/$(INCDIR)
install.everything: install install.samples install.man
install.samples: $(SAMPLE_PGMS) install
- @INSTALL_PROGRAM@ $(SAMPLE_PGMS) $(BINDIR)
- @INSTALL_DIR@ $(MANDIR)/man1
- @INSTALL_DATA@ theme.1 $(MANDIR)/man1
+ @INSTALL_PROGRAM@ $(SAMPLE_PGMS) $(DESTDIR)/$(BINDIR)
+ @INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man1
+ @INSTALL_DATA@ theme.1 $(DESTDIR)/$(MANDIR)/man1
install.man:
- @INSTALL_DIR@ $(MANDIR)/man3
- @INSTALL_DATA@ mkd-functions.3 markdown.3 $(MANDIR)/man3
+ @INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man3
+ @INSTALL_DATA@ mkd-functions.3 markdown.3 $(DESTDIR)/$(MANDIR)/man3
for x in mkd_text mkd_in mkd_string; do \
- ( echo '.\"' ; echo ".so man3/markdown.3" ) > $(MANDIR)/man3/$$x.3;\
+ ( echo '.\"' ; echo ".so man3/markdown.3" ) > $(DESTDIR)/$(MANDIR)/man3/$$x.3;\
done
for x in mkd_compile mkd_style mkd_generatehtml mkd_cleanup mkd_doc_title mkd_doc_author mkd_doc_date; do \
- ( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(MANDIR)/man3/$$x.3; \
+ ( echo '.\"' ; echo ".so man3/mkd-functions.3" ) > $(DESTDIR)/$(MANDIR)/man3/$$x.3; \
done
- @INSTALL_DIR@ $(MANDIR)/man7
- @INSTALL_DATA@ markdown.7 mkd-extensions.7 $(MANDIR)/man7
- @INSTALL_DIR@ $(MANDIR)/man1
- @INSTALL_DATA@ markdown.1 $(MANDIR)/man1
+ @INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man7
+ @INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)/$(MANDIR)/man7
+ @INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man1
+ @INSTALL_DATA@ markdown.1 $(DESTDIR)/$(MANDIR)/man1
install.everything: install install.man
File renamed without changes.
View
@@ -0,0 +1 @@
+1.3.5
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,2 @@
+#! /bin/sh
+ configure.sh
@@ -1,5 +1,5 @@
/*
- * configuration for markdown, generated Sun Nov 16 17:57:08 CST 2008
+ * configuration for markdown, generated Thu Apr 23 15:38:24 CDT 2009
* by wolf@wolf-mbp.local
*/
#ifndef __AC_MARKDOWN_D
@@ -7,11 +7,11 @@ checking out the C compiler
checking for "volatile" keyword
checking for "const" keyword
defining WORD & DWORD scalar types
-/tmp/pd8734.c: In function ‘main’:
-/tmp/pd8734.c:13: warning: incompatible implicit declaration of built-in function ‘exit’
-/tmp/ngc8734.c: In function ‘main’:
-/tmp/ngc8734.c:5: warning: initialization makes pointer from integer without a cast
-/tmp/ngc8734.c:6: warning: initialization makes pointer from integer without a cast
+/tmp/pd54765.c: In function ‘main’:
+/tmp/pd54765.c:13: warning: incompatible implicit declaration of built-in function ‘exit’
+/tmp/ngc54765.c: In function ‘main’:
+/tmp/ngc54765.c:5: warning: initialization makes pointer from integer without a cast
+/tmp/ngc54765.c:6: warning: initialization makes pointer from integer without a cast
looking for header pwd.h
looking for the getpwuid function
looking for the srandom function
@@ -20,11 +20,11 @@ looking for the strcasecmp function
looking for the strncasecmp function
looking for the fchdir function
looking for header malloc.h
-test failed: command was cc -c -o /tmp/doto8734.o /tmp/ngc8734.c
+test failed: command was cc -c -o /tmp/doto54765.o /tmp/ngc54765.c
output:
-/tmp/ngc8734.c:2:20: error: malloc.h: No such file or directory
+/tmp/ngc54765.c:2:20: error: malloc.h: No such file or directory
offending sources:
-/tmp/ngc8734.c:
+/tmp/ngc54765.c:
/* AC_CHECK_HEADERS */
#include <malloc.h>
main() { }
File renamed without changes.
View
@@ -0,0 +1,5 @@
+#! /bin/sh
+# script generated Thu Apr 23 15:38:25 CDT 2009 by configure.sh
+
+test -d "$1" || mkdir -p "$1"
+exit 0
Oops, something went wrong.

0 comments on commit 4276060

Please sign in to comment.