mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add android flag; misc other flag fixes

Browse source 
Stopped checking the assistant flag for flags like webapp and xmpp,
because cabal disables the assistant if the other flag's dependencies
cannot be satisfied.
This commit is contained in:
Joey Hess 2013-02-27 02:30:26 -04:00
parent 30076c0461
commit 32aee1bb3e
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
git-annex.cabal
View file

@ -53,7 +53,11 @@ Flag DNS
Description: Enable the haskell DNS library for DNS lookup Description: Enable the haskell DNS library for DNS lookup
Flag Production Flag Production
Description: Enable production build Description: Enable production build (slower build; faster binary)
Flag Android
Description: Building for Android
Default: False
Executable git-annex Executable git-annex
Main-Is: git-annex.hs Main-Is: git-annex.hs
@ -82,13 +86,13 @@ Executable git-annex
Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types
CPP-Options: -DWITH_WEBDAV CPP-Options: -DWITH_WEBDAV
if flag(Assistant)
Build-Depends: async
if flag(Assistant) && ! os(windows) && ! os(solaris) if flag(Assistant) && ! os(windows) && ! os(solaris)
Build-Depends: stm >= 2.3 Build-Depends: async, stm (>= 2.3)
CPP-Options: -DWITH_ASSISTANT CPP-Options: -DWITH_ASSISTANT
if flag(Android)
CPP-Options: -D__ANDROID__
if os(linux) && flag(Inotify) if os(linux) && flag(Inotify)
Build-Depends: hinotify Build-Depends: hinotify
CPP-Options: -DWITH_INOTIFY CPP-Options: -DWITH_INOTIFY
@ -105,22 +109,22 @@ Executable git-annex
Build-Depends: dbus (>= 0.10.3) Build-Depends: dbus (>= 0.10.3)
CPP-Options: -DWITH_DBUS CPP-Options: -DWITH_DBUS
if flag(Webapp) && flag(Assistant) if flag(Webapp)
Build-Depends: yesod, yesod-static, case-insensitive, Build-Depends: yesod, yesod-static, case-insensitive,
http-types, transformers, wai, wai-logger, warp, blaze-builder, http-types, transformers, wai, wai-logger, warp, blaze-builder,
crypto-api, hamlet, clientsession, aeson, yesod-form (>= 1.2.0), crypto-api, hamlet, clientsession, aeson, yesod-form,
template-haskell, yesod-default (>= 1.1.0), data-default template-haskell, yesod-default, data-default
CPP-Options: -DWITH_WEBAPP CPP-Options: -DWITH_WEBAPP
if flag(Pairing) && flag(Webapp) if flag(Pairing)
Build-Depends: network-multicast, network-info Build-Depends: network-multicast, network-info
CPP-Options: -DWITH_PAIRING CPP-Options: -DWITH_PAIRING
if flag(XMPP) && flag(Assistant) if flag(XMPP)
Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types
CPP-Options: -DWITH_XMPP CPP-Options: -DWITH_XMPP
if flag(XMPP) && flag(Assistant) && flag(DNS) if flag(DNS)
Build-Depends: dns Build-Depends: dns
CPP-Options: -DWITH_DNS CPP-Options: -DWITH_DNS