From 2adc337fa18c6ba93d87555996b18e4123e47e2d Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Mon, 22 Aug 2011 20:30:16 -0700 Subject: [PATCH] use staticDevel in scaffold --- yesod-static/Yesod/Static.hs | 1 + yesod/scaffold/Application.hs.cg | 4 ++++ yesod/scaffold/tiny/Application.hs.cg | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/yesod-static/Yesod/Static.hs b/yesod-static/Yesod/Static.hs index 46497617..69903680 100644 --- a/yesod-static/Yesod/Static.hs +++ b/yesod-static/Yesod/Static.hs @@ -25,6 +25,7 @@ module Yesod.Static , StaticRoute (..) -- * Smart constructor , static + , staticDevel , embed -- * Template Haskell helpers , staticFiles diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg index f564b31f..7a3ce2df 100644 --- a/yesod/scaffold/Application.hs.cg +++ b/yesod/scaffold/Application.hs.cg @@ -61,7 +61,11 @@ with~sitearg~ conf logger f = do takeMVar flag #endif where +#ifdef PRODUCTION s = static Settings.staticDir +#else + s = staticDevel Settings.staticDir +#endif -- for yesod devel withDevelAppPort :: Dynamic diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg index e6b95afb..e9b6b23e 100644 --- a/yesod/scaffold/tiny/Application.hs.cg +++ b/yesod/scaffold/tiny/Application.hs.cg @@ -40,7 +40,11 @@ with~sitearg~ conf logger f = do let h = ~sitearg~ conf logger s toWaiApp h >>= f where +#ifdef PRODUCTION s = static Settings.staticDir +#else + s = staticDevel Settings.staticDir +#endif with~sitearg~LoadConfig :: Settings.AppEnvironment -> (Application -> IO a) -> IO a with~sitearg~LoadConfig env f = do