From f300abd65061cdc2cc1db685570fefa958b06679 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 14 Nov 2007 15:34:17 +0000 Subject: [PATCH] remove --define-name from the --help usage message (#1596) --- utils/ghc-pkg/Main.hs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index 996cd62..e0bae2f 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -62,7 +62,7 @@ main :: IO () main = do args <- getArgs - case getOpt Permute flags args of + case getOpt Permute (flags ++ deprecFlags) args of (cli,_,[]) | FlagHelp `elem` cli -> do prog <- getProgramName bye (usageInfo (usageHeader prog) flags) @@ -120,8 +120,6 @@ flags = [ "automatically build libs for GHCi (with register)", Option ['?'] ["help"] (NoArg FlagHelp) "display this help and exit", - Option ['D'] ["define-name"] (ReqArg toDefined "NAME=VALUE") - "define NAME as VALUE", Option ['V'] ["version"] (NoArg FlagVersion) "output version information and exit", Option [] ["simple-output"] (NoArg FlagSimpleOutput) @@ -129,7 +127,13 @@ flags = [ Option [] ["names-only"] (NoArg FlagNamesOnly) "only print package names, not versions; can only be used with list --simple-output" ] - where + +deprecFlags :: [OptDescr Flag] +deprecFlags = [ + Option ['D'] ["define-name"] (ReqArg toDefined "NAME=VALUE") + "define NAME as VALUE" + ] + where toDefined str = case break (=='=') str of (nm,[]) -> FlagDefinedName nm [] -- 1.7.10.4