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

remove XMPP, DBus, DesktopNotify build flags

Browse source 
Make these features solely dependent on the OS being built on.

This lets stack build on windows w/o XMPP, on OSX w/o DBUS,
and on Linux with everything.
This commit is contained in:
Joey Hess 2015-12-28 14:38:58 -04:00
parent d7b6d7e157
commit 664208d19f
Failed to extract signature
2 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
git-annex.cabal
View file

@ -40,9 +40,6 @@ Flag WebDAV
Flag Inotify Flag Inotify
Description: Enable inotify support Description: Enable inotify support
Flag Dbus
Description: Enable dbus support
Flag Assistant Flag Assistant
Description: Enable git-annex assistant and watch command Description: Enable git-annex assistant and watch command
@ -55,9 +52,6 @@ Flag Webapp-secure
Flag Pairing Flag Pairing
Description: Enable pairing Description: Enable pairing
Flag XMPP
Description: Enable notifications using XMPP
Flag DNS Flag DNS
Description: Enable the haskell DNS library for DNS lookup Description: Enable the haskell DNS library for DNS lookup
@ -87,9 +81,6 @@ Flag Quvi
Flag Tahoe Flag Tahoe
Description: Enable the tahoe special remote Description: Enable the tahoe special remote
Flag DesktopNotify
Description: Enable desktop environment notifications
Flag TorrentParser Flag TorrentParser
Description: Use haskell torrent library to parse torrent files Description: Use haskell torrent library to parse torrent files
@ -207,14 +198,8 @@ Executable git-annex
C-Sources: Utility/libkqueue.c C-Sources: Utility/libkqueue.c
if (os(linux)) if (os(linux))
if flag(Dbus) Build-Depends: dbus (>= 0.10.7), fdo-notify (>= 0.3)
Build-Depends: dbus (>= 0.10.7) CPP-Options: -DWITH_DBUS -DWITH_DESKTOP_NOTIFY -DWITH_DBUS_NOTIFICATIONS
CPP-Options: -DWITH_DBUS
if flag(DesktopNotify)
if flag(Dbus)
Build-Depends: dbus (>= 0.10.3), fdo-notify (>= 0.3)
CPP-Options: -DWITH_DESKTOP_NOTIFY -DWITH_DBUS_NOTIFICATIONS
if flag(Android) if flag(Android)
Build-Depends: data-endian Build-Depends: data-endian
@ -246,7 +231,7 @@ Executable git-annex
Build-Depends: network-multicast, network-info Build-Depends: network-multicast, network-info
CPP-Options: -DWITH_PAIRING CPP-Options: -DWITH_PAIRING
if flag(XMPP) && (! os(windows)) if (! os(windows))
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

12
stack.yaml
View file

@ -1,31 +1,29 @@
flags: flags:
git-annex: git-annex:
concurrentoutput: false concurrentoutput: true
tahoe: true tahoe: true
tdfa: true tdfa: true
inotify: true inotify: true
feed: true feed: true
webapp-secure: true webapp-secure: true
production: true production: true
ekg: false
assistant: true assistant: true
pairing: true pairing: true
cryptonite: true cryptonite: true
xmpp: true
network-uri: true network-uri: true
s3: true s3: true
dbus: false
testsuite: true testsuite: true
webdav: true webdav: true
torrentparser: true torrentparser: true
android: false
androidsplice: false
quvi: true quvi: true
dns: true dns: true
desktopnotify: true
webapp: true webapp: true
android: false
androidsplice: false
ekg: false
packages: packages:
- '.' - '.'
extra-deps: extra-deps:
- Win32-extras-0.2.0.1 - Win32-extras-0.2.0.1
- concurrent-output
resolver: nightly-2015-12-28 resolver: nightly-2015-12-28