git.iko.soy/typeable/pandoc
on master help sign in
Include Pandoc.cabal in repository; do not generate it from

Pandoc.cabal.in using cabalize. Removed cabalize and Pandoc.cabal.in, which are no longer needed. Reason: We want Pandoc to be buildable using Cabal without preprocessing, so it can go into the Hackage repository of Haskell libraries. git-svn-id: https://pandoc.googlecode.com/svn/trunk@604 788f1e2b-df1e-0410-8736-df70ead52e1b

commitc841becc84e451c5696bca8aa7040efb484106fd authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSun 17 Jun 2007, 16:16 (19 years ago) parent28a9970
2 files changed+7−51
Pandoc.cabal.in → Pandoc.cabal+7−7 cabalize−44
Pandoc.cabal.in → Pandoc.cabalrenamed+7−7
@@ -1,18 +1,18 @@
11Name: Pandoc
2−Version: @VERSION@
2+Version: 0.4
33License: GPL
44License-File: COPYING
55Author: John MacFarlane <jgm at berkeley dot edu>
66Stability: alpha
77Homepage: http://sophos.berkeley.edu/macfarlane/pandoc
8−Package-URL: http://pandoc.googlecode.com/files/pandoc-@VERSION@.tar.gz
8+Package-URL: http://pandoc.googlecode.com/files/pandoc-0.4.tar.gz
99Category: Text
1010Tested-With: GHC
1111Synopsis: Utilities for translating between various markup formats
1212Description: Haskell utilities for translating between markdown, HTML,
1313 reStructuredText, LaTeX, DocBook, and RTF
14−Build-Depends: @BUILD_DEPENDS@
15−@HS_SOURCE_DIRS@: src
14+Build-Depends: base, parsec, xhtml, mtl, regex-compat
15+Hs-Source-Dirs: src
1616Exposed-Modules: Text.ParserCombinators.Pandoc,
1717 Text.Pandoc,
1818 Text.Pandoc.ASCIIMathML,
@@ -32,9 +32,9 @@ Exposed-Modules: Text.ParserCombinators.Pandoc,
3232 Text.Pandoc.Readers.Markdown,
3333 Text.Pandoc.Readers.RST,
3434 Text.Pandoc.Readers.LaTeX
35−Ghc-Options: @HCFLAGS@
35+Ghc-Options: -O0
3636
3737Executable: pandoc
38−@HS_SOURCE_DIRS@: src
38+Hs-Source-Dirs: src
3939Main-Is: Main.hs
40−Ghc-Options: @HCFLAGS@
40+Ghc-Options: -O0
cabalizedeleted−44
@@ -1,44 +0,0 @@
1−#!/bin/sh
2−# Preprocesses cabal file.
3−
4−BASE_DEPENDS="base parsec xhtml mtl"
5−
6−GHC64_DEPENDS=${GHC64_DEPENDS}
7−GHC66_DEPENDS=${GHC66_DEPENDS-"regex-compat"}
8−HCFLAGS=${HCFLAGS-"-O0"}
9−
10−set -- $(ghc --version)
11−while [ -n "$1" ] && [ "$1" != 'version' ]; do
12− shift
13−done
14−shift
15−ghc_version="$1"
16−
17−BUILD_DEPENDS="${BASE_DEPENDS}"
18−case "$ghc_version" in
19−6.4*)
20− BUILD_DEPENDS="${BUILD_DEPENDS} ${GHC64_DEPENDS}"
21− ;;
22−6.[5-9]*)
23− BUILD_DEPENDS="${BUILD_DEPENDS} ${GHC66_DEPENDS}"
24− ;;
25−*)
26− echo >&2 "WARNING: Unsupported GHC version '$ghc_version'; proceeding anyway"
27− break
28− ;;
29−esac
30−BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g')
31−
32−PANDOC_VERSION=$(sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' src/Main.hs)
33−
34−# Handle 'Hs-Source-Dir' option name which was deprecated in Cabal > 1.1.3.
35−HS_SOURCE_DIRS='Hs-Source-Dirs'
36−cabal_version=$(ghc-pkg -l | sed -ne 's/.*[Cc]abal-\([^,]*\).*/\1/p')
37−if printf "$cabal_version\n1.1.3" | sort | tail -n 1 | grep -q '1\.1\.3'; then
38− HS_SOURCE_DIRS='Hs-Source-Dir'
39−fi
40−
41−sed -e "s#@HCFLAGS@#$HCFLAGS#g" \
42− -e "s#@BUILD_DEPENDS@#$BUILD_DEPENDS#g" \
43− -e "s#@HS_SOURCE_DIRS@#$HS_SOURCE_DIRS#g" \
44− -e "s#@VERSION@#$PANDOC_VERSION#g"