diff options
author | 2012-08-09 13:33:04 -0400 | |
---|---|---|
committer | 2012-08-09 13:33:04 -0400 | |
commit | be310ac4d0d0c0343c8a7d54f9137ee1946bfd1c (patch) | |
tree | fc0079d720e64142441a6db87a27235edca7e333 /git-annex.cabal | |
parent | 20203b45b9dbf915851969b9c5f4c9cb6e71acb6 (diff) |
support building with yesod-default 1.1.0
Old 1.0.1 version is still supported as well. Cabal autodetects
which version is available, but in the Makefile, WITH_OLD_YESOD
has to be configured appropriately.
I have not squashed all the $newline warnings with the new Yesod.
They should go away eventually anyway as Yesod moves past that transition.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r-- | git-annex.cabal | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index ec96bdc32..cdac47bc7 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -40,6 +40,12 @@ Flag Assistant Flag Webapp Description: Enable git-annex webapp +Flag CurrentYesod + Description: Using a current version of Yesod + +Flag OldYesod + Description: Using an old version of Yesod + Executable git-annex Main-Is: git-annex.hs Build-Depends: MissingH, hslogger, directory, filepath, @@ -73,8 +79,15 @@ Executable git-annex Build-Depends: dbus CPP-Options: -DWITH_DBUS - if flag(Webapp) - Build-Depends: yesod, yesod-static, yesod-default, case-insensitive, + if flag(CurrentYesod) + Build-Depends: yesod-default (>= 1.1.0) + + if flag(OldYesod) + Build-Depends: yesod-default (<= 1.0.1.1) + CPP-Options: -DWITH_OLD_YESOD + + if flag(Webapp) && (flag(CurrentYesod) || flag(OldYesod)) + Build-Depends: yesod, yesod-static, case-insensitive, http-types, transformers, wai, wai-logger, warp, blaze-builder, blaze-html, crypto-api, hamlet, clientsession, template-haskell |