From 8a057e77affc16bf477faa0983529229c11bce68 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Tue, 6 Nov 2007 00:07:17 +0000 Subject: Modified build procedure to allow compilation with GHC 6.8: + pandoc.cabal now uses Cabal configurations and requires Cabal >=1.2. + An alternative pandoc.cabal.ghc66 is provided for those who have older versions of Cabal. + Debian build process has been modified to use pandoc.cabal.ghc66, as a temporary measure until GHC 6.8 gets into debian unstable. + INSTALL instructions have been updated. + Makefile has been updated to accommodate changes in pandoc.cabal. + pandoc.cabal.ghc68 has been removed, since the default version now works with GHC 6.8. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1066 788f1e2b-df1e-0410-8736-df70ead52e1b --- pandoc.cabal | 66 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 28 deletions(-) (limited to 'pandoc.cabal') diff --git a/pandoc.cabal b/pandoc.cabal index a37d0029c..12877a745 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,6 @@ Name: pandoc Version: 0.45 +Cabal-Version: >= 1.2 License: GPL License-File: COPYING Copyright: (c) 2006-2007 John MacFarlane @@ -31,32 +32,41 @@ Description: Pandoc is a Haskell library for converting from one markup which convert this native representation into a target format. Thus, adding an input or output format requires only adding a reader or writer. -Build-Depends: base, parsec, xhtml, mtl, regex-compat, network -Hs-Source-Dirs: src -Exposed-Modules: Text.Pandoc, - Text.Pandoc.Blocks, - Text.Pandoc.Definition, - Text.Pandoc.CharacterReferences, - Text.Pandoc.Shared, - Text.Pandoc.UTF8, - Text.Pandoc.ASCIIMathML, - Text.Pandoc.Readers.HTML, - Text.Pandoc.Readers.LaTeX, - Text.Pandoc.Readers.Markdown, - Text.Pandoc.Readers.RST, - Text.Pandoc.Writers.DefaultHeaders, - Text.Pandoc.Writers.Docbook, - Text.Pandoc.Writers.HTML, - Text.Pandoc.Writers.LaTeX, - Text.Pandoc.Writers.ConTeXt, - Text.Pandoc.Writers.Man, - Text.Pandoc.Writers.Markdown, - Text.Pandoc.Writers.RST, - Text.Pandoc.Writers.RTF, - Text.Pandoc.Writers.S5 -Ghc-Options: -O0 +Flag splitBase + Description: Choose the new, smaller, split-up base package. + Default: True -Executable: pandoc -Hs-Source-Dirs: src -Main-Is: Main.hs -Ghc-Options: -O0 +Library + if flag(splitBase) + Build-Depends: base >= 3, pretty, containers + else + Build-Depends: base < 3 + Build-Depends: parsec, xhtml, mtl, regex-compat, network + Hs-Source-Dirs: src + Exposed-Modules: Text.Pandoc, + Text.Pandoc.Blocks, + Text.Pandoc.Definition, + Text.Pandoc.CharacterReferences, + Text.Pandoc.Shared, + Text.Pandoc.UTF8, + Text.Pandoc.ASCIIMathML, + Text.Pandoc.Readers.HTML, + Text.Pandoc.Readers.LaTeX, + Text.Pandoc.Readers.Markdown, + Text.Pandoc.Readers.RST, + Text.Pandoc.Writers.DefaultHeaders, + Text.Pandoc.Writers.Docbook, + Text.Pandoc.Writers.HTML, + Text.Pandoc.Writers.LaTeX, + Text.Pandoc.Writers.ConTeXt, + Text.Pandoc.Writers.Man, + Text.Pandoc.Writers.Markdown, + Text.Pandoc.Writers.RST, + Text.Pandoc.Writers.RTF, + Text.Pandoc.Writers.S5 + Ghc-Options: -O2 + +Executable pandoc + Hs-Source-Dirs: src + Main-Is: Main.hs + Ghc-Options: -O2 -- cgit v1.2.3