Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c9336b1b769b39012a0acce7bd41ab2e3a6f1e8b >--------------------------------------------------------------- commit c9336b1b769b39012a0acce7bd41ab2e3a6f1e8b Author: David Terei <[email protected]> Date: Fri Mar 23 10:06:24 2012 -0700 Clean of PackageConfig >--------------------------------------------------------------- compiler/main/PackageConfig.hs | 48 ++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs index 913e58c..d34d9e1 100644 --- a/compiler/main/PackageConfig.hs +++ b/compiler/main/PackageConfig.hs @@ -1,47 +1,42 @@ +-- | +-- Package configuration information: essentially the interface to Cabal, with +-- some utilities -- -- (c) The University of Glasgow, 2004 -- - --- | Package configuration information: essentially the interface to Cabal, with some utilities - -{-# OPTIONS -fno-warn-tabs #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and --- detab the module (please do the detabbing in a separate patch). See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces --- for details - module PackageConfig ( - -- $package_naming + -- $package_naming - -- * PackageId - mkPackageId, packageConfigId, + -- * PackageId + mkPackageId, packageConfigId, - -- * The PackageConfig type: information about a package - PackageConfig, - InstalledPackageInfo_(..), display, - Version(..), - PackageIdentifier(..), - defaultPackageConfig, + -- * The PackageConfig type: information about a package + PackageConfig, + InstalledPackageInfo_(..), display, + Version(..), + PackageIdentifier(..), + defaultPackageConfig, packageConfigToInstalledPackageInfo, - installedPackageInfoToPackageConfig, - ) where + installedPackageInfoToPackageConfig + ) where #include "HsVersions.h" -import Maybes -import Module import Distribution.InstalledPackageInfo import Distribution.ModuleName import Distribution.Package hiding (PackageId) import Distribution.Text import Distribution.Version +import Maybes +import Module + -- ----------------------------------------------------------------------------- --- Our PackageConfig type is just InstalledPackageInfo from Cabal. Later we +-- Our PackageConfig type is just InstalledPackageInfo from Cabal. Later we -- might need to extend it with some GHC-specific stuff, but for now it's fine. type PackageConfig = InstalledPackageInfo_ Module.ModuleName + defaultPackageConfig :: PackageConfig defaultPackageConfig = emptyInstalledPackageInfo @@ -51,9 +46,9 @@ defaultPackageConfig = emptyInstalledPackageInfo -- $package_naming -- #package_naming# -- Mostly the compiler deals in terms of 'PackageName's, which don't --- have the version suffix. This is so that we don't need to know the +-- have the version suffix. This is so that we don't need to know the -- version for the @-package-name@ flag, or know the versions of --- wired-in packages like @base@ & @rts@. Versions are confined to the +-- wired-in packages like @base@ & @rts@. Versions are confined to the -- package sub-system. -- -- This means that in theory you could have multiple base packages installed @@ -88,3 +83,4 @@ installedPackageInfoToPackageConfig hiddenModules = h })) = pkgconf{ exposedModules = map mkModuleName e, hiddenModules = map mkModuleName h } + _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
