[commit: ghc] wip/nfs-locking: Make Brief the default setting of the --progress-info flag (10b8358)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/10b8358882867ebfef0a48b9ba28d08fcf37eedb/ghc

>---------------------------------------------------------------

commit 10b8358882867ebfef0a48b9ba28d08fcf37eedb
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Oct 11 00:03:56 2017 +0100

    Make Brief the default setting of the --progress-info flag
    
    See #428


>---------------------------------------------------------------

10b8358882867ebfef0a48b9ba28d08fcf37eedb
 .travis.yml              | 6 +++---
 README.md                | 4 ++--
 appveyor.yml             | 2 +-
 circle.yml               | 2 +-
 src/CommandLine.hs       | 2 +-
 src/Hadrian/Utilities.hs | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 203ee82..e14f962 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ matrix:
               - ./build.cabal.sh selftest
 
               # Build GHC
-              - ./build.cabal.sh -j $MODE --no-progress --progress-colour=never --progress-info=brief --profile=-
+              - ./build.cabal.sh -j $MODE --no-progress --progress-colour=never --profile=-
 
         - os: linux
           env: MODE="--flavour=quickest --integer-simple"
@@ -40,7 +40,7 @@ matrix:
 
           script:
               # Build GHC
-              - ./build.cabal.sh -j $MODE --no-progress --progress-colour=never --progress-info=brief --profile=-
+              - ./build.cabal.sh -j $MODE --no-progress --progress-colour=never --profile=-
 
               # Test GHC binary
               - cd ..
@@ -56,7 +56,7 @@ matrix:
           script:
               # Due to timeout limit of OS X build on Travis CI,
               # we will ignore selftest and build only stage1
-              - ./build.cabal.sh -j $MODE --no-progress --progress-colour=never --progress-info=brief --profile=-
+              - ./build.cabal.sh -j $MODE --no-progress --progress-colour=never --profile=-
 
 install:
     # Add Cabal to PATH
diff --git a/README.md b/README.md
index 9eb759e..2530714 100644
--- a/README.md
+++ b/README.md
@@ -75,8 +75,8 @@ whether the console supports colours; this is the default setting), and `always`
 colours).
 
 * `--progress-info=STYLE`: choose how build progress info is printed. There are four
-settings: `none`, `brief` (one line per build command), `normal` (typically a box per
-build command; this is the default setting), and `unicorn` (when `normal` just won't do).
+settings: `none`, `brief` (one line per build command; this is the default setting),
+`normal` (typically a box per build command), and `unicorn` (when `normal` just won't do).
 
 * `--skip-configure`: use this flag to suppress the default behaviour of Hadrian that
 runs the `boot` and `configure` scripts automatically if need be, so that you don't have
diff --git a/appveyor.yml b/appveyor.yml
index c51983a..2f4653a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,7 +33,7 @@ build_script:
     - stack exec hadrian -- --directory ".." selftest
 
     # Build GHC
-    - stack exec hadrian -- --lint --directory ".." -j --flavour=quickest --no-progress --progress-info=brief --progress-colour=never --profile=-
+    - stack exec hadrian -- --lint --directory ".." -j --flavour=quickest --no-progress --progress-colour=never --profile=-
 
     # Test GHC binary
     - cd ..
diff --git a/circle.yml b/circle.yml
index 93cf47f..48653e8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,7 +33,7 @@ compile:
     - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.cabal.sh selftest
 
     # Build GHC
-    - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.cabal.sh -j $MODE --no-progress --progress-colour=never --progress-info=brief --profile=-
+    - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.cabal.sh -j $MODE --no-progress --progress-colour=never --profile=-
 
 test:
   override:
diff --git a/src/CommandLine.hs b/src/CommandLine.hs
index ed6441c..978a420 100644
--- a/src/CommandLine.hs
+++ b/src/CommandLine.hs
@@ -34,7 +34,7 @@ defaultCommandLineArgs = CommandLineArgs
     , installDestDir = Nothing
     , integerSimple  = False
     , progressColour = Auto
-    , progressInfo   = Normal
+    , progressInfo   = Brief
     , skipConfigure  = False
     , splitObjects   = False }
 
diff --git a/src/Hadrian/Utilities.hs b/src/Hadrian/Utilities.hs
index 4d2ae48..1cd22b1 100644
--- a/src/Hadrian/Utilities.hs
+++ b/src/Hadrian/Utilities.hs
@@ -313,7 +313,7 @@ putProgressInfo msg = do
 -- | Render an action.
 renderAction :: String -> FilePath -> FilePath -> Action String
 renderAction what input output = do
-    progressInfo <- userSetting Normal
+    progressInfo <- userSetting Brief
     return $ case progressInfo of
         None    -> ""
         Brief   -> "| " ++ what ++ ": " ++ i ++ " => " ++ o