haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed GHC 7 error message from development server mode compilation since hint works with GHC 7 correctly now.

Browse Source
This commit is contained in:
Ian Duncan 2011-02-14 01:07:24 -06:00
parent 4ee1a95a1f
commit 3afbdb7d22
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Yesod.hs
View File

@ -62,7 +62,7 @@ import Yesod.Json
import Yesod.Persist import Yesod.Persist
import Network.Wai (Application) import Network.Wai (Application)
import Network.Wai.Middleware.Debug import Network.Wai.Middleware.Debug
#if !GHC7 && !PRODUCTION #if !PRODUCTION
import Network.Wai.Handler.DevelServer (runQuit) import Network.Wai.Handler.DevelServer (runQuit)
#endif #endif
import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Class (lift)
@ -106,9 +106,7 @@ develServer :: Int -- ^ port number
-> String -- ^ module name holding the code -> String -- ^ module name holding the code
-> String -- ^ name of function providing a with-application -> String -- ^ name of function providing a with-application
-> IO () -> IO ()
#if GHC7
develServer = error "Unfortunately, the hint package has not yet been ported to GHC 7, and therefore wai-handler-devel has not either. Once this situation is addressed, a new version of Yesod will be released."
#else
develServer port modu func = do develServer port modu func = do
mapM_ putStrLn mapM_ putStrLn
[ "Starting your server process. Code changes will be automatically" [ "Starting your server process. Code changes will be automatically"
@ -117,7 +115,7 @@ develServer port modu func = do
, "" , ""
] ]
runQuit port modu func determineHamletDeps runQuit port modu func determineHamletDeps
#endif
#endif #endif
data TempType = Hamlet | Cassius | Julius | Widget data TempType = Hamlet | Cassius | Julius | Widget

8
yesod.cabal
View File

@ -23,15 +23,15 @@ flag production
Default: False Default: False
library library
if flag(production)
cpp-options: -DPRODUCTION
else
build-depends: wai-handler-devel >= 0.2 && < 0.3
if flag(ghc7) if flag(ghc7)
build-depends: base >= 4.3 && < 5 build-depends: base >= 4.3 && < 5
cpp-options: -DGHC7 cpp-options: -DGHC7
else else
build-depends: base >= 4 && < 4.3 build-depends: base >= 4 && < 4.3
if flag(production)
cpp-options: -DPRODUCTION
else
build-depends: wai-handler-devel >= 0.2 && < 0.3
build-depends: yesod-core >= 0.7 && < 0.8 build-depends: yesod-core >= 0.7 && < 0.8
, yesod-auth >= 0.3 && < 0.4 , yesod-auth >= 0.3 && < 0.4
, yesod-json >= 0.0 && < 0.1 , yesod-json >= 0.0 && < 0.1