diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-03-26 17:22:00 +0200 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-03-26 17:22:00 +0200 |
| commit | 10d91c147968d2e4d63b99b5b0342624827f416f (patch) | |
| tree | 3a739ffa0b56d3fa6b5e1524820a79031a996e67 /src/Text | |
| parent | 604c824d38f255dd44fec9bb69052002b5a59495 (diff) | |
| download | pandoc-10d91c147968d2e4d63b99b5b0342624827f416f.tar.gz | |
Use file-embed instead of hsb2hs to embed data files.
I think template haskell is robust enough now across platforms
that this will work.
Motivation: file-embed gives us better dependency tracking: if a data
file changes, ghc/stack/cabal know to recompile the Data module.
This also removes hsb2hs as a build dependency.
Diffstat (limited to 'src/Text')
| -rw-r--r-- | src/Text/Pandoc/Data.hs (renamed from src/Text/Pandoc/Data.hsb) | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Data.hsb b/src/Text/Pandoc/Data.hs index 02c109816..df26f5412 100644 --- a/src/Text/Pandoc/Data.hsb +++ b/src/Text/Pandoc/Data.hs @@ -1,6 +1,8 @@ -{-# LANGUAGE OverloadedStrings #-} --- to be processed using hsb2hs +{-# LANGUAGE TemplateHaskell #-} + module Text.Pandoc.Data (dataFiles) where + +import Data.FileEmbed import qualified Data.ByteString as B import System.FilePath (splitDirectories) import qualified System.FilePath.Posix as Posix @@ -12,5 +14,4 @@ dataFiles = map (\(fp, contents) -> (Posix.joinPath (splitDirectories fp), contents)) dataFiles' dataFiles' :: [(FilePath, B.ByteString)] -dataFiles' = ("MANUAL.txt", %blob "MANUAL.txt") : %blobs "data" - +dataFiles' = ("MANUAL.txt", $(embedFile "MANUAL.txt")) : $(embedDir "data") |