Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Split cabal-install into library and executable components. #1162

Merged
merged 1 commit into from

2 participants

@23Skidoo
Collaborator

Makes it possible to write unit tests for code under Distribution.Client.*.

@23Skidoo 23Skidoo Split cabal-install into library and executable components.
Makes it possible to write unit tests for code under Distribution.Client.*.
b14a03f
@byorgey
Collaborator

This seems harmless enough to me, with the possible exception of requiring Cabal >= 1.8, though I can't imagine that is really a problem. Do we have a policy about how many versions back we can bootstrap?

@23Skidoo
Collaborator

@byorgey
Cabal.cabal itself requires Cabal >= 1.10.

@byorgey byorgey merged commit a9b2de3 into haskell:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 31, 2012
  1. @23Skidoo

    Split cabal-install into library and executable components.

    23Skidoo authored
    Makes it possible to write unit tests for code under Distribution.Client.*.
This page is out of date. Refresh to see the latest.
View
25 cabal-install/cabal-install.cabal
@@ -23,7 +23,7 @@ Copyright: 2005 Lemmih <lemmih@gmail.com>
Category: Distribution
Build-type: Simple
Extra-Source-Files: README bash-completion/cabal bootstrap.sh
-Cabal-Version: >= 1.6
+Cabal-Version: >= 1.8
source-repository head
type: git
@@ -36,16 +36,15 @@ flag old-base
flag bytestring-in-base
-Executable cabal
- Main-Is: Main.hs
- ghc-options: -Wall
+Library
+ ghc-options: -Wall
if !arch(arm)
ghc-options: -threaded
else
cc-options: -DCABAL_NO_THREADED
if impl(ghc >= 6.8)
ghc-options: -fwarn-tabs
- Other-Modules:
+ Exposed-Modules:
Distribution.Client.BuildReports.Anonymous
Distribution.Client.BuildReports.Storage
Distribution.Client.BuildReports.Types
@@ -113,8 +112,10 @@ Executable cabal
Distribution.Client.Win32SelfUpgrade
Distribution.Compat.Exception
Distribution.Compat.FilePerms
+ Distribution.Compat.Semaphore
Distribution.Compat.SetEnv
Distribution.Compat.Time
+ Other-Modules:
Paths_cabal_install
build-depends: base >= 2 && < 5,
@@ -150,3 +151,17 @@ Executable cabal
else
build-depends: unix >= 1.0 && < 2.7
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
View
0  cabal-install/Main.hs → cabal-install/src/Main.hs
File renamed without changes
Something went wrong with that request. Please try again.