Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/39dd439122441e95d72129af3300276b54364707 >--------------------------------------------------------------- commit 39dd439122441e95d72129af3300276b54364707 Author: bjorn <[email protected]> Date: Sat Oct 6 10:25:25 2007 +0000 Remove the unused configRunHc. >--------------------------------------------------------------- .../src/Network/Hackage/CabalInstall/Configure.hs | 11 ++++------- .../src/Network/Hackage/CabalInstall/Install.hs | 3 +-- .../src/Network/Hackage/CabalInstall/Setup.hs | 1 - .../src/Network/Hackage/CabalInstall/Types.hs | 2 -- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Configure.hs b/cabal-install/src/Network/Hackage/CabalInstall/Configure.hs index f8b1ba5..fc942b0 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Configure.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Configure.hs @@ -108,12 +108,10 @@ localPrefix mkConfigFlags :: TempFlags -> IO ConfigFlags mkConfigFlags cfg = do let verbosity = tempVerbose cfg - conf = userMaybeSpecifyPath "runhaskell" (tempRunHc cfg) $ - userMaybeSpecifyPath "tar" (tempTarPath cfg) $ + conf = userMaybeSpecifyPath "tar" (tempTarPath cfg) $ defaultProgramConfiguration - (runHc, conf') <- requireProgram verbosity runhaskellProgram AnyVersion conf - (tarProg, conf'') <- requireProgram verbosity tarProgram AnyVersion conf' - (comp, conf''') <- Configure.configCompiler (tempHcFlavor cfg) (tempHcPath cfg) (tempHcPkg cfg) conf'' verbosity + (tarProg, conf') <- requireProgram verbosity tarProgram AnyVersion conf + (comp, conf'') <- Configure.configCompiler (tempHcFlavor cfg) (tempHcPath cfg) (tempHcPkg cfg) conf' verbosity let userIns = tempUserIns cfg prefix <- if userIns then fmap Just (maybe localPrefix return (tempPrefix cfg)) @@ -130,13 +128,12 @@ mkConfigFlags cfg outputGen <- defaultOutputGen (tempVerbose cfg) let config = ConfigFlags { configCompiler = comp - , configPrograms = conf''' + , configPrograms = conf'' , configConfDir = confDir , configCacheDir = cacheDir , configPrefix = prefix , configServers = [] , configTarPath = programPath tarProg - , configRunHc = programPath runHc , configOutputGen = outputGen , configVerbose = tempVerbose cfg -- , configUpgradeDeps = tempUpgradeDeps cfg diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Install.hs b/cabal-install/src/Network/Hackage/CabalInstall/Install.hs index bfb06a2..954317f 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Install.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Install.hs @@ -113,8 +113,7 @@ installPkg cfg globalArgs (pkg,ops,repo) extractTarFile tarProg tmpPkgPath installUnpackedPkg cfg pkg tmpPkgPath setup return ()) - where runHc = configRunHc cfg - tarProg = configTarPath cfg + where tarProg = configTarPath cfg output = configOutputGen cfg installUnpackedPkg :: ConfigFlags -> PackageIdentifier -> FilePath diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs b/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs index cc5cdbf..5561d35 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Setup.hs @@ -38,7 +38,6 @@ emptyTempFlags = TempFlags { tempCacheDir = Nothing, tempHcPkg = Nothing, tempPrefix = Nothing, - tempRunHc = Nothing, tempTarPath = Nothing, tempVerbose = normal, -- tempUpgradeDeps = False, diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Types.hs b/cabal-install/src/Network/Hackage/CabalInstall/Types.hs index 2616abe..14e0036 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Types.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Types.hs @@ -47,7 +47,6 @@ data TempFlags = TempFlags { tempHcPkg :: Maybe FilePath, -- ^given hc-pkg location tempPrefix :: Maybe FilePath, tempTarPath :: Maybe FilePath, - tempRunHc :: Maybe FilePath, tempVerbose :: Verbosity, -- ^verbosity level -- tempUpgradeDeps :: Bool, tempUserIns :: Bool, -- ^--user-install flag @@ -62,7 +61,6 @@ data ConfigFlags = ConfigFlags { configPrefix :: Maybe FilePath, configServers :: [Repo], -- ^Available Hackage servers. configTarPath :: FilePath, - configRunHc :: FilePath, configOutputGen :: OutputGen, configVerbose :: Verbosity, -- configUpgradeDeps :: Bool, _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
