summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hakyll.cabal21
-rw-r--r--src-inotify/Hakyll/Web/Preview/Poll.hs (renamed from src/Hakyll/Web/Preview/INotify.hs)2
-rw-r--r--src-interval/Hakyll/Web/Preview/Poll.hs (renamed from src/Hakyll/Web/Preview/Interval.hs)2
-rw-r--r--src/Hakyll/Main.hs2
4 files changed, 20 insertions, 7 deletions
diff --git a/hakyll.cabal b/hakyll.cabal
index 57c6066..34d9cc2 100644
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -1,5 +1,5 @@
Name: hakyll
-Version: 2.4.1
+Version: 3.0.0.0
Synopsis: A simple static site generator library.
Description: A simple static site generator library, mainly aimed at
@@ -24,9 +24,20 @@ source-repository head
type: git
location: git://github.com/jaspervdj/Hakyll.git
+flag inotify
+ description: Use the inotify bindings for the preview server. Better, but
+ only works on Linux.
+ default: False
+
library
ghc-options: -Wall
hs-source-dirs: src
+
+ if flag(inotify)
+ hs-source-dirs: src-inotify
+ else
+ hs-source-dirs: src-interval
+
build-depends: base >= 4 && < 5,
filepath == 1.*,
directory == 1.*,
@@ -47,12 +58,14 @@ library
utf8-string >= 0.3,
hinotify >= 0.3,
tagsoup >= 0.12,
- hopenssl >= 1.4
+ hopenssl >= 1.4,
+ unix >= 2.4,
+ strict-concurrency >= 0.2
exposed-modules: Hakyll
Hakyll.Main
Hakyll.Web.Util.String
Hakyll.Web.Preview.Server
- Hakyll.Web.Preview.INotify
+ Hakyll.Web.Preview.Poll
Hakyll.Web.CompressCss
Hakyll.Web.Template
Hakyll.Web.Feed
@@ -64,10 +77,10 @@ library
Hakyll.Web.RelativizeUrls
Hakyll.Web.Page.Read
Hakyll.Web.Page.Metadata
- Hakyll.Web
Hakyll.Core.ResourceProvider.FileResourceProvider
Hakyll.Core.Configuration
Hakyll.Core.Identifier.Pattern
+ Hakyll.Core.UnixFilter
Hakyll.Core.Util.Arrow
Hakyll.Core.Util.File
Hakyll.Core.ResourceProvider
diff --git a/src/Hakyll/Web/Preview/INotify.hs b/src-inotify/Hakyll/Web/Preview/Poll.hs
index e21b767..69370ac 100644
--- a/src/Hakyll/Web/Preview/INotify.hs
+++ b/src-inotify/Hakyll/Web/Preview/Poll.hs
@@ -1,6 +1,6 @@
-- | Filesystem polling with an inotify backend. Works only on linux.
--
-module Hakyll.Web.Preview.INotify
+module Hakyll.Web.Preview.Poll
( previewPoll
) where
diff --git a/src/Hakyll/Web/Preview/Interval.hs b/src-interval/Hakyll/Web/Preview/Poll.hs
index 5ab90e5..ec6df0c 100644
--- a/src/Hakyll/Web/Preview/Interval.hs
+++ b/src-interval/Hakyll/Web/Preview/Poll.hs
@@ -1,7 +1,7 @@
-- | Interval-based implementation of preview polling, for the platforms which
-- are not supported by inotify.
--
-module Hakyll.Web.Preview.Interval
+module Hakyll.Web.Preview.Poll
( previewPoll
) where
diff --git a/src/Hakyll/Main.hs b/src/Hakyll/Main.hs
index 13ec0dd..a44d9fa 100644
--- a/src/Hakyll/Main.hs
+++ b/src/Hakyll/Main.hs
@@ -14,7 +14,7 @@ import Hakyll.Core.Configuration
import Hakyll.Core.Run
import Hakyll.Core.Rules
import Hakyll.Core.Rules.Internal
-import Hakyll.Web.Preview.INotify
+import Hakyll.Web.Preview.Poll
import Hakyll.Web.Preview.Server
-- | This usualy is the function with which the user runs the hakyll compiler