From 157d098da2ce3281dd9a29a2b9d39f1c26538fd4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 14 Dec 2011 19:01:54 +0200
Subject: [PATCH] DEV -> DEVELOPMENT

---
 yesod/scaffold/Application.hs.cg      | 2 +-
 yesod/scaffold/Foundation.hs.cg       | 4 ++--
 yesod/scaffold/Settings.hs.cg         | 2 +-
 yesod/scaffold/deploy/Procfile.cg     | 4 ++--
 yesod/scaffold/project.cabal.cg       | 4 ++--
 yesod/scaffold/tiny/Application.hs.cg | 2 +-
 yesod/scaffold/tiny/Settings.hs.cg    | 2 +-
 yesod/scaffold/tiny/project.cabal.cg  | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 6da71d8f..0fb3f48d 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -29,7 +29,7 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef DEV
+#ifdef DEVELOPMENT
     s <- staticDevel Settings.staticDir
 #else
     s <- static Settings.staticDir
diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg
index 5c51cf38..a92fb5c9 100644
--- a/yesod/scaffold/Foundation.hs.cg
+++ b/yesod/scaffold/Foundation.hs.cg
@@ -33,7 +33,7 @@ import Model
 import Text.Jasmine (minifym)
 import Web.ClientSession (getKey)
 import Text.Hamlet (hamletFile)
-#if DEV
+#if DEVELOPMENT
 import qualified Data.Text.Lazy.Encoding
 #else
 import Network.Mail.Mime (sendmail)
@@ -145,7 +145,7 @@ instance YesodAuth ~sitearg~ where
 
 -- Sends off your mail. Requires sendmail in production!
 deliver :: ~sitearg~ -> L.ByteString -> IO ()
-#ifdef DEV
+#ifdef DEVELOPMENT
 deliver y = logLazyText (getLogger y) . Data.Text.Lazy.Encoding.decodeUtf8
 #else
 deliver _ = sendmail
diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg
index 982d1e2e..51c6d93e 100644
--- a/yesod/scaffold/Settings.hs.cg
+++ b/yesod/scaffold/Settings.hs.cg
@@ -49,7 +49,7 @@ staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 -- user.
 
 widgetFile :: String -> Q Exp
-#if DEV
+#if DEVELOPMENT
 widgetFile = Yesod.Default.Util.widgetFileReload
 #else
 widgetFile = Yesod.Default.Util.widgetFileNoReload
diff --git a/yesod/scaffold/deploy/Procfile.cg b/yesod/scaffold/deploy/Procfile.cg
index e4fab22f..a63a9bf9 100644
--- a/yesod/scaffold/deploy/Procfile.cg
+++ b/yesod/scaffold/deploy/Procfile.cg
@@ -27,12 +27,12 @@
 #     
 # * add code in Settings.hs to turn that url into connection parameters. The below works for Postgresql.
 #
-#     #ifdef !DEV
+#     #ifdef !DEVELOPMENT
 #     import qualified Web.Heroku
 #     #endif
 #
 #     dbConnParams :: AppEnvironment -> IO [(Text, Text)]
-#     #ifdef !DEV
+#     #ifdef !DEVELOPMENT
 #     dbConnParams _ = Web.Heroku.dbConnParams
 #     #else
 #     dbConnParams env = do
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index b7ffa518..09e37439 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -35,7 +35,7 @@ library
                      Handler.Root
 
     ghc-options:   -Wall -threaded -O0
-    cpp-options:   -DDEV
+    cpp-options:   -DDEVELOPMENT
 
     extensions: TemplateHaskell
                 QuasiQuotes
@@ -54,7 +54,7 @@ executable         ~project~
         Buildable: False
 
     if flag(dev)
-        cpp-options:   -DDEV
+        cpp-options:   -DDEVELOPMENT
         ghc-options:   -Wall -threaded -O0
     else
         ghc-options:   -Wall -threaded
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 61e46664..55da0704 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -28,7 +28,7 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef DEV
+#ifdef DEVELOPMENT
     s <- staticDevel Settings.staticDir
 #else
     s <- static Settings.staticDir
diff --git a/yesod/scaffold/tiny/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg
index b81780aa..9c4fc748 100644
--- a/yesod/scaffold/tiny/Settings.hs.cg
+++ b/yesod/scaffold/tiny/Settings.hs.cg
@@ -38,7 +38,7 @@ staticRoot :: AppConfig DefaultEnv a ->  Text
 staticRoot conf = [~qq~st|#{appRoot conf}/static|]
 
 widgetFile :: String -> Q Exp
-#if DEV
+#if DEVELOPMENT
 widgetFile = Yesod.Default.Util.widgetFileReload
 #else
 widgetFile = Yesod.Default.Util.widgetFileNoReload
diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg
index b57a46b1..4e4ec5fc 100644
--- a/yesod/scaffold/tiny/project.cabal.cg
+++ b/yesod/scaffold/tiny/project.cabal.cg
@@ -33,7 +33,7 @@ library
                      Handler.Root
 
     ghc-options:   -Wall -threaded -O0
-    cpp-options:   -DDEV
+    cpp-options:   -DDEVELOPMENT
 
     extensions: TemplateHaskell
                 QuasiQuotes
@@ -49,7 +49,7 @@ executable         ~project~
         Buildable: False
 
     if flag(dev)
-        cpp-options:   -DDEV
+        cpp-options:   -DDEVELOPMENT
         ghc-options:   -Wall -threaded -O0
     else
         ghc-options:   -Wall -threaded