Commit b14a03f9 authored by refold's avatar refold
Browse files

Split cabal-install into library and executable components.

Makes it possible to write unit tests for code under Distribution.Client.*.
parent c833d64a
...@@ -23,7 +23,7 @@ Copyright: 2005 Lemmih <lemmih@gmail.com> ...@@ -23,7 +23,7 @@ Copyright: 2005 Lemmih <lemmih@gmail.com>
Category: Distribution Category: Distribution
Build-type: Simple Build-type: Simple
Extra-Source-Files: README bash-completion/cabal bootstrap.sh Extra-Source-Files: README bash-completion/cabal bootstrap.sh
Cabal-Version: >= 1.6 Cabal-Version: >= 1.8
source-repository head source-repository head
type: git type: git
...@@ -36,16 +36,15 @@ flag old-base ...@@ -36,16 +36,15 @@ flag old-base
flag bytestring-in-base flag bytestring-in-base
Executable cabal Library
Main-Is: Main.hs ghc-options: -Wall
ghc-options: -Wall
if !arch(arm) if !arch(arm)
ghc-options: -threaded ghc-options: -threaded
else else
cc-options: -DCABAL_NO_THREADED cc-options: -DCABAL_NO_THREADED
if impl(ghc >= 6.8) if impl(ghc >= 6.8)
ghc-options: -fwarn-tabs ghc-options: -fwarn-tabs
Other-Modules: Exposed-Modules:
Distribution.Client.BuildReports.Anonymous Distribution.Client.BuildReports.Anonymous
Distribution.Client.BuildReports.Storage Distribution.Client.BuildReports.Storage
Distribution.Client.BuildReports.Types Distribution.Client.BuildReports.Types
...@@ -113,8 +112,10 @@ Executable cabal ...@@ -113,8 +112,10 @@ Executable cabal
Distribution.Client.Win32SelfUpgrade Distribution.Client.Win32SelfUpgrade
Distribution.Compat.Exception Distribution.Compat.Exception
Distribution.Compat.FilePerms Distribution.Compat.FilePerms
Distribution.Compat.Semaphore
Distribution.Compat.SetEnv Distribution.Compat.SetEnv
Distribution.Compat.Time Distribution.Compat.Time
Other-Modules:
Paths_cabal_install Paths_cabal_install
build-depends: base >= 2 && < 5, build-depends: base >= 2 && < 5,
...@@ -150,3 +151,17 @@ Executable cabal ...@@ -150,3 +151,17 @@ Executable cabal
else else
build-depends: unix >= 1.0 && < 2.7 build-depends: unix >= 1.0 && < 2.7
c-sources: cbits/getnumcores.c c-sources: cbits/getnumcores.c
Executable cabal
Main-Is: Main.hs
hs-source-dirs: src
ghc-options: -Wall
build-depends: base >= 2 && < 5,
Cabal >= 1.17.0 && < 1.18,
cabal-install >= 1.17.0 && < 1.18,
filepath >= 1.0 && < 1.4
if flag(old-base)
build-depends: base < 3
else
build-depends: base >= 3,
directory >= 1 && < 1.3
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment