Skip to content
Snippets Groups Projects
Commit c293adda authored by Dmitrii Kovanikov's avatar Dmitrii Kovanikov Committed by Herbert Valerio Riedel
Browse files

Update messages for old-install

parent ebff125d
No related branches found
No related tags found
No related merge requests found
...@@ -160,7 +160,7 @@ import Distribution.Simple.Utils as Utils ...@@ -160,7 +160,7 @@ import Distribution.Simple.Utils as Utils
, withTempDirectory ) , withTempDirectory )
import Distribution.Client.Utils import Distribution.Client.Utils
( determineNumJobs, logDirChange, mergeBy, MergeResult(..) ( determineNumJobs, logDirChange, mergeBy, MergeResult(..)
, tryCanonicalizePath ) , tryCanonicalizePath, ProgressPhase(..), progressMessage )
import Distribution.System import Distribution.System
( Platform, OS(Windows), buildOS, buildPlatform ) ( Platform, OS(Windows), buildOS, buildPlatform )
import Distribution.Text import Distribution.Text
...@@ -1197,7 +1197,7 @@ executeInstallPlan verbosity jobCtl keepGoing useLogFile plan0 installPkg = ...@@ -1197,7 +1197,7 @@ executeInstallPlan verbosity jobCtl keepGoing useLogFile plan0 installPkg =
-- otherwise. -- otherwise.
printBuildResult :: PackageId -> UnitId -> BuildOutcome -> IO () printBuildResult :: PackageId -> UnitId -> BuildOutcome -> IO ()
printBuildResult pkgid uid buildOutcome = case buildOutcome of printBuildResult pkgid uid buildOutcome = case buildOutcome of
(Right _) -> notice verbosity $ "Installed " ++ display pkgid (Right _) -> progressMessage verbosity ProgressCompleted (display pkgid)
(Left _) -> do (Left _) -> do
notice verbosity $ "Failed to install " ++ display pkgid notice verbosity $ "Failed to install " ++ display pkgid
when (verbosity >= normal) $ when (verbosity >= normal) $
...@@ -1398,14 +1398,12 @@ installUnpackedPackage verbosity installLock numJobs ...@@ -1398,14 +1398,12 @@ installUnpackedPackage verbosity installLock numJobs
logDirChange (maybe (const (return ())) appendFile mLogPath) workingDir $ do logDirChange (maybe (const (return ())) appendFile mLogPath) workingDir $ do
-- Configure phase -- Configure phase
onFailure ConfigureFailed $ do onFailure ConfigureFailed $ do
when (numJobs > 1) $ notice verbosity $ noticeProgress ProgressStarting
"Configuring " ++ display pkgid ++ "..."
setup configureCommand configureFlags mLogPath setup configureCommand configureFlags mLogPath
-- Build phase -- Build phase
onFailure BuildFailed $ do onFailure BuildFailed $ do
when (numJobs > 1) $ notice verbosity $ noticeProgress ProgressBuilding
"Building " ++ display pkgid ++ "..."
setup buildCommand' buildFlags mLogPath setup buildCommand' buildFlags mLogPath
-- Doc generation phase -- Doc generation phase
...@@ -1452,6 +1450,12 @@ installUnpackedPackage verbosity installLock numJobs ...@@ -1452,6 +1450,12 @@ installUnpackedPackage verbosity installLock numJobs
uid = installedUnitId rpkg uid = installedUnitId rpkg
cinfo = compilerInfo comp cinfo = compilerInfo comp
buildCommand' = buildCommand progdb buildCommand' = buildCommand progdb
dispname = display pkgid
isParallelBuild = numJobs >= 2
noticeProgress phase = when isParallelBuild $
progressMessage verbosity phase dispname
buildFlags _ = emptyBuildFlags { buildFlags _ = emptyBuildFlags {
buildDistPref = configDistPref configFlags, buildDistPref = configDistPref configFlags,
buildVerbosity = toFlag verbosity' buildVerbosity = toFlag verbosity'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment