[commit: Cabal] master: Remove the prefernece and cabal lib version flags from the InstallFlags (faefedc)

[Ian Lynagh]

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

On branch  : master

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

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

commit faefedc2f389e4a97d03ce14230cc7ec9708bb57
Author: Duncan Coutts <duncan at haskell.org>
Date:   Mon Jan 26 01:24:12 2009 +0000

    Remove the prefernece and cabal lib version flags from the InstallFlags
    They are now in the ConfigExFlags instead.

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

 cabal-install/Distribution/Client/Setup.hs |   31 +++------------------------
 1 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
index 87be689..4bd2510 100644
--- a/cabal-install/Distribution/Client/Setup.hs
+++ b/cabal-install/Distribution/Client/Setup.hs
@@ -459,11 +459,9 @@ data InstallFlags = InstallFlags {
     installReinstall    :: Flag Bool,
     installOnly         :: Flag Bool,
     installRootCmd      :: Flag String,
-    installCabalVersion :: Flag Version,
     installLogFile      :: Flag FilePath,
     installBuildReports :: Flag Bool,
-    installSymlinkBinDir:: Flag FilePath,
-    installPreferences  :: [Dependency]
+    installSymlinkBinDir:: Flag FilePath
   }
 
 defaultInstallFlags :: InstallFlags
@@ -473,11 +471,9 @@ defaultInstallFlags = InstallFlags {
     installReinstall    = Flag False,
     installOnly         = Flag False,
     installRootCmd      = mempty,
-    installCabalVersion = mempty,
     installLogFile      = mempty,
     installBuildReports = Flag False,
-    installSymlinkBinDir= mempty,
-    installPreferences  = mempty
+    installSymlinkBinDir= mempty
   }
 
 installCommand :: CommandUI (ConfigFlags, ConfigExFlags, InstallFlags)
@@ -537,14 +533,6 @@ installOptions showOrParseArgs =
            installSymlinkBinDir (\v flags -> flags { installSymlinkBinDir = v })
            (reqArgFlag "DIR")
 
-      , option [] ["cabal-lib-version"]
-          ("Select which version of the Cabal lib to use to build packages "
-          ++ "(useful for testing).")
-          installCabalVersion (\v flags -> flags { installCabalVersion = v })
-          (reqArg "VERSION" (readP_to_E ("Cannot parse cabal lib version: "++)
-                                        (fmap toFlag parse))
-                            (map display . flagToList))
-
       , option [] ["log-builds"]
           "Log all builds to file (name template can use $pkgid, $compiler, $os, $arch)"
           installLogFile (\v flags -> flags { installLogFile = v })
@@ -555,13 +543,6 @@ installOptions showOrParseArgs =
           installBuildReports (\v flags -> flags { installBuildReports = v })
           trueArg
 
-      , option [] ["preference"]
-          "Specify preferences (soft constraints) on the version of a package"
-          installPreferences (\v flags -> flags { installPreferences = v })
-          (reqArg "DEPENDENCY"
-            (readP_to_E (const "dependency expected") ((\x -> [x]) `fmap` parse))
-                                            (map (\x -> display x)))
-
       ] ++ case showOrParseArgs of      -- TODO: remove when "cabal install" avoids
           ParseArgs ->
             option [] ["only"]
@@ -578,11 +559,9 @@ instance Monoid InstallFlags where
     installReinstall    = mempty,
     installOnly         = mempty,
     installRootCmd      = mempty,
-    installCabalVersion = mempty,
     installLogFile      = mempty,
     installBuildReports = mempty,
-    installSymlinkBinDir= mempty,
-    installPreferences  = mempty
+    installSymlinkBinDir= mempty
   }
   mappend a b = InstallFlags {
     installDocumentation= combine installDocumentation,
@@ -590,11 +569,9 @@ instance Monoid InstallFlags where
     installReinstall    = combine installReinstall,
     installOnly         = combine installOnly,
     installRootCmd      = combine installRootCmd,
-    installCabalVersion = combine installCabalVersion,
     installLogFile      = combine installLogFile,
     installBuildReports = combine installBuildReports,
-    installSymlinkBinDir= combine installSymlinkBinDir,
-    installPreferences  = combine installPreferences
+    installSymlinkBinDir= combine installSymlinkBinDir
   }
     where combine field = field a `mappend` field b