[commit: Cabal] master: started the solver interface conversion (c6390e0)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c6390e0efefa213dfadb697bfe945fec6571ec7e

>---------------------------------------------------------------

commit c6390e0efefa213dfadb697bfe945fec6571ec7e
Author: Andres Loeh <andres at well-typed.com>
Date:   Sun Jun 5 12:52:21 2011 +0000

    started the solver interface conversion

>---------------------------------------------------------------

 cabal-install/Distribution/Client/Dependency.hs    |    3 +-
 .../Distribution/Client/Dependency/Modular.hs      |   22 +++++++++++++++++--
 cabal-install/cabal-install.cabal                  |    1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/Distribution/Client/Dependency.hs
index 6887748..d6f6fce 100644
--- a/cabal-install/Distribution/Client/Dependency.hs
+++ b/cabal-install/Distribution/Client/Dependency.hs
@@ -48,8 +48,7 @@ module Distribution.Client.Dependency (
   ) where
 
 import Distribution.Client.Dependency.TopDown (topDownResolver)
-import Distribution.Client.Dependency.Modular.IndexConversion ()
-import Distribution.Client.Dependency.Modular.Solver ()
+import Distribution.Client.Dependency.Modular ()
 import qualified Distribution.Client.PackageIndex as PackageIndex
 import Distribution.Client.PackageIndex (PackageIndex)
 import qualified Distribution.Client.InstallPlan as InstallPlan
diff --git a/cabal-install/Distribution/Client/Dependency/Modular.hs b/cabal-install/Distribution/Client/Dependency/Modular.hs
index e2a30fd..657d25e 100644
--- a/cabal-install/Distribution/Client/Dependency/Modular.hs
+++ b/cabal-install/Distribution/Client/Dependency/Modular.hs
@@ -8,11 +8,27 @@ module Distribution.Client.Dependency.Modular where
 -- and finally, we have to convert back the resulting install
 -- plan.
 
-import Distribution.Client.Dependency.Types
-
 import Distribution.Client.Dependency.Modular.IndexConversion
+         ( convPIs )
+import Distribution.Client.Dependency.Modular.Log
+         ( logToProgress )
 import Distribution.Client.Dependency.Modular.Solver
+         ( defaultSolver )
+import Distribution.Client.Dependency.Types
+         ( DependencyResolver )
+import Distribution.System
+         ( Platform(..) )
 
 modularSolver :: DependencyResolver
 modularSolver (Platform arch os) cid iidx sidx pprefs pcs pns =
-  undefined
+  fmap undefined $ -- convert install plan
+  logToProgress $
+  defaultSolver idx gprefs uprefs goals gcs gfcs lfcs
+    where
+      idx    = convPIs os arch cid undefined sidx
+      gprefs = undefined
+      uprefs = undefined
+      goals  = undefined
+      gcs    = undefined
+      gfcs   = undefined
+      lfcs   = undefined
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 0dcac2e..0a44b69 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -54,6 +54,7 @@ Executable cabal
         Distribution.Client.Dependency.TopDown.Constraints
         Distribution.Client.Dependency.TopDown.Types
         Distribution.Client.Dependency.Types
+        Distribution.Client.Dependency.Modular
         Distribution.Client.Dependency.Modular.Assignment
         Distribution.Client.Dependency.Modular.Builder
         Distribution.Client.Dependency.Modular.Configured