git.iko.soy/typeable/pandoc
on master help sign in
Reintroduced 'library' cabal flag.

It is needed for the Windows installer, since if a library is produced, the binary can't be made relocatable. See http://www.haskell.org/ghc/docs/6.12.2/html/Cabal/builders.html section 4.1.2.3.

commit5be880bd4866b10ed832852fd5666420ef3b3765 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 21 Jul 2010, 11:24 (16 years ago) parent87cd12a
3 files changed+51−22
compare with master
unifiedsplit
INSTALL+1 changelog−2 pandoc.cabal+50−20
INSTALL+1
@@ -69,6 +69,7 @@ you will need [zip-archive] and (if you want syntax highlighting)
6969 by spaces. Pandoc's flags include:
7070
7171 - `executable`: build the pandoc executable (default yes)
72+ - `library`: build the pandoc library (default yes)
7273 - `wrappers`: build the wrapper `markdown2pdf` (default yes)
7374 - `highlighting`: compile with syntax highlighting support (increases
7475 the size of the executable) (default no)
changelog−2
@@ -171,8 +171,6 @@ pandoc (1.6)
171171 + Removed '-threaded' from pandoc's ghc-options. '-threaded'
172172 is only needed for markdown2pdf, due to its use of readProcess.
173173
174− * Removed 'library' Cabal flag.
175−
176174pandoc (1.5.1.1)
177175
178176 [ John MacFarlane ]
pandoc.cabal+50−20
@@ -11,7 +11,7 @@ Bug-Reports: http://code.google.com/p/pandoc/issues/list
1111Stability: alpha
1212Homepage: http://johnmacfarlane.net/pandoc
1313Category: Text
14−Tested-With: GHC == 6.10.4, GHC == 6.12.1
14+Tested-With: GHC == 6.12.1
1515Synopsis: Conversion between markup formats
1616Description: Pandoc is a Haskell library for converting from one markup
1717 format to another, and a command-line tool that uses
@@ -19,7 +19,7 @@ Description: Pandoc is a Haskell library for converting from one markup
1919 reStructuredText, HTML, and LaTeX, and it can write
2020 markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
2121 OpenDocument, ODT, RTF, MediaWiki, groff man pages, EPUB,
22− and S5 HTML slide shows.
22+ and S5 and Slidy HTML slide shows.
2323 .
2424 Pandoc extends standard markdown syntax with footnotes,
2525 embedded LaTeX, definition lists, tables, and other
@@ -134,6 +134,9 @@ Flag highlighting
134134Flag executable
135135 Description: Build the pandoc executable.
136136 Default: True
137+Flag library
138+ Description: Build the pandoc library.
139+ Default: True
137140Flag wrappers
138141 Description: Build the wrappers (markdown2pdf).
139142 Default: True
@@ -142,6 +145,9 @@ Flag citeproc
142145 Default: False
143146
144147Library
148+ -- Note: the following material must be in both Library and Executable stanzas.
149+ -- It needs to be duplicated because of the library & executable flags.
150+ -- BEGIN DUPLICATED SECTION
145151 Build-Depends: pretty >= 1, containers >= 0.1,
146152 parsec >= 2.1, xhtml >= 3000.0,
147153 mtl >= 1.1, network >= 2, filepath >= 1.1,
@@ -155,13 +161,20 @@ Library
155161 else
156162 Build-depends: base >= 3 && < 4
157163 if flag(highlighting)
158− Build-depends: highlighting-kate >= 0.2.7
164+ Build-depends: highlighting-kate >= 0.2.7.1
159165 cpp-options: -D_HIGHLIGHTING
160166 if flag(citeproc)
161− Build-depends: citeproc-hs
162− Exposed-Modules: Text.Pandoc.Biblio
167+ Build-depends: citeproc-hs >= 0.2
163168 cpp-options: -D_CITEPROC
169+ if impl(ghc >= 6.12)
170+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind
171+ else
172+ Ghc-Options: -O2 -Wall
173+ Ghc-Prof-Options: -auto-all -caf-all
174+ Extensions: CPP
164175 Hs-Source-Dirs: src
176+ -- END DUPLICATED SECTION
177+
165178 Exposed-Modules: Text.Pandoc,
166179 Text.Pandoc.Blocks,
167180 Text.Pandoc.Definition,
@@ -194,30 +207,47 @@ Library
194207 Text.Pandoc.UTF8,
195208 Text.Pandoc.UUID,
196209 Paths_pandoc
197− Extensions: CPP
198− if impl(ghc >= 6.12)
199− Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind
210+
211+ if flag(citeproc)
212+ Exposed-Modules: Text.Pandoc.Biblio
213+ if flag(library)
214+ Buildable: True
200215 else
201− Ghc-Options: -O2 -Wall
202− Ghc-Prof-Options: -auto-all -caf-all
203− Buildable: True
216+ Buildable: False
204217
205218Executable pandoc
206− Hs-Source-Dirs: src
207− Main-Is: pandoc.hs
208− if impl(ghc >= 6.12)
209− Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind
219+ -- Note: the following material must be in both Library and Executable stanzas.
220+ -- It needs to be duplicated because of the library & executable flags.
221+ -- BEGIN DUPLICATED SECTION
222+ Build-Depends: pretty >= 1, containers >= 0.1,
223+ parsec >= 2.1, xhtml >= 3000.0,
224+ mtl >= 1.1, network >= 2, filepath >= 1.1,
225+ process >= 1, directory >= 1,
226+ bytestring >= 0.9, zip-archive >= 0.1.1.4,
227+ utf8-string >= 0.3, old-time >= 1,
228+ HTTP >= 4000.0.5, texmath, xml >= 1.3.5 && < 1.4,
229+ random, extensible-exceptions
230+ if impl(ghc >= 6.10)
231+ Build-depends: base >= 4 && < 5, syb
210232 else
211− Ghc-Options: -O2 -Wall
212− Ghc-Prof-Options: -auto-all -caf-all
213− Extensions: CPP
214−
233+ Build-depends: base >= 3 && < 4
215234 if flag(highlighting)
235+ Build-depends: highlighting-kate >= 0.2.7.1
216236 cpp-options: -D_HIGHLIGHTING
217237 if flag(citeproc)
218238 Build-depends: citeproc-hs >= 0.2
219239 cpp-options: -D_CITEPROC
220− if flag(executable)
240+ if impl(ghc >= 6.12)
241+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind
242+ else
243+ Ghc-Options: -O2 -Wall
244+ Ghc-Prof-Options: -auto-all -caf-all
245+ Extensions: CPP
246+ Hs-Source-Dirs: src
247+ -- END DUPLICATED SECTION
248+
249+ Main-Is: pandoc.hs
250+ if flag(executable) || flag(wrappers)
221251 Buildable: True
222252 else
223253 Buildable: False