From c841becc84e451c5696bca8aa7040efb484106fd Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Sun, 17 Jun 2007 16:16:57 +0000
Subject: [PATCH] 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
---
Pandoc.cabal.in => Pandoc.cabal | 14 +++++------
cabalize | 44 ---------------------------------
2 files changed, 7 insertions(+), 51 deletions(-)
rename Pandoc.cabal.in => Pandoc.cabal (84%)
delete mode 100755 cabalize
diff --git a/Pandoc.cabal.in b/Pandoc.cabal
similarity index 84%
rename from Pandoc.cabal.in
rename to Pandoc.cabal
index 3ae0f47d4..d5fe0acab 100644
--- a/Pandoc.cabal.in
+++ b/Pandoc.cabal
@@ -1,18 +1,18 @@
Name: Pandoc
-Version: @VERSION@
+Version: 0.4
License: GPL
License-File: COPYING
Author: John MacFarlane <jgm at berkeley dot edu>
Stability: alpha
Homepage: http://sophos.berkeley.edu/macfarlane/pandoc
-Package-URL: http://pandoc.googlecode.com/files/pandoc-@VERSION@.tar.gz
+Package-URL: http://pandoc.googlecode.com/files/pandoc-0.4.tar.gz
Category: Text
Tested-With: GHC
Synopsis: Utilities for translating between various markup formats
Description: Haskell utilities for translating between markdown, HTML,
reStructuredText, LaTeX, DocBook, and RTF
-Build-Depends: @BUILD_DEPENDS@
-@HS_SOURCE_DIRS@: src
+Build-Depends: base, parsec, xhtml, mtl, regex-compat
+Hs-Source-Dirs: src
Exposed-Modules: Text.ParserCombinators.Pandoc,
Text.Pandoc,
Text.Pandoc.ASCIIMathML,
@@ -32,9 +32,9 @@ Exposed-Modules: Text.ParserCombinators.Pandoc,
Text.Pandoc.Readers.Markdown,
Text.Pandoc.Readers.RST,
Text.Pandoc.Readers.LaTeX
-Ghc-Options: @HCFLAGS@
+Ghc-Options: -O0
Executable: pandoc
-@HS_SOURCE_DIRS@: src
+Hs-Source-Dirs: src
Main-Is: Main.hs
-Ghc-Options: @HCFLAGS@
+Ghc-Options: -O0
diff --git a/cabalize b/cabalize
deleted file mode 100755
index 3cb46cbd5..000000000
--- a/cabalize
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Preprocesses cabal file.
-
-BASE_DEPENDS="base parsec xhtml mtl"
-
-GHC64_DEPENDS=${GHC64_DEPENDS}
-GHC66_DEPENDS=${GHC66_DEPENDS-"regex-compat"}
-HCFLAGS=${HCFLAGS-"-O0"}
-
-set -- $(ghc --version)
-while [ -n "$1" ] && [ "$1" != 'version' ]; do
- shift
-done
-shift
-ghc_version="$1"
-
-BUILD_DEPENDS="${BASE_DEPENDS}"
-case "$ghc_version" in
-6.4*)
- BUILD_DEPENDS="${BUILD_DEPENDS} ${GHC64_DEPENDS}"
- ;;
-6.[5-9]*)
- BUILD_DEPENDS="${BUILD_DEPENDS} ${GHC66_DEPENDS}"
- ;;
-*)
- echo >&2 "WARNING: Unsupported GHC version '$ghc_version'; proceeding anyway"
- break
- ;;
-esac
-BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g')
-
-PANDOC_VERSION=$(sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' src/Main.hs)
-
-# Handle 'Hs-Source-Dir' option name which was deprecated in Cabal > 1.1.3.
-HS_SOURCE_DIRS='Hs-Source-Dirs'
-cabal_version=$(ghc-pkg -l | sed -ne 's/.*[Cc]abal-\([^,]*\).*/\1/p')
-if printf "$cabal_version\n1.1.3" | sort | tail -n 1 | grep -q '1\.1\.3'; then
- HS_SOURCE_DIRS='Hs-Source-Dir'
-fi
-
-sed -e "s#@HCFLAGS@#$HCFLAGS#g" \
- -e "s#@BUILD_DEPENDS@#$BUILD_DEPENDS#g" \
- -e "s#@HS_SOURCE_DIRS@#$HS_SOURCE_DIRS#g" \
- -e "s#@VERSION@#$PANDOC_VERSION#g"