diff options
| author | panne <unknown> | 2003-08-27 13:28:02 +0000 |
|---|---|---|
| committer | panne <unknown> | 2003-08-27 13:28:02 +0000 |
| commit | abbe696897340c5b27069ffe62032fe14ef789da (patch) | |
| tree | 93bd1fc4b63956fd1c16910f8c5bd0ef5f115174 | |
| parent | 8a45d6bb5426552fc6993fc4a1f391d0f3c77b8d (diff) | |
| download | haskell-abbe696897340c5b27069ffe62032fe14ef789da.tar.gz | |
[project @ 2003-08-27 13:28:01 by panne]
Added short option -V for long option --version
| -rw-r--r-- | ghc/compiler/main/DriverFlags.hs | 12 | ||||
| -rw-r--r-- | ghc/docs/users_guide/flags.sgml | 6 | ||||
| -rw-r--r-- | ghc/docs/users_guide/using.sgml | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs index 7d6680bc55..074ba9384a 100644 --- a/ghc/compiler/main/DriverFlags.hs +++ b/ghc/compiler/main/DriverFlags.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverFlags.hs,v 1.120 2003/08/20 15:07:56 simonmar Exp $ +-- $Id: DriverFlags.hs,v 1.121 2003/08/27 13:28:01 panne Exp $ -- -- Driver flags -- @@ -156,9 +156,8 @@ static_flags = , ( "-help" , NoArg showGhcUsage) , ( "-print-libdir" , NoArg (do getTopDir >>= putStrLn exitWith ExitSuccess)) - , ( "-version" , NoArg (do putStrLn (cProjectName - ++ ", version " ++ cProjectVersion) - exitWith ExitSuccess)) + , ( "V" , NoArg showVersion) + , ( "-version" , NoArg showVersion) , ( "-numeric-version", NoArg (do putStrLn cProjectVersion exitWith ExitSuccess)) @@ -647,3 +646,8 @@ setVerbosity n | otherwise = throwDyn (UsageError "can't parse verbosity flag (-v<n>)") addCmdlineHCInclude a = updDynFlags (\s -> s{cmdlineHcIncludes = a : cmdlineHcIncludes s}) + +showVersion :: IO () +showVersion = do + putStrLn (cProjectName ++ ", version " ++ cProjectVersion) + exitWith ExitSuccess diff --git a/ghc/docs/users_guide/flags.sgml b/ghc/docs/users_guide/flags.sgml index 40e46a2842..2f5a658b4a 100644 --- a/ghc/docs/users_guide/flags.sgml +++ b/ghc/docs/users_guide/flags.sgml @@ -45,6 +45,12 @@ <entry>-</entry> </row> <row> + <entry><option>-V</option></entry> + <entry>display GHC version</entry> + <entry>static</entry> + <entry>-</entry> + </row> + <row> <entry><option>––version</option></entry> <entry>display GHC version</entry> <entry>static</entry> diff --git a/ghc/docs/users_guide/using.sgml b/ghc/docs/users_guide/using.sgml index bf8f5b7082..bd36665ec0 100644 --- a/ghc/docs/users_guide/using.sgml +++ b/ghc/docs/users_guide/using.sgml @@ -341,7 +341,9 @@ module X where </varlistentry> <varlistentry> + <term><option>-V</option></term> <term><option>––version</option></term> + <indexterm><primary><option>-V</option></primary></indexterm> <indexterm><primary><option>––version</option></primary></indexterm> <listitem> <para>Print a one-line string including GHC's version number.</para> |