--cabal-verbose flag

snoyberg · snoyberg · commit fe3ca799f618 · 2015-09-13T09:26:55.000+03:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -13,6 +13,7 @@ Other enhancements:
 * `--reconfigure` flag [#914](https://github.com/commercialhaskell/stack/issues/914) [#946](https://github.com/commercialhaskell/stack/issues/946)
 * Cached data is written with a checksum of its structure [#889](https://github.com/commercialhaskell/stack/issues/889)
 * Fully removed `--optimizations` flag
+* Added `--cabal-verbose` flag
 
 Bug fixes:
 
diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
@@ -813,7 +813,7 @@ withSingleContext runInBase ActionContext {..} ExecuteEnv {..} task@Task {..} md
                         , "-build-runner"
                         ]
                     return (outputFile, setupArgs)
-            runExe exeName fullArgs
+            runExe exeName $ (if boptsCabalVerbose eeBuildOpts then ("--verbose":) else id) fullArgs
 
     maybePrintBuildOutput stripTHLoading makeAbsolute level mlogFile mh =
         case mh of
diff --git a/src/Stack/Options.hs b/src/Stack/Options.hs
@@ -83,7 +83,8 @@ buildOptsParser cmd =
             fileWatch' <*> keepGoing <*> forceDirty <*>
             tests <*> testOptsParser <*>
             benches <*> benchOptsParser <*>
-            many exec <*> onlyConfigure <*> reconfigure
+            many exec <*> onlyConfigure <*> reconfigure <*>
+            cabalVerbose
   where target =
            many (textArgument
                    (metavar "TARGET" <>
@@ -184,6 +185,10 @@ buildOptsParser cmd =
             (long "reconfigure" <>
              help "Perform the configure step even if unnecessary. Useful in some corner cases with custom Setup.hs files")
 
+        cabalVerbose = flag False True
+            (long "cabal-verbose" <>
+             help "Ask Cabal to be verbose in its output")
+
 -- | Parser for package:[-]flag
 readFlag :: ReadM (Map (Maybe PackageName) (Map FlagName Bool))
 readFlag = do
diff --git a/src/Stack/Types/Build.hs b/src/Stack/Types/Build.hs
@@ -429,6 +429,8 @@ data BuildOpts =
             -- ^ Only perform the configure step when building
             ,boptsReconfigure :: !Bool
             -- ^ Perform the configure step even if already configured
+            ,boptsCabalVerbose :: !Bool
+            -- ^ Ask Cabal to be verbose in its builds
             }
   deriving (Show)
 
@@ -455,6 +457,7 @@ defaultBuildOpts = BuildOpts
     , boptsExec = []
     , boptsOnlyConfigure = False
     , boptsReconfigure = False
+    , boptsCabalVerbose = False
     }
 
 -- | Options for the 'FinalAction' 'DoTests'

Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ withSingleContext runInBase ActionContext {..} ExecuteEnv {..} task@Task {..} md`
`813`	`813`	`, "-build-runner"`
`814`	`814`	`]`
`815`	`815`	`return (outputFile, setupArgs)`
`816`		`- runExe exeName fullArgs`
	`816`	`+ runExe exeName $ (if boptsCabalVerbose eeBuildOpts then ("--verbose":) else id) fullArgs`
`817`	`817`
`818`	`818`	`maybePrintBuildOutput stripTHLoading makeAbsolute level mlogFile mh =`
`819`	`819`	`case mh of`
Original file line number	Diff line number	Diff line change
`@@ -429,6 +429,8 @@ data BuildOpts =`
`429`	`429`	`-- ^ Only perform the configure step when building`
`430`	`430`	`,boptsReconfigure :: !Bool`
`431`	`431`	`-- ^ Perform the configure step even if already configured`
	`432`	`+ ,boptsCabalVerbose :: !Bool`
	`433`	`+ -- ^ Ask Cabal to be verbose in its builds`
`432`	`434`	`}`
`433`	`435`	`deriving (Show)`
`434`	`436`
`@@ -455,6 +457,7 @@ defaultBuildOpts = BuildOpts`
`455`	`457`	`, boptsExec = []`
`456`	`458`	`, boptsOnlyConfigure = False`
`457`	`459`	`, boptsReconfigure = False`
	`460`	`+ , boptsCabalVerbose = False`
`458`	`461`	`}`
`459`	`462`
`460`	`463`	`-- \| Options for the 'FinalAction' 'DoTests'`