From bf9e458fd74a9d187be6929c212e46b341b05c8c Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Wed, 30 Jan 2019 20:59:12 +0100
Subject: Add log-level to verbosity conditional

---
 src/CabalHelper/Compiletime/Log.hs                  |  2 +-
 src/CabalHelper/Compiletime/Program/CabalInstall.hs | 14 +++++++-------
 src/CabalHelper/Compiletime/Types.hs                |  6 ++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/CabalHelper/Compiletime/Log.hs b/src/CabalHelper/Compiletime/Log.hs
index eefb30e..d817098 100644
--- a/src/CabalHelper/Compiletime/Log.hs
+++ b/src/CabalHelper/Compiletime/Log.hs
@@ -36,5 +36,5 @@ logIOError label a = do
 
 vLog :: (MonadIO m, Verbose) => String -> m ()
 vLog msg
-    | ?verbose  = liftIO $ hPutStrLn stderr msg
+    | ?verbose 0 = liftIO $ hPutStrLn stderr msg
     | otherwise = return ()
diff --git a/src/CabalHelper/Compiletime/Program/CabalInstall.hs b/src/CabalHelper/Compiletime/Program/CabalInstall.hs
index 3f87215..f989a02 100644
--- a/src/CabalHelper/Compiletime/Program/CabalInstall.hs
+++ b/src/CabalHelper/Compiletime/Program/CabalInstall.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DataKinds, MultiWayIf #-}
 
 -- cabal-helper: Simple interface to Cabal's configuration state
 -- Copyright (C) 2018  Daniel Gröber <cabal-helper@dxld.at>
@@ -118,9 +118,9 @@ callCabalInstall
              then ["--no-require-sandbox"]
              else []
         , [ "install", srcdir ]
-        , if ?verbose
-            then ["-v"]
-            else []
+        , if | ?verbose 3 -> ["-v2"]
+             | ?verbose 4 -> ["-v3"]
+             | otherwise -> []
         , [ "--only-dependencies" ]
       ]
 
@@ -216,9 +216,9 @@ installCabalLibV2 _ghcVer (CabalVersion cabalVer) (PackageEnvFile env_file) = do
           , "--lib"
           , "Cabal-"++showVersion cabalVer
           ]
-        , if ?verbose
-            then ["-v"]
-            else []
+        , if | ?verbose 3 -> ["-v2"]
+             | ?verbose 4 -> ["-v3"]
+             | otherwise -> []
         ]
     tmp <- getTemporaryDirectory
     callProcessStderr (Just tmp) (cabalProgram ?progs) cabal_opts
diff --git a/src/CabalHelper/Compiletime/Types.hs b/src/CabalHelper/Compiletime/Types.hs
index 185725d..cea904e 100644
--- a/src/CabalHelper/Compiletime/Types.hs
+++ b/src/CabalHelper/Compiletime/Types.hs
@@ -303,8 +303,10 @@ data StackProjPaths = StackProjPaths
 
 -- Beware: GHC 8.0.2 doesn't like these being recursively defined for some
 -- reason so just keep them unrolled.
-type Verbose = (?verbose :: Bool)
-type Env     = (?cprogs :: CompPrograms, ?progs :: Programs, ?verbose :: Bool)
+type Verbose = (?verbose :: Word -> Bool)
+type Env     = ( ?cprogs :: CompPrograms
+               , ?progs :: Programs
+               , ?verbose :: Word -> Bool)
 type Progs   = (?cprogs :: CompPrograms, ?progs :: Programs)
 type CProgs  = (?cprogs :: CompPrograms)
 
-- 
cgit v1.2.3