optional build assistant and other small cabal refinings

This commit is contained in:
fftmp 2018-09-04 17:41:45 +03:00 committed by Joey Hess
parent f4788f3853
commit 5f8f83b884
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -416,12 +416,91 @@ Executable git-annex
Other-Modules: Other-Modules:
Remote.WebDAV Remote.WebDAV
Remote.WebDAV.DavLocation Remote.WebDAV.DavLocation
if flag(S3) || flag(WebDAV)
if flag(Assistant) && ! os(solaris) && ! os(gnu) Other-Modules:
Build-Depends: dns (>= 1.0.0), mountpoints Remote.Helper.Http
CPP-Options: -DWITH_ASSISTANT
if flag(Assistant) if flag(Assistant)
Build-Depends: mountpoints
CPP-Options: -DWITH_ASSISTANT
Other-Modules:
Assistant
Assistant.Alert
Assistant.Alert.Utility
Assistant.BranchChange
Assistant.Changes
Assistant.Commits
Assistant.Common
Assistant.CredPairCache
Assistant.DaemonStatus
Assistant.DeleteRemote
Assistant.Drop
Assistant.Fsck
Assistant.Gpg
Assistant.Install
Assistant.Install.AutoStart
Assistant.Install.Menu
Assistant.MakeRemote
Assistant.Monad
Assistant.NamedThread
Assistant.Pairing
Assistant.Pairing.MakeRemote
Assistant.Pairing.Network
Assistant.Pushes
Assistant.RemoteControl
Assistant.Repair
Assistant.RepoProblem
Assistant.Restart
Assistant.ScanRemotes
Assistant.Ssh
Assistant.Sync
Assistant.Threads.Committer
Assistant.Threads.ConfigMonitor
Assistant.Threads.Cronner
Assistant.Threads.DaemonStatus
Assistant.Threads.Exporter
Assistant.Threads.Glacier
Assistant.Threads.Merger
Assistant.Threads.MountWatcher
Assistant.Threads.NetWatcher
Assistant.Threads.ProblemFixer
Assistant.Threads.Pusher
Assistant.Threads.RemoteControl
Assistant.Threads.SanityChecker
Assistant.Threads.TransferPoller
Assistant.Threads.TransferScanner
Assistant.Threads.TransferWatcher
Assistant.Threads.Transferrer
Assistant.Threads.UpgradeWatcher
Assistant.Threads.Upgrader
Assistant.Threads.Watcher
Assistant.TransferQueue
Assistant.TransferSlots
Assistant.TransferrerPool
Assistant.Types.Alert
Assistant.Types.BranchChange
Assistant.Types.Changes
Assistant.Types.Commits
Assistant.Types.CredPairCache
Assistant.Types.DaemonStatus
Assistant.Types.NamedThread
Assistant.Types.Pushes
Assistant.Types.RemoteControl
Assistant.Types.RepoProblem
Assistant.Types.ScanRemotes
Assistant.Types.ThreadName
Assistant.Types.ThreadedMonad
Assistant.Types.TransferQueue
Assistant.Types.TransferSlots
Assistant.Types.TransferrerPool
Assistant.Types.UrlRenderer
Assistant.Unused
Assistant.Upgrade
Build.DesktopFile
Command.Assistant
Command.Watch
Utility.Mounts
if os(linux) || flag(Android) if os(linux) || flag(Android)
Build-Depends: hinotify Build-Depends: hinotify
CPP-Options: -DWITH_INOTIFY CPP-Options: -DWITH_INOTIFY
@ -430,7 +509,9 @@ Executable git-annex
if os(darwin) if os(darwin)
Build-Depends: hfsevents Build-Depends: hfsevents
CPP-Options: -DWITH_FSEVENTS CPP-Options: -DWITH_FSEVENTS
Other-Modules: Utility.DirWatcher.FSEvents Other-Modules:
Utility.DirWatcher.FSEvents
Utility.OSX
else else
if os(windows) if os(windows)
Build-Depends: Win32-notify Build-Depends: Win32-notify
@ -452,6 +533,8 @@ Executable git-annex
if flag(Android) if flag(Android)
Build-Depends: data-endian Build-Depends: data-endian
CPP-Options: -D__ANDROID__ -DANDROID_SPLICES -D__NO_TH__ CPP-Options: -D__ANDROID__ -DANDROID_SPLICES -D__NO_TH__
Other-Modules:
Utility.Android
else else
Build-Depends: disk-free-space Build-Depends: disk-free-space
@ -597,78 +680,6 @@ Executable git-annex
Annex.Wanted Annex.Wanted
Annex.WorkTree Annex.WorkTree
Annex.YoutubeDl Annex.YoutubeDl
Assistant
Assistant.Alert
Assistant.Alert.Utility
Assistant.BranchChange
Assistant.Changes
Assistant.Commits
Assistant.Common
Assistant.CredPairCache
Assistant.DaemonStatus
Assistant.DeleteRemote
Assistant.Drop
Assistant.Fsck
Assistant.Gpg
Assistant.Install
Assistant.Install.AutoStart
Assistant.Install.Menu
Assistant.MakeRemote
Assistant.Monad
Assistant.NamedThread
Assistant.Pairing
Assistant.Pairing.MakeRemote
Assistant.Pairing.Network
Assistant.Pushes
Assistant.RemoteControl
Assistant.Repair
Assistant.RepoProblem
Assistant.Restart
Assistant.ScanRemotes
Assistant.Ssh
Assistant.Sync
Assistant.Threads.Committer
Assistant.Threads.ConfigMonitor
Assistant.Threads.Cronner
Assistant.Threads.DaemonStatus
Assistant.Threads.Exporter
Assistant.Threads.Glacier
Assistant.Threads.Merger
Assistant.Threads.MountWatcher
Assistant.Threads.NetWatcher
Assistant.Threads.ProblemFixer
Assistant.Threads.Pusher
Assistant.Threads.RemoteControl
Assistant.Threads.SanityChecker
Assistant.Threads.TransferPoller
Assistant.Threads.TransferScanner
Assistant.Threads.TransferWatcher
Assistant.Threads.Transferrer
Assistant.Threads.UpgradeWatcher
Assistant.Threads.Upgrader
Assistant.Threads.Watcher
Assistant.TransferQueue
Assistant.TransferSlots
Assistant.TransferrerPool
Assistant.Types.Alert
Assistant.Types.BranchChange
Assistant.Types.Changes
Assistant.Types.Commits
Assistant.Types.CredPairCache
Assistant.Types.DaemonStatus
Assistant.Types.NamedThread
Assistant.Types.Pushes
Assistant.Types.RemoteControl
Assistant.Types.RepoProblem
Assistant.Types.ScanRemotes
Assistant.Types.ThreadName
Assistant.Types.ThreadedMonad
Assistant.Types.TransferQueue
Assistant.Types.TransferSlots
Assistant.Types.TransferrerPool
Assistant.Types.UrlRenderer
Assistant.Unused
Assistant.Upgrade
Backend Backend
Backend.Hash Backend.Hash
Backend.URL Backend.URL
@ -676,7 +687,6 @@ Executable git-annex
Backend.WORM Backend.WORM
Build.BundledPrograms Build.BundledPrograms
Build.Configure Build.Configure
Build.DesktopFile
Build.Mans Build.Mans
Build.TestConfig Build.TestConfig
Build.Version Build.Version
@ -700,7 +710,6 @@ Executable git-annex
Command.AddUnused Command.AddUnused
Command.AddUrl Command.AddUrl
Command.Adjust Command.Adjust
Command.Assistant
Command.CalcKey Command.CalcKey
Command.CheckPresentKey Command.CheckPresentKey
Command.Commit Command.Commit
@ -801,7 +810,6 @@ Executable git-annex
Command.Vicfg Command.Vicfg
Command.View Command.View
Command.Wanted Command.Wanted
Command.Watch
Command.Whereis Command.Whereis
Common Common
Config Config
@ -933,7 +941,6 @@ Executable git-annex
Remote.Helper.Export Remote.Helper.Export
Remote.Helper.Git Remote.Helper.Git
Remote.Helper.Hooks Remote.Helper.Hooks
Remote.Helper.Http
Remote.Helper.Messages Remote.Helper.Messages
Remote.Helper.P2P Remote.Helper.P2P
Remote.Helper.ReadOnly Remote.Helper.ReadOnly
@ -999,7 +1006,6 @@ Executable git-annex
Upgrade.V4 Upgrade.V4
Upgrade.V5 Upgrade.V5
Utility.Aeson Utility.Aeson
Utility.Android
Utility.Applicative Utility.Applicative
Utility.AuthToken Utility.AuthToken
Utility.Base64 Utility.Base64
@ -1050,10 +1056,8 @@ Executable git-annex
Utility.Metered Utility.Metered
Utility.Misc Utility.Misc
Utility.Monad Utility.Monad
Utility.Mounts
Utility.Network Utility.Network
Utility.NotificationBroadcaster Utility.NotificationBroadcaster
Utility.OSX
Utility.OptParse Utility.OptParse
Utility.PID Utility.PID
Utility.Parallel Utility.Parallel