summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2420c55)
cleanups; print the full version number of the building compiler
(inc. the patchlevel) in verbose mode.
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.112 2000/11/08 13:51:16 simonmar Exp $
+# $Id: Makefile,v 1.113 2000/11/10 14:29:20 simonmar Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
TOP = ..
include $(TOP)/mk/boilerplate.mk
@echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS)
@echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS)
@echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS)
@echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS)
+ @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
@echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
@echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
@echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
@echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
@echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.16 2000/11/08 16:24:34 simonmar Exp $
+-- $Id: DriverFlags.hs,v 1.17 2000/11/10 14:29:21 simonmar Exp $
------- version ----------------------------------------------------
, ( "-version" , NoArg (do hPutStrLn stdout (cProjectName
------- version ----------------------------------------------------
, ( "-version" , NoArg (do hPutStrLn stdout (cProjectName
- ++ ", version " ++ version_str)
+ ++ ", version " ++ cProjectVersion)
- , ( "-numeric-version", NoArg (do hPutStrLn stdout version_str
+ , ( "-numeric-version", NoArg (do hPutStrLn stdout cProjectVersion
exitWith ExitSuccess))
------- verbosity ----------------------------------------------------
exitWith ExitSuccess))
------- verbosity ----------------------------------------------------
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
--- $Id: DriverUtil.hs,v 1.5 2000/10/27 13:50:25 sewardj Exp $
+-- $Id: DriverUtil.hs,v 1.6 2000/11/10 14:29:21 simonmar Exp $
--
-- Utils for the driver
--
--
-- Utils for the driver
--
dump ('$':'$':s) = hPutStr stderr get_prog_name >> dump s
dump (c:s) = hPutChar stderr c >> dump s
dump ('$':'$':s) = hPutStr stderr get_prog_name >> dump s
dump (c:s) = hPutChar stderr c >> dump s
-version_str = cProjectVersion
-
data BarfKind
= PhaseFailed String ExitCode
| Interrupted
data BarfKind
= PhaseFailed String ExitCode
| Interrupted
remove_spaces :: String -> String
remove_spaces = reverse . dropWhile isSpace . reverse . dropWhile isSpace
remove_spaces :: String -> String
remove_spaces = reverse . dropWhile isSpace . reverse . dropWhile isSpace
-
-booter_version
- = case "\
- \ __GLASGOW_HASKELL__" of
- ' ':n:ns -> n:'.':ns
- ' ':m -> m
-
{-# OPTIONS -W -fno-warn-incomplete-patterns #-}
-----------------------------------------------------------------------------
{-# OPTIONS -W -fno-warn-incomplete-patterns #-}
-----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.18 2000/11/08 15:25:25 simonmar Exp $
+-- $Id: Main.hs,v 1.19 2000/11/10 14:29:21 simonmar Exp $
--
-- GHC Driver program
--
--
-- GHC Driver program
--
verb <- readIORef v_Verbose
when verb (do hPutStr stderr "Glasgow Haskell Compiler, Version "
verb <- readIORef v_Verbose
when verb (do hPutStr stderr "Glasgow Haskell Compiler, Version "
- hPutStr stderr version_str
+ hPutStr stderr cProjectVersion
hPutStr stderr ", for Haskell 98, compiled by GHC version "
hPutStr stderr ", for Haskell 98, compiled by GHC version "
- hPutStrLn stderr booter_version)
+ hPutStrLn stderr cBooterVersion)
when verb (hPutStrLn stderr ("Using package config file: " ++ conf_file))
when verb (hPutStrLn stderr ("Using package config file: " ++ conf_file))