git.iko.soy/hakyll
on master help sign in
Merge branch 'stable'

Conflicts: hakyll.cabal

commit962e8ab32ab62daaf92069bfec0e1de8384d7494 authorJasper Van der Jeugt <m@jaspervdj.be> dateThu 17 May 2012, 11:47 (14 years ago) parent778bb5284b5b16
2 files changed+21−6
compare with master
unifiedsplit
hakyll.cabal+16−6 src/Hakyll.hs+5
hakyll.cabal+16−6
@@ -52,7 +52,11 @@ Source-Repository head
5252
5353Flag previewServer
5454 Description: Include the preview server
55− default: True
55+ Default: True
56+
57+Flag unixFilter
58+ Description: Include the UnixFilter module
59+ Default: True
5660
5761Library
5862 Ghc-Options: -Wall
@@ -80,8 +84,7 @@ Library
8084 regex-tdfa >= 1.1 && < 1.2,
8185 tagsoup >= 0.12.6 && < 0.13,
8286 text >= 0.11 && < 1.12,
83− time >= 1.1 && < 1.5,
84− unix >= 2.4 && < 2.6
87+ time >= 1.1 && < 1.5
8588
8689 Exposed-Modules:
8790 Hakyll
@@ -102,7 +105,6 @@ Library
102105 Hakyll.Core.Rules
103106 Hakyll.Core.Run
104107 Hakyll.Core.Store
105− Hakyll.Core.UnixFilter
106108 Hakyll.Core.Util.Arrow
107109 Hakyll.Core.Util.File
108110 Hakyll.Core.Util.String
@@ -141,12 +143,20 @@ Library
141143 Build-depends:
142144 snap-core >= 0.6 && < 0.9,
143145 snap-server >= 0.6 && < 0.9
144− Cpp-Options:
146+ Cpp-options:
145147 -DPREVIEW_SERVER
146− Other-Modules:
148+ Other-modules:
147149 Hakyll.Web.Preview.Poll
148150 Hakyll.Web.Preview.Server
149151
152+ If flag(unixFilter)
153+ Build-depends:
154+ unix >= 2.4 && < 2.6
155+ Cpp-options:
156+ -DUNIX_FILTER
157+ Other-modules:
158+ Hakyll.Core.UnixFilter
159+
150160Test-suite hakyll-tests
151161 Type: exitcode-stdio-1.0
152162 Hs-source-dirs: src tests
src/Hakyll.hs+5
@@ -1,5 +1,6 @@
11-- | Top-level module exporting all modules that are interesting for the user
22--
3+{-# LANGUAGE CPP #-}
34module Hakyll
45 ( module Hakyll.Core.Compiler
56 , module Hakyll.Core.Configuration
@@ -9,7 +10,9 @@ module Hakyll
910 , module Hakyll.Core.Resource.Provider
1011 , module Hakyll.Core.Routes
1112 , module Hakyll.Core.Rules
13+#ifdef UNIX_FILTER
1214 , module Hakyll.Core.UnixFilter
15+#endif
1316 , module Hakyll.Core.Util.Arrow
1417 , module Hakyll.Core.Util.File
1518 , module Hakyll.Core.Util.String
@@ -43,7 +46,9 @@ import Hakyll.Core.Resource
4346import Hakyll.Core.Resource.Provider
4447import Hakyll.Core.Routes
4548import Hakyll.Core.Rules
49+#ifdef UNIX_FILTER
4650import Hakyll.Core.UnixFilter
51+#endif
4752import Hakyll.Core.Util.Arrow
4853import Hakyll.Core.Util.File
4954import Hakyll.Core.Util.String