on master help sign in
wai-handler-devel: Compatibility with GHC 7.6.1 / directory-1.2.0
commit334974738def52ca9af25d5ff0f390b0d5c1b284 authorSimon Hengel <sol@typeful.net> dateSun 2 Dec 2012, 21:07 (14 years ago) parent75fd752
4 files changed+27−5
wai-handler-devel/.ghci+1 wai-handler-devel/Network/Wai/Handler/DevelServer.hs+5−5 wai-handler-devel/Network/Wai/Handler/DevelServer/Compat.hs+19 wai-handler-devel/wai-handler-devel.cabal+2
wai-handler-devel/.ghcinew file+1
@@ -0,0 +1 @@
1+:set -optP-include -optPdist/build/autogen/cabal_macros.h
wai-handler-devel/Network/Wai/Handler/DevelServer.hs+5−5
@@ -25,13 +25,13 @@ import Data.Maybe
2525import Control.Monad
2626import Control.Concurrent.MVar
2727
28−import System.Directory (getModificationTime)
2928import qualified Network.Wai.Handler.Warp as Warp
3029import Network.Wai.Application.Devel
3130import Network.Wai.Middleware.RequestLogger (logStdoutDev)
3231
3332import Data.List (nub, group, sort)
34−import System.Time (ClockTime)
33+
34+import Network.Wai.Handler.DevelServer.Compat
3535
3636type FunctionName = String
3737
@@ -98,8 +98,8 @@ startApp queue withApp = do
9898 void x = x >> return ()
9999-}
100100
101−getTimes :: [FilePath] -> IO [ClockTime]
102−getTimes = E.handle (constSE $ return []) . mapM getModificationTime
101+getTimes :: [FilePath] -> IO [TimeStamp]
102+getTimes = E.handle (constSE $ return []) . mapM getTimeStamp
103103
104104constSE :: x -> SomeException -> x
105105constSE = const
@@ -129,7 +129,7 @@ reload :: String -> String
129129 -> Maybe SomeException
130130 -> AppHolder
131131 -> [IO ()]
132− -> IO (Maybe SomeException, [(FilePath, ClockTime)])
132+ -> IO (Maybe SomeException, [(FilePath, TimeStamp)])
133133reload modu func extras prevError ah actions = do
134134 case prevError of
135135 Nothing -> putStrLn "Attempting to interpret your app..."
wai-handler-devel/Network/Wai/Handler/DevelServer/Compat.hsnew file+19
@@ -0,0 +1,19 @@
1+{-# LANGUAGE CPP #-}
2+module Network.Wai.Handler.DevelServer.Compat (
3+ TimeStamp
4+, getTimeStamp
5+) where
6+
7+import System.Directory (getModificationTime)
8+
9+#if MIN_VERSION_directory(1,2,0)
10+import Data.Time.Clock (UTCTime)
11+newtype TimeStamp = TimeStamp UTCTime
12+#else
13+import System.Time (ClockTime)
14+newtype TimeStamp = TimeStamp ClockTime
15+#endif
16+ deriving Eq
17+
18+getTimeStamp :: FilePath -> IO TimeStamp
19+getTimeStamp = fmap TimeStamp . getModificationTime
wai-handler-devel/wai-handler-devel.cabal+2
@@ -32,10 +32,12 @@ Library
3232 , hint >= 0.3.2.3 && < 0.4
3333 , text >= 0.7
3434 , old-time
35+ , time
3536 , transformers >= 0.2.2
3637 , attoparsec >= 0.10
3738 Exposed-modules: Network.Wai.Handler.DevelServer
3839 Network.Wai.Application.Devel
40+ Other-modules: Network.Wai.Handler.DevelServer.Compat
3941 ghc-options: -Wall
4042
4143Executable wai-handler-devel