From 6c58728ad39c74d30612037324d22038e8f44719 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 23 Sep 2011 10:16:54 +0300 Subject: [PATCH] Better scaffolded cabal file --- yesod/scaffold/project.cabal.cg | 58 +++++++++------------------- yesod/scaffold/tiny/project.cabal.cg | 40 +++++++------------ 2 files changed, 33 insertions(+), 65 deletions(-) diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index 3055a7e6..a61906c4 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/yesod/scaffold/project.cabal.cg @@ -26,10 +26,6 @@ library else Buildable: False - if os(windows) - cpp-options: -DWINDOWS - - hs-source-dirs: . exposed-modules: Application other-modules: Foundation Model @@ -49,42 +45,24 @@ executable ~project~ else ghc-options: -Wall -threaded -O0 - if os(windows) - cpp-options: -DWINDOWS - main-is: main.hs - hs-source-dirs: . - build-depends: base >= 4 && < 5 - , yesod >= 0.9 && < 0.10 - , yesod-core - , yesod-auth - , yesod-static - , yesod-default - , blaze-html - , yesod-form - , mime-mail - , clientsession - , wai-extra - , directory - , bytestring - , text - , persistent - , persistent-template - , persistent-~backendLower~ >= 0.6 && < 0.7 - ~packages~ + build-depends: base >= 4 && < 5 + , yesod >= 0.9 && < 0.10 + , yesod-core >= 0.9.3 && < 0.10 + , yesod-auth >= 0.7.3 && < 0.8 + , yesod-static >= 0.3.1 && < 0.4 + , yesod-default >= 0.3.1 && < 0.4 + , yesod-form >= 0.3.3 && < 0.4 + , mime-mail >= 0.3.0.3 && < 0.4 + , clientsession >= 0.7.3 && < 0.8 + , bytestring >= 0.9 && < 0.10 + , text >= 0.11 && < 0.12 + , persistent >= 0.6.2 && < 0.7 + , persistent-~backendLower~ >= 0.6 && < 0.7 , template-haskell - , hamlet >= 0.10 && < 0.11 - , shakespeare-css >= 0.10 && < 0.11 - , shakespeare-js >= 0.10 && < 0.11 - , shakespeare-text >= 0.10 && < 0.11 - , hjsmin - , transformers - , data-object - , data-object-yaml - , warp - , blaze-builder - , cmdargs - - if !os(windows) - build-depends: unix + , hamlet >= 0.10 && < 0.11 + , shakespeare-css >= 0.10 && < 0.11 + , shakespeare-js >= 0.10 && < 0.11 + , shakespeare-text >= 0.10 && < 0.11 + , hjsmin >= 0.0.14 && < 0.1 diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg index 1cc7fb75..1d987f2d 100644 --- a/yesod/scaffold/tiny/project.cabal.cg +++ b/yesod/scaffold/tiny/project.cabal.cg @@ -26,12 +26,13 @@ library else Buildable: False exposed-modules: Application - hs-source-dirs: . other-modules: Foundation Settings Settings.StaticFiles Handler.Root + ghc-options: -Wall -threaded -O0 + executable ~project~ if flag(devel) Buildable: False @@ -40,31 +41,20 @@ executable ~project~ cpp-options: -DPRODUCTION ghc-options: -Wall -threaded -O2 else - ghc-options: -Wall -threaded + ghc-options: -Wall -threaded -O0 main-is: main.hs - hs-source-dirs: . - build-depends: base >= 4 && < 5 - , yesod-core >= 0.9 && < 0.10 - , yesod-static - , yesod-default - , clientsession - , wai-extra - , directory - , bytestring - , text + build-depends: base >= 4 && < 5 + , yesod-core >= 0.9.3 && < 0.10 + , yesod-static >= 0.3.1 && < 0.4 + , yesod-default >= 0.3.1 && < 0.4 + , clientsession >= 0.7.3 && < 0.8 + , bytestring >= 0.9 && < 0.10 + , text >= 0.11 && < 0.12 , template-haskell - , hamlet >= 0.10 && < 0.11 - , shakespeare-css >= 0.10 && < 0.11 - , shakespeare-js >= 0.10 && < 0.11 - , shakespeare-text >= 0.10 && < 0.11 - , transformers - , data-object - , data-object-yaml - , wai - , warp - , blaze-builder - , cmdargs - , data-object - , data-object-yaml + , hamlet >= 0.10 && < 0.11 + , shakespeare-text >= 0.10 && < 0.11 + , wai >= 0.4.2 && < 0.5 + , transformers >= 0.2 && < 0.3 +