From 943f6179ab3a30eae6c0e0dd487a34b30ee641f0 Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Sun, 21 Aug 2011 23:16:20 -0700 Subject: [PATCH] remove hs files from config dir --- yesod/scaffold.hs | 5 +++-- yesod/scaffold/Foundation.hs.cg | 2 +- yesod/scaffold/{config => }/Settings.hs.cg | 0 yesod/scaffold/{config => Settings}/StaticFiles.hs.cg | 2 +- yesod/scaffold/project.cabal.cg | 6 +++--- yesod/scaffold/tiny/Foundation.hs.cg | 3 +-- yesod/scaffold/tiny/{config => }/Settings.hs.cg | 0 yesod/scaffold/tiny/project.cabal.cg | 6 +++--- yesod/yesod.cabal | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) rename yesod/scaffold/{config => }/Settings.hs.cg (100%) rename yesod/scaffold/{config => Settings}/StaticFiles.hs.cg (92%) rename yesod/scaffold/tiny/{config => }/Settings.hs.cg (100%) diff --git a/yesod/scaffold.hs b/yesod/scaffold.hs index 822a67b6..af56f7cb 100644 --- a/yesod/scaffold.hs +++ b/yesod/scaffold.hs @@ -144,6 +144,7 @@ scaffold = do mkDir "config" mkDir "Model" mkDir "deploy" + mkDir "Settings" writeFile' ("deploy/Procfile") $(codegen "deploy/Procfile") @@ -165,8 +166,8 @@ scaffold = do writeFile' "Application.hs" $ ifTiny $(codegen "tiny/Application.hs") $(codegen "Application.hs") writeFile' "Handler/Root.hs" $ ifTiny $(codegen "tiny/Handler/Root.hs") $(codegen "Handler/Root.hs") unless isTiny $ writeFile' "Model.hs" $(codegen "Model.hs") - writeFile' "config/Settings.hs" $ ifTiny $(codegen "tiny/config/Settings.hs") $(codegen "config/Settings.hs") - writeFile' "config/StaticFiles.hs" $(codegen "config/StaticFiles.hs") + writeFile' "Settings.hs" $ ifTiny $(codegen "tiny/Settings.hs") $(codegen "Settings.hs") + writeFile' "Settings/StaticFiles.hs" $(codegen "Settings/StaticFiles.hs") writeFile' "cassius/default-layout.cassius" $(codegen "cassius/default-layout.cassius") writeFile' "hamlet/default-layout.hamlet" diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg index 163912df..88c9adb5 100644 --- a/yesod/scaffold/Foundation.hs.cg +++ b/yesod/scaffold/Foundation.hs.cg @@ -17,7 +17,7 @@ module Foundation import Yesod import Yesod.Static -import StaticFiles +import Settings.StaticFiles import Yesod.Auth import Yesod.Auth.OpenId import Yesod.Auth.Email diff --git a/yesod/scaffold/config/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg similarity index 100% rename from yesod/scaffold/config/Settings.hs.cg rename to yesod/scaffold/Settings.hs.cg diff --git a/yesod/scaffold/config/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg similarity index 92% rename from yesod/scaffold/config/StaticFiles.hs.cg rename to yesod/scaffold/Settings/StaticFiles.hs.cg index 54180ff3..d7941ba6 100644 --- a/yesod/scaffold/config/StaticFiles.hs.cg +++ b/yesod/scaffold/Settings/StaticFiles.hs.cg @@ -1,5 +1,5 @@ {-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-} -module StaticFiles where +module Settings.StaticFiles where import Yesod.Static diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index 6269fb0a..0da6cdc4 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/yesod/scaffold/project.cabal.cg @@ -26,11 +26,11 @@ library else Buildable: False exposed-modules: Application - hs-source-dirs: ., config + hs-source-dirs: . other-modules: Foundation Model Settings - StaticFiles + Settings.StaticFiles Handler.Root executable ~project~ @@ -47,7 +47,7 @@ executable ~project~ cpp-options: -DWINDOWS main-is: main.hs - hs-source-dirs: ., config + hs-source-dirs: . build-depends: base >= 4 && < 5 , yesod >= 0.9 && < 0.10 diff --git a/yesod/scaffold/tiny/Foundation.hs.cg b/yesod/scaffold/tiny/Foundation.hs.cg index 4b2565be..d3555ac4 100644 --- a/yesod/scaffold/tiny/Foundation.hs.cg +++ b/yesod/scaffold/tiny/Foundation.hs.cg @@ -15,13 +15,12 @@ module Foundation import Yesod.Core import Yesod.Static -import StaticFiles +import Settings.StaticFiles import Yesod.Logger (Logger, logLazyText) import qualified Settings import System.Directory import qualified Data.ByteString.Lazy as L import Settings (hamletFile, cassiusFile, luciusFile, juliusFile, widgetFile) -import StaticFiles import Control.Monad (unless) import Control.Monad.Trans.Class (lift) import Control.Monad.IO.Class (liftIO) diff --git a/yesod/scaffold/tiny/config/Settings.hs.cg b/yesod/scaffold/tiny/Settings.hs.cg similarity index 100% rename from yesod/scaffold/tiny/config/Settings.hs.cg rename to yesod/scaffold/tiny/Settings.hs.cg diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg index dff2880d..8d930572 100644 --- a/yesod/scaffold/tiny/project.cabal.cg +++ b/yesod/scaffold/tiny/project.cabal.cg @@ -26,10 +26,10 @@ library else Buildable: False exposed-modules: Handler - hs-source-dirs: ., config + hs-source-dirs: . other-modules: Foundation Settings - StaticFiles + Settings.StaticFiles Handler.Root executable ~project~ @@ -43,7 +43,7 @@ executable ~project~ ghc-options: -Wall -threaded main-is: main.hs - hs-source-dirs: ., config + hs-source-dirs: . build-depends: base >= 4 && < 5 , yesod-core >= 0.9 && < 0.10 diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index cb0db1be..8e01dce8 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -29,7 +29,7 @@ extra-source-files: scaffold/tiny/hamlet/homepage.hamlet.cg scaffold/tiny/Handler/Root.hs.cg scaffold/tiny/config/routes.cg - scaffold/tiny/config/Settings.hs.cg + scaffold/tiny/Settings.hs.cg scaffold/static/css/normalize.css.cg scaffold/postgresqlConnPool.cg scaffold/sqliteConnPool.cg @@ -50,7 +50,7 @@ extra-source-files: scaffold/config/postgresql.yml.cg scaffold/config/mongoDB.yml.cg scaffold/config/routes.cg - scaffold/config/Settings.hs.cg + scaffold/Settings.hs.cg scaffold/config/StaticFiles.hs.cg