git.iko.soy/typeable/pandoc
on master help sign in
Text.Pandoc.Data: ensure it compiles even without embed_data_files.
453970cJohn MacFarlane
src/Text/Pandoc/Data.hs+11−3
compare with master
unifiedsplit
@@ -1,11 +1,15 @@
1+{-# LANGUAGE CPP #-}
2+#ifdef EMBED_DATA_FILES
1{-# LANGUAGE TemplateHaskell #-}
3{-# LANGUAGE TemplateHaskell #-}
2−
4+#endif
3module Text.Pandoc.Data (dataFiles) where
5module Text.Pandoc.Data (dataFiles) where
4
6
5−import Data.FileEmbed
7+import System.FilePath (FilePath, splitDirectories)
6import qualified Data.ByteString as B
8import qualified Data.ByteString as B
7−import System.FilePath (splitDirectories)
8import qualified System.FilePath.Posix as Posix
9import qualified System.FilePath.Posix as Posix
10+#ifdef EMBED_DATA_FILES
11+import Data.FileEmbed
12+#endif
9
13
10-- We ensure that the data files are stored using Posix
14-- We ensure that the data files are stored using Posix
11-- path separators (/), even on Windows.
15-- path separators (/), even on Windows.
@@ -14,4 +18,8 @@ dataFiles = map (\(fp, contents) ->
14 (Posix.joinPath (splitDirectories fp), contents)) dataFiles'
18 (Posix.joinPath (splitDirectories fp), contents)) dataFiles'
15
19
16dataFiles' :: [(FilePath, B.ByteString)]
20dataFiles' :: [(FilePath, B.ByteString)]
21+#ifdef EMBED_DATA_FILES
17dataFiles' = ("MANUAL.txt", $(embedFile "MANUAL.txt")) : $(embedDir "data")
22dataFiles' = ("MANUAL.txt", $(embedFile "MANUAL.txt")) : $(embedDir "data")
23+#else
24+dataFiles' = error "dataFiles is only defined when embed_data_files flag set"
25+#endif