Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8c03984d82762d1391cad1a87fec5a9a566879d2 >--------------------------------------------------------------- commit 8c03984d82762d1391cad1a87fec5a9a566879d2 Author: Duncan Coutts <[email protected]> Date: Thu Mar 27 05:34:54 2008 +0000 Update to recent Cabal lib changes >--------------------------------------------------------------- cabal-install/Hackage/Config.hs | 7 ++++--- cabal-install/Hackage/Setup.hs | 13 +++++++------ cabal-install/Hackage/SrcDist.hs | 2 +- cabal-install/Main.hs | 8 ++++---- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/cabal-install/Hackage/Config.hs b/cabal-install/Hackage/Config.hs index 5966b71..4385ca5 100644 --- a/cabal-install/Hackage/Config.hs +++ b/cabal-install/Hackage/Config.hs @@ -34,7 +34,7 @@ import Distribution.Compiler (CompilerFlavor(..), defaultCompilerFlavor) import Distribution.PackageDescription.Parse (ParseResult(..)) import Distribution.ParseUtils ( FieldDescr(..), simpleField, listField, liftField, field - , parseFilePathQ, parseTokenQ ) + , parseFilePathQ, parseTokenQ, PWarning(..) ) import Distribution.Simple.Compiler (PackageDB(..)) import Distribution.Simple.InstallDirs ( InstallDirs(..), PathTemplate, toPathTemplate, fromPathTemplate ) @@ -131,7 +131,7 @@ defaultSavedConfig = return SavedConfig { configFlags = (defaultConfigFlags defaultProgramConfiguration){ ConfigFlags.configHcFlavor = toFlag defaultCompiler - , ConfigFlags.configVerbose = toFlag normal + , ConfigFlags.configVerbosity = toFlag normal , ConfigFlags.configUserInstall = toFlag True , ConfigFlags.configInstallDirs = error "ConfigFlags.installDirs: avoid this field. Use UserInstallDirs \ @@ -166,7 +166,8 @@ loadConfig verbosity configFile = Just inp -> case parseBasicStanza configFieldDescrs defaultConf inp of ParseOk ws conf -> do when (not $ null ws) $ - warn verbosity $ "Config file: " ++ unlines ws + warn verbosity $ "Config file: " + ++ unlines [ m | PWarning m <- ws ] return conf ParseFailed err -> do warn verbosity $ "Error parsing config file " diff --git a/cabal-install/Hackage/Setup.hs b/cabal-install/Hackage/Setup.hs index 89679b6..918bdc7 100644 --- a/cabal-install/Hackage/Setup.hs +++ b/cabal-install/Hackage/Setup.hs @@ -41,7 +41,8 @@ import qualified Distribution.Simple.Setup as Cabal RegisterFlags(..), emptyRegisterFlags, registerCommand, unregisterCommand, SDistFlags(..), emptySDistFlags, sdistCommand, testCommand-}) -import Distribution.Simple.Setup (Flag(..), toFlag, flagToList, trueArg, optionVerbose) +import Distribution.Simple.Setup + ( Flag(..), toFlag, flagToList, trueArg, optionVerbosity ) import Distribution.Verbosity (Verbosity, normal) import Hackage.Types (UnresolvedDependency(..), Username, Password) import Hackage.ParseUtils (readPToMaybe, parseDependencyOrPackageId) @@ -76,7 +77,7 @@ fetchCommand = CommandUI { commandDescription = Nothing, commandUsage = usagePackages "fetch", commandDefaultFlags = toFlag normal, - commandOptions = \_ -> [optionVerbose id const] + commandOptions = \_ -> [optionVerbosity id const] } updateCommand :: CommandUI (Flag Verbosity) @@ -86,7 +87,7 @@ updateCommand = CommandUI { commandDescription = Nothing, commandUsage = usagePackages "update", commandDefaultFlags = toFlag normal, - commandOptions = \_ -> [optionVerbose id const] + commandOptions = \_ -> [optionVerbosity id const] } upgradeCommand :: CommandUI (Cabal.ConfigFlags, InstallFlags) @@ -119,7 +120,7 @@ infoCommand = CommandUI { commandDescription = Nothing, commandUsage = usagePackages "info", commandDefaultFlags = toFlag normal, - commandOptions = \_ -> [optionVerbose id const] + commandOptions = \_ -> [optionVerbosity id const] } checkCommand :: CommandUI (Flag Verbosity) @@ -157,7 +158,7 @@ listCommand = CommandUI { commandUsage = usagePackages "list", commandDefaultFlags = defaultListFlags, commandOptions = \_ -> [ - optionVerbose listVerbosity (\v flags -> flags { listVerbosity = v }) + optionVerbosity listVerbosity (\v flags -> flags { listVerbosity = v }) , option [] ["installed"] "Only print installed packages" @@ -278,7 +279,7 @@ uploadCommand = CommandUI { ++ "Flags for upload:", commandDefaultFlags = defaultUploadFlags, commandOptions = \_ -> - [optionVerbose uploadVerbosity (\v flags -> flags { uploadVerbosity = v }) + [optionVerbosity uploadVerbosity (\v flags -> flags { uploadVerbosity = v }) ,option ['c'] ["check"] "Do not upload, just do QA checks." diff --git a/cabal-install/Hackage/SrcDist.hs b/cabal-install/Hackage/SrcDist.hs index 230b8a6..35dea29 100644 --- a/cabal-install/Hackage/SrcDist.hs +++ b/cabal-install/Hackage/SrcDist.hs @@ -61,7 +61,7 @@ sdist flags = do notice verbosity $ "Source tarball created: " ++ targzFile where - verbosity = fromFlag (sDistVerbose flags) + verbosity = fromFlag (sDistVerbosity flags) snapshot = fromFlag (sDistSnapshot flags) -- |Create an archive from a tree of source files, and clean up the tree. diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs index 2d95f3d..17bf8bb 100644 --- a/cabal-install/Main.hs +++ b/cabal-install/Main.hs @@ -105,7 +105,7 @@ mainWorker args = -- ,wrapperAction makefileCommand ] -wrapperAction :: CommandUI flags -> Command (IO ()) +wrapperAction :: Monoid flags => CommandUI flags -> Command (IO ()) wrapperAction command = commandAddAction command $ \flags extraArgs -> let args = commandName command : commandShowOptions command flags ++ extraArgs @@ -114,7 +114,7 @@ wrapperAction command = configureAction :: Cabal.ConfigFlags -> [String] -> IO () configureAction flags extraArgs = do configFile <- defaultConfigFile --FIXME - let verbosity = fromFlagOrDefault normal (Cabal.configVerbose flags) + let verbosity = fromFlagOrDefault normal (Cabal.configVerbosity flags) config <- loadConfig verbosity configFile let flags' = savedConfigToConfigFlags (Cabal.configUserInstall flags) config `mappend` flags @@ -126,7 +126,7 @@ installAction :: (Cabal.ConfigFlags, InstallFlags) -> [String] -> IO () installAction (cflags,iflags) extraArgs = do pkgs <- either die return (parsePackageArgs extraArgs) configFile <- defaultConfigFile --FIXME - let verbosity = fromFlagOrDefault normal (Cabal.configVerbose cflags) + let verbosity = fromFlagOrDefault normal (Cabal.configVerbosity cflags) config <- loadConfig verbosity configFile let cflags' = savedConfigToConfigFlags (Cabal.configUserInstall cflags) config `mappend` cflags @@ -160,7 +160,7 @@ updateAction verbosityFlag _extraArgs = do upgradeAction :: (Cabal.ConfigFlags, InstallFlags) -> [String] -> IO () upgradeAction (cflags,iflags) _extraArgs = do configFile <- defaultConfigFile --FIXME - let verbosity = fromFlagOrDefault normal (Cabal.configVerbose cflags) + let verbosity = fromFlagOrDefault normal (Cabal.configVerbosity cflags) config <- loadConfig verbosity configFile let cflags' = savedConfigToConfigFlags (Cabal.configUserInstall cflags) config `mappend` cflags _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
