Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a8b1ffac81c62ce1f5e90ffe4c72712e2fa8c1ae >--------------------------------------------------------------- commit a8b1ffac81c62ce1f5e90ffe4c72712e2fa8c1ae Author: Duncan Coutts <[email protected]> Date: Tue Aug 12 16:11:53 2008 +0000 Use a more specific type in one place in SetupWrapper It doesn't need access to the whole Packagedescription, it only needs the the PackageIdentifier. >--------------------------------------------------------------- cabal-install/Distribution/Client/SetupWrapper.hs | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs index d6670d3..279c5ba 100644 --- a/cabal-install/Distribution/Client/SetupWrapper.hs +++ b/cabal-install/Distribution/Client/SetupWrapper.hs @@ -25,7 +25,8 @@ import qualified Distribution.Simple as Simple import Distribution.Version ( Version(..), VersionRange(..), withinRange ) import Distribution.Package - ( PackageIdentifier(..), packageName, packageVersion, Dependency(..) ) + ( PackageIdentifier(..), Package(..), packageName, packageVersion + , Dependency(..) ) import Distribution.PackageDescription ( GenericPackageDescription(packageDescription) , PackageDescription(..), BuildType(..), readPackageDescription ) @@ -107,7 +108,7 @@ setupWrapper verbosity options mpkg cmd flags extraArgs = do mkArgs cabalLibVersion = commandName cmd : commandShowOptions cmd (flags cabalLibVersion) ++ extraArgs - setupMethod verbosity options pkg buildType' mkArgs + setupMethod verbosity options (packageId pkg) buildType' mkArgs where getPkg = findPackageDesc (fromMaybe "." (useWorkingDir options)) >>= readPackageDescription verbosity @@ -127,7 +128,7 @@ determineSetupMethod options buildType' type SetupMethod = Verbosity -> SetupScriptOptions - -> PackageDescription + -> PackageIdentifier -> BuildType -> (Version -> [String]) -> IO () _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
