haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ghc7 flag (#322)

Browse Source
This commit is contained in:
Michael Snoyman 2012-04-25 17:20:38 +03:00
parent bea122cee9
commit 12f530a1e7
3 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-auth/yesod-auth.cabal
View File

@ -12,8 +12,6 @@ build-type: Simple
homepage: http://www.yesodweb.com/ homepage: http://www.yesodweb.com/
description: Authentication for Yesod. description: Authentication for Yesod.
flag ghc7
flag blaze_html_0_5 flag blaze_html_0_5
description: use blaze-html 0.5 and blaze-markup 0.5 description: use blaze-html 0.5 and blaze-markup 0.5
default: False default: False

23
yesod-core/yesod-core.cabal
View File

@ -44,21 +44,14 @@ flag blaze_html_0_5
description: use blaze-html 0.5 and blaze-markup 0.5 description: use blaze-html 0.5 and blaze-markup 0.5
default: False default: False
flag ghc7
library library
if flag(ghc7)
build-depends: base >= 4.3 && < 5
cpp-options: -DGHC7
else
build-depends: base >= 4 && < 4.3
-- Work around a bug in cabal. Without this, wai-test doesn't get built and -- Work around a bug in cabal. Without this, wai-test doesn't get built and
-- we have a missing dependency during --enable-tests builds. -- we have a missing dependency during --enable-tests builds.
if flag(test) if flag(test)
build-depends: wai-test build-depends: wai-test
build-depends: time >= 1.1.4 build-depends: base >= 4.3 && < 5
, time >= 1.1.4
, yesod-routes >= 1.0 && < 1.1 , yesod-routes >= 1.0 && < 1.1
, wai >= 1.2 && < 1.3 , wai >= 1.2 && < 1.3
, wai-extra >= 1.2 && < 1.3 , wai-extra >= 1.2 && < 1.3
@ -124,17 +117,9 @@ test-suite tests
main-is: test.hs main-is: test.hs
hs-source-dirs: test hs-source-dirs: test
if flag(ghc7)
type: exitcode-stdio-1.0
build-depends: base >= 4.3 && < 5
cpp-options: -DGHC7
main-is: test.hs
else
type: exitcode-stdio-1.0
build-depends: base >= 4 && < 4.3
main-is: test.hs
cpp-options: -DTEST cpp-options: -DTEST
build-depends: hspec >= 0.8 && < 0.10 build-depends: base
,hspec >= 0.8 && < 0.10
,wai-test ,wai-test
,wai ,wai
,yesod-core ,yesod-core

29
yesod/yesod.cabal
View File

@ -60,24 +60,13 @@ extra-source-files:
scaffold/config/mongoDB.yml.cg scaffold/config/mongoDB.yml.cg
scaffold/devel.hs.cg scaffold/devel.hs.cg
flag ghc7
flag threaded
default: True
description: Build with support for multithreaded execution
flag blaze_html_0_5 flag blaze_html_0_5
description: use blaze-html 0.5 and blaze-markup 0.5 description: use blaze-html 0.5 and blaze-markup 0.5
default: False default: False
library library
if flag(ghc7) build-depends: base >= 4.3 && < 5
build-depends: base >= 4.3 && < 5 , yesod-core >= 1.0 && < 1.1
cpp-options: -DGHC7
else
build-depends: base >= 4 && < 4.3
build-depends: yesod-core >= 1.0 && < 1.1
, yesod-auth >= 1.0 && < 1.1 , yesod-auth >= 1.0 && < 1.1
, yesod-json >= 1.0 && < 1.1 , yesod-json >= 1.0 && < 1.1
, yesod-persistent >= 1.0 && < 1.1 , yesod-persistent >= 1.0 && < 1.1
@ -104,17 +93,13 @@ library
ghc-options: -Wall ghc-options: -Wall
executable yesod executable yesod
if flag(ghc7)
build-depends: base >= 4.3 && < 5
cpp-options: -DGHC7
else
build-depends: base >= 4 && < 4.3
if os(windows) if os(windows)
cpp-options: -DWINDOWS cpp-options: -DWINDOWS
build-depends: parsec >= 2.1 && < 4 build-depends: base >= 4.3 && < 5
, parsec >= 2.1 && < 4
, text >= 0.11 && < 0.12 , text >= 0.11 && < 0.12
, shakespeare-text >= 1.0 && < 1.1 , shakespeare-text >= 1.0 && < 1.1
, bytestring >= 0.9.1.4 && < 0.10 , bytestring >= 0.9.1.4 && < 0.10
, time >= 1.1.4 , time >= 1.1.4
, template-haskell , template-haskell
, directory >= 1.0 && < 1.2 , directory >= 1.0 && < 1.2
@ -127,9 +112,7 @@ executable yesod
, filepath >= 1.1 , filepath >= 1.1
, fast-logger >= 0.0.2 && < 0.1 , fast-logger >= 0.0.2 && < 0.1
, process , process
ghc-options: -Wall ghc-options: -Wall -threaded
if flag(threaded)
ghc-options: -threaded
main-is: main.hs main-is: main.hs
other-modules: Scaffolding.CodeGen other-modules: Scaffolding.CodeGen
Scaffolding.Scaffolder Scaffolding.Scaffolder