Merge remote-tracking branch 'parcs/purge-cpp'

yesod/Scaffolding/Scaffolder.hs

@@ -155,6 +155,7 @@ scaffold = do
     writeFile' "Model.hs" $(codegen "Model.hs")
     writeFile' "Settings.hs" $(codegen "Settings.hs")
     writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs")
+    writeFile' "Settings/Development.hs" $(codegen "Settings/Development.hs")
     writeFile' "static/css/bootstrap.css"
         $(codegen "static/css/bootstrap.css")
     writeFile' "templates/default-layout.hamlet"

yesod/scaffold/Application.hs.cg

@@ -11,13 +11,8 @@ import Yesod.Auth
 import Yesod.Default.Config
 import Yesod.Default.Main
 import Yesod.Default.Handlers
-#if DEVELOPMENT
-import Yesod.Logger (Logger, logBS)
-import Network.Wai.Middleware.RequestLogger (logCallbackDev)
-#else
 import Yesod.Logger (Logger, logBS, toProduction)
-import Network.Wai.Middleware.RequestLogger (logCallback)
-#endif
+import Network.Wai.Middleware.RequestLogger (logCallback, logCallbackDev)
 import qualified Database.Persist.Store~importMigration~
 import Network.HTTP.Conduit (newManager, def)
 
@@ -40,13 +35,9 @@ makeApplication conf logger = do
     app <- toWaiAppPlain foundation
     return $ logWare app
   where
-#ifdef DEVELOPMENT
-    logWare = logCallbackDev (logBS setLogger)
-    setLogger = logger
-#else
-    setLogger = toProduction logger -- by default the logger is set for development
-    logWare = logCallback (logBS setLogger)
-#endif
+    setLogger = if development then logger else toProduction logger
+    logWare   = if development then logCallbackDev (logBS setLogger)
+                               else logCallback    (logBS setLogger)
 
 makeFoundation :: AppConfig DefaultEnv Extra -> Logger -> IO ~sitearg~
 makeFoundation conf setLogger = do

yesod/scaffold/Import.hs.cg

@@ -3,6 +3,7 @@ module Import
     , module Yesod
     , module Foundation
     , module Settings.StaticFiles
+    , module Settings.Development
     , module Data.Monoid
     , module Control.Applicative
     , Text
@@ -18,6 +19,7 @@ import Data.Monoid (Monoid (mappend, mempty, mconcat))
 import Control.Applicative ((<$>), (<*>), pure)
 import Data.Text (Text)
 import Settings.StaticFiles
+import Settings.Development
 
 #if __GLASGOW_HASKELL__ < 704
 infixr 5 <>

yesod/scaffold/Settings.hs.cg

@@ -21,6 +21,7 @@ import qualified Yesod.Default.Util
 import Data.Text (Text)
 import Data.Yaml
 import Control.Applicative
+import Settings.Development
 
 -- | Which Persistent backend this site is using.
 type PersistConfig = ~configPersist~
@@ -53,11 +54,8 @@ staticRoot conf = [st|#{appRoot conf}/static|]
 -- user.
 
 widgetFile :: String -> Q Exp
-#if DEVELOPMENT
-widgetFile = Yesod.Default.Util.widgetFileReload
-#else
-widgetFile = Yesod.Default.Util.widgetFileNoReload
-#endif
+widgetFile = if development then Yesod.Default.Util.widgetFileReload
+                            else Yesod.Default.Util.widgetFileNoReload
 
 data Extra = Extra
     { extraCopyright :: Text

yesod/scaffold/Settings/Development.hs.cg

@@ -0,0 +1,14 @@
+module Settings.Development where
+
+import Prelude
+
+development :: Bool
+development =
+#if DEVELOPMENT
+  True
+#else
+  False
+#endif
+
+production :: Bool
+production = not development

yesod/scaffold/Settings/StaticFiles.hs.cg

@@ -4,15 +4,12 @@ import Prelude (IO)
 import Yesod.Static
 import qualified Yesod.Static as Static
 import Settings (staticDir)
+import Settings.Development
 
 -- | use this to create your static file serving site
 staticSite :: IO Static.Static
-staticSite =
-#ifdef DEVELOPMENT
-  Static.staticDevel staticDir
-#else
-  Static.static staticDir
-#endif
+staticSite = if development then Static.staticDevel staticDir
+                            else Static.static      staticDir
 
 -- | This generates easy references to files in the static directory at compile time,
 --   giving you compile-time verification that referenced files exist.

yesod/scaffold/project.cabal.cg

@@ -27,6 +27,7 @@ library
                      Model
                      Settings
                      Settings.StaticFiles
+                     Settings.Development
                      Handler.Home
 
     if flag(dev) || flag(library-only)

yesod/yesod.cabal

@@ -32,6 +32,7 @@ extra-source-files:
   scaffold/tests/main.hs.cg
   scaffold/tests/HomeTest.hs.cg
   scaffold/Settings.hs.cg
+  scaffold/Settings/Development.hs.cg
   scaffold/Settings/StaticFiles.hs.cg
   scaffold/Application.hs.cg
   scaffold/deploy/Procfile.cg