Commit 10b83588 authored by Andrey Mokhov's avatar Andrey Mokhov

Make Brief the default setting of the --progress-info flag

See #428
parent e4f98297
......@@ -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
......
......@@ -33,7 +33,7 @@ of the GHC source tree:
cd ghc
git clone git://github.com/snowleopard/hadrian
```
* Build GHC using `hadrian/build.sh` or `hadrian/build.bat` (on Windows) instead
of `make`. You might want to enable parallelism with `-j`. We will further refer to the
build script simply as `build`. If you are interested in building in a Cabal sandbox
......@@ -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
......@@ -103,7 +103,7 @@ use `hadrian/UserSettings.hs` for the same purpose, see [documentation](doc/user
#### Clean and full rebuild
* `build clean` removes all build artefacts.
* `build clean` removes all build artefacts.
* `build -B` forces Shake to rerun all rules, even if the previous build results are
are still up-to-date.
......@@ -141,7 +141,7 @@ Current limitations
The new build system still lacks many important features:
* Validation is not implemented: [#187][validation-issue].
* Dynamic linking on Windows is not supported [#343][dynamic-windows-issue].
* Only HTML Haddock documentation is supported (use `--haddock` flag).
* Only HTML Haddock documentation is supported (use `--haddock` flag).
* Cross-compilation is not implemented: [#177][cross-compilation-issue].
* There is no support for binary distribution: [#219][install-issue].
......@@ -165,7 +165,7 @@ Acknowledgements
I started this project as part of my 6-month research visit to Microsoft
Research Cambridge, which was funded by Newcastle University, EPSRC, and
Microsoft Research. I would like to thank Simon Peyton Jones, Neil Mitchell
and Simon Marlow for kick-starting the project and for their guidance.
and Simon Marlow for kick-starting the project and for their guidance.
Zhen Zhang has done fantastic work on Hadrian as part of his Summer of
Haskell 2017 [project](https://summer.haskell.org/ideas.html#hadrian-ghc),
solving a few heavy and long-overdue issues. Last but not least, big thanks
......
......@@ -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 ..
......
......@@ -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:
......
......@@ -34,7 +34,7 @@ defaultCommandLineArgs = CommandLineArgs
, installDestDir = Nothing
, integerSimple = False
, progressColour = Auto
, progressInfo = Normal
, progressInfo = Brief
, skipConfigure = False
, splitObjects = False }
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment