diff options
author | Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
commit | 521ef9dfebd6a9418a5dce7d1686dbf353ddd0a0 (patch) | |
tree | afe6bb5d52e21a049f04020ae448afb81adc02a7 /git-annex.cabal | |
parent | f4b4f327b69189d24663a7db6407c1f7a6e48fdd (diff) | |
parent | 5c6f6e4d0abb9b4856908a500611044b3b7a48e6 (diff) |
Merge branch 'master' into tasty-tests
Conflicts:
Test.hs
Diffstat (limited to 'git-annex.cabal')
-rw-r--r-- | git-annex.cabal | 67 |
1 files changed, 48 insertions, 19 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 367cdab71..9b3a66e1c 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 4.20130802 +Version: 4.20131106 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net> @@ -68,15 +68,25 @@ Flag TDFA Flag Feed Description: Enable podcast feed support +Flag Quvi + Description: Enable use of quvi to download videos + +Flag CryptoHash + Description: Enable use of cryptohash for checksumming + +Flag EKG + Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/) + Default: False + Executable git-annex Main-Is: git-annex.hs Build-Depends: MissingH, hslogger, directory, filepath, containers, utf8-string, network (>= 2.0), mtl (>= 2), bytestring, old-locale, time, HTTP, extensible-exceptions, dataenc, SHA, process, json, - base (>= 4.5 && < 4.8), monad-control, MonadCatchIO-transformers, + base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, - SafeSemaphore, uuid, random, dlist, unix-compat + SafeSemaphore, uuid, random, dlist, unix-compat, async -- Need to list these because they're generated from .hsc files. Other-Modules: Utility.Touch Utility.Mounts Include-Dirs: Utility @@ -91,9 +101,7 @@ Executable git-annex if flag(Production) GHC-Options: -O2 - if os(windows) - CPP-Options: -D__WINDOWS__ - else + if (! os(windows)) Build-Depends: unix if flag(TestSuite) @@ -103,6 +111,10 @@ Executable git-annex if flag(TDFA) Build-Depends: regex-tdfa CPP-Options: -DWITH_TDFA + + if flag(CryptoHash) + Build-Depends: cryptohash (>= 0.10.0) + CPP-Options: -DWITH_CRYPTOHASH if flag(S3) Build-Depends: hS3 @@ -112,14 +124,10 @@ Executable git-annex Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types CPP-Options: -DWITH_WEBDAV - if flag(Assistant) && ! os(windows) && ! os(solaris) - Build-Depends: async, stm (>= 2.3) + if flag(Assistant) && ! os(solaris) + Build-Depends: stm (>= 2.3) CPP-Options: -DWITH_ASSISTANT - if flag(Android) - Build-Depends: data-endian - CPP-Options: -D__ANDROID__ - if flag(Assistant) if os(linux) && flag(Inotify) Build-Depends: hinotify @@ -129,27 +137,39 @@ Executable git-annex Build-Depends: hfsevents CPP-Options: -DWITH_FSEVENTS else - if (! os(windows) && ! os(solaris) && ! os(linux)) - CPP-Options: -DWITH_KQUEUE - C-Sources: Utility/libkqueue.c + if os(windows) + Build-Depends: Win32-notify + CPP-Options: -DWITH_WIN32NOTIFY + else + if (! os(solaris) && ! os(linux)) + if flag(Android) + Build-Depends: hinotify + CPP-Options: -DWITH_INOTIFY + else + CPP-Options: -DWITH_KQUEUE + C-Sources: Utility/libkqueue.c if os(linux) && flag(Dbus) Build-Depends: dbus (>= 0.10.3) CPP-Options: -DWITH_DBUS + + if flag(Android) + Build-Depends: data-endian + CPP-Options: -D__ANDROID__ - if flag(Webapp) + if flag(Webapp) && (! os(windows)) Build-Depends: yesod, yesod-default, yesod-static, yesod-form, yesod-core, case-insensitive, http-types, transformers, wai, wai-logger, warp, - blaze-builder, crypto-api, hamlet, clientsession, aeson, - template-haskell, data-default + blaze-builder, crypto-api, hamlet, clientsession, + template-haskell, data-default, aeson CPP-Options: -DWITH_WEBAPP if flag(Pairing) Build-Depends: network-multicast, network-info CPP-Options: -DWITH_PAIRING - if flag(XMPP) + if flag(XMPP) && (! os(windows)) Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types CPP-Options: -DWITH_XMPP @@ -160,6 +180,15 @@ Executable git-annex if flag(Feed) Build-Depends: feed CPP-Options: -DWITH_FEED + + if flag(Quvi) + Build-Depends: aeson + CPP-Options: -DWITH_QUVI + + if flag(EKG) + Build-Depends: ekg + GHC-Options: -with-rtsopts=-T + CPP-Options: -DWITH_EKG source-repository head type: git |